You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/01/12 23:31:42 UTC
[incubator-skywalking] branch master updated (195cc2a -> 10ef53e)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 195cc2a Merge pull request #737 from michaelsembwever/mck/manually-download-apache-incompatible-dependencies
add 4241f6f Fix ServiceNameCacheGuavaService split error
add 97d63e1 Merge pull request #3 from YunaiV/master-5.0
add 0c44b3a Merge remote-tracking branch 'upstream/master'
add d42eb01 Agent register test success by H2 storage.
add ccd4c8e CPU metric pyramid aggregate by h2 storage test successful.
add 01cd19a GC metric pyramid aggregate by h2 storage test successful.
add 7d881e8 no message
add 9c58e87 Memory metric pyramid aggregate by h2 storage test successful.
add 98d78f2 Memory pool metric pyramid aggregate by h2 storage test successful.
add 3bd9e5b Application component pyramid aggregate by h2 storage test successful.
add 25fb269 Instance mapping pyramid aggregate by h2 storage test successful.
add a9cf2b4 Global trace test successful.
add 10435c2 Segment aggregate by h2 storage test successful.
add 41082be Application reference metric, Application metric, Instance reference metric, Instance metric, Service reference metric, Service metric pyramid aggregate by h2 storage test successful.
add 2609e27 Alarm aggregate by h2 storage test successful.
add 1b214be Merge remote-tracking branch 'upstream/master'
add c38e15d Merge branch 'master' into feature/storage_h2
add 5ba36ca Unused import error when continuous integration.
new 10ef53e Merge pull request #749 from peng-yongsheng/feature/storage_h2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/application.yml | 20 +-
.../apm/collector/core/data/AbstractData.java | 26 +--
.../skywalking/apm/collector/core/data/Data.java | 6 -
.../apm/collector/core/data/StreamData.java | 4 +-
.../apm/collector/core/util/BooleanUtils.java} | 28 ++-
.../grpc/service/GRPCRemoteDeserializeService.java | 3 -
.../grpc/service/GRPCRemoteSerializeService.java | 6 -
.../apm/collector/storage/StorageModule.java | 8 +-
.../apm/collector/storage/base/sql/SqlBuilder.java | 4 +-
.../storage/table/alarm/ApplicationAlarm.java | 4 +-
.../storage/table/alarm/ApplicationAlarmList.java | 4 +-
.../table/alarm/ApplicationReferenceAlarm.java | 4 +-
.../table/alarm/ApplicationReferenceAlarmList.java | 4 +-
.../storage/table/alarm/InstanceAlarm.java | 4 +-
.../storage/table/alarm/InstanceAlarmList.java | 4 +-
.../table/alarm/InstanceReferenceAlarm.java | 4 +-
.../table/alarm/InstanceReferenceAlarmList.java | 4 +-
.../storage/table/alarm/ServiceAlarm.java | 4 +-
.../storage/table/alarm/ServiceAlarmList.java | 4 +-
.../storage/table/alarm/ServiceReferenceAlarm.java | 4 +-
.../table/alarm/ServiceReferenceAlarmList.java | 4 +-
.../table/application/ApplicationComponent.java | 4 +-
.../table/application/ApplicationMapping.java | 4 +-
.../table/application/ApplicationMetric.java | 4 +-
.../application/ApplicationReferenceMetric.java | 4 +-
.../storage/table/global/GlobalTrace.java | 5 +-
.../storage/table/instance/InstanceMapping.java | 4 +-
.../storage/table/instance/InstanceMetric.java | 4 +-
.../table/instance/InstanceReferenceMetric.java | 4 +-
.../apm/collector/storage/table/jvm/CpuMetric.java | 3 +-
.../apm/collector/storage/table/jvm/GCMetric.java | 3 +-
.../collector/storage/table/jvm/MemoryMetric.java | 23 +-
.../storage/table/jvm/MemoryPoolMetric.java | 4 +-
.../storage/table/register/Application.java | 10 +-
.../collector/storage/table/register/Instance.java | 10 +-
.../storage/table/register/NetworkAddress.java | 4 +-
.../storage/table/register/ServiceName.java | 5 +-
.../collector/storage/table/segment/Segment.java | 5 +-
.../storage/table/segment/SegmentCost.java | 13 +-
.../storage/table/service/ServiceMetric.java | 4 +-
.../table/service/ServiceReferenceMetric.java | 4 +-
.../storage/es/StorageModuleEsProvider.java | 12 +-
.../es/base/define/ElasticSearchColumnDefine.java | 3 +-
.../es/dao/cache/ApplicationEsCacheDAO.java | 5 +-
.../storage/es/dao/cache/InstanceEsCacheDAO.java | 5 +-
...isterDAO.java => ApplicationRegisterEsDAO.java} | 6 +-
...RegisterDAO.java => InstanceRegisterEsDAO.java} | 8 +-
...isterDAO.java => ServiceNameRegisterEsDAO.java} | 6 +-
.../es/define/SegmentCostEsTableDefine.java | 2 +-
...stractInstanceReferenceMetricEsTableDefine.java | 2 +
.../memory/AbstractMemoryMetricEsTableDefine.java | 3 +-
.../define/register/ApplicationEsTableDefine.java | 2 +-
.../es/define/register/InstanceEsTableDefine.java | 2 +-
.../smp/AbstractServiceMetricEsTableDefine.java | 2 +
...bstractServiceReferenceMetricEsTableDefine.java | 4 +
.../storage/h2/StorageModuleH2Provider.java | 258 ++++++++++++++++-----
.../h2/base/dao/AbstractPersistenceH2DAO.java | 95 ++++++++
.../storage/h2/base/define/H2ColumnDefine.java | 3 +-
.../h2/dao/ApplicationAlarmH2PersistenceDAO.java | 55 -----
.../dao/ApplicationAlarmListH2PersistenceDAO.java | 55 -----
...ApplicationComponentH2MinutePersistenceDAO.java | 101 --------
.../ApplicationMappingH2MinutePersistenceDAO.java | 99 --------
.../ApplicationMinuteMetricH2PersistenceDAO.java | 153 ------------
.../ApplicationReferenceAlarmH2PersistenceDAO.java | 55 -----
...licationReferenceAlarmListH2PersistenceDAO.java | 55 -----
...ationReferenceMinuteMetricH2PersistenceDAO.java | 156 -------------
.../h2/dao/CpuSecondMetricH2PersistenceDAO.java | 70 ------
.../h2/dao/GCSecondMetricH2PersistenceDAO.java | 66 ------
.../h2/dao/GlobalTraceH2PersistenceDAO.java | 5 +-
.../h2/dao/InstanceAlarmListH2PersistenceDAO.java | 55 -----
.../dao/InstanceMappingH2MinutePersistenceDAO.java | 102 --------
.../dao/InstanceMinuteMetricH2PersistenceDAO.java | 146 ------------
.../InstanceReferenceAlarmH2PersistenceDAO.java | 55 -----
...InstanceReferenceAlarmListH2PersistenceDAO.java | 55 -----
.../InstanceReferenceMetricH2PersistenceDAO.java | 146 ------------
.../MemoryPoolSecondMetricH2PersistenceDAO.java | 69 ------
.../h2/dao/MemorySecondMetricH2PersistenceDAO.java | 69 ------
.../h2/dao/ServiceAlarmListH2PersistenceDAO.java | 55 -----
.../dao/ServiceMinuteMetricH2PersistenceDAO.java | 148 ------------
.../dao/ServiceReferenceAlarmH2PersistenceDAO.java | 55 -----
.../ServiceReferenceAlarmListH2PersistenceDAO.java | 55 -----
.../ServiceReferenceMetricH2PersistenceDAO.java | 153 ------------
...stractApplicationComponentH2PersistenceDAO.java | 60 +++++
.../ApplicationComponentDayH2PersistenceDAO.java} | 26 +--
.../ApplicationComponentHourH2PersistenceDAO.java} | 26 +--
...pplicationComponentMinuteH2PersistenceDAO.java} | 26 +--
...ApplicationComponentMonthH2PersistenceDAO.java} | 26 +--
.../alarm/ApplicationAlarmH2PersistenceDAO.java | 73 ++++++
.../ApplicationAlarmListH2PersistenceDAO.java | 73 ++++++
.../ApplicationReferenceAlarmH2PersistenceDAO.java | 75 ++++++
...licationReferenceAlarmListH2PersistenceDAO.java | 75 ++++++
.../dao/alarm/InstanceAlarmH2PersistenceDAO.java | 75 ++++++
.../alarm/InstanceAlarmListH2PersistenceDAO.java | 75 ++++++
.../InstanceReferenceAlarmH2PersistenceDAO.java | 80 +++++++
...InstanceReferenceAlarmListH2PersistenceDAO.java | 79 +++++++
.../h2/dao/alarm/ServiceAlarmH2PersistenceDAO.java | 77 ++++++
.../alarm/ServiceAlarmListH2PersistenceDAO.java | 77 ++++++
.../ServiceReferenceAlarmH2PersistenceDAO.java | 83 +++++++
.../ServiceReferenceAlarmListH2PersistenceDAO.java | 83 +++++++
.../AbstractApplicationMetricH2PersistenceDAO.java | 99 ++++++++
.../amp/ApplicationDayMetricH2PersistenceDAO.java} | 28 +--
.../ApplicationHourMetricH2PersistenceDAO.java} | 28 +--
.../ApplicationMinuteMetricH2PersistenceDAO.java} | 28 +--
.../ApplicationMonthMetricH2PersistenceDAO.java} | 28 +--
...AbstractApplicationMappingH2PersistenceDAO.java | 60 +++++
.../ApplicationMappingDayH2PersistenceDAO.java} | 24 +-
.../ApplicationMappingHourH2PersistenceDAO.java} | 34 +--
.../ApplicationMappingMinuteH2PersistenceDAO.java} | 24 +-
.../ApplicationMappingMonthH2PersistenceDAO.java} | 24 +-
...ApplicationReferenceMetricH2PersistenceDAO.java | 102 ++++++++
...icationReferenceDayMetricH2PersistenceDAO.java} | 34 +--
...cationReferenceHourMetricH2PersistenceDAO.java} | 34 +--
...tionReferenceMinuteMetricH2PersistenceDAO.java} | 34 +--
...ationReferenceMonthMetricH2PersistenceDAO.java} | 34 +--
.../h2/dao/{ => cache}/ApplicationH2CacheDAO.java | 2 +-
.../h2/dao/{ => cache}/InstanceH2CacheDAO.java | 9 +-
.../dao/{ => cache}/NetworkAddressH2CacheDAO.java | 2 +-
.../h2/dao/{ => cache}/ServiceNameH2CacheDAO.java | 2 +-
.../cpump/AbstractCpuMetricH2PersistenceDAO.java | 64 +++++
.../cpump/CpuDayMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuHourMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuMinuteMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuMonthMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuSecondMetricH2PersistenceDAO.java} | 24 +-
.../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java | 67 ++++++
.../gcmp/GCDayMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCHourMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCMinuteMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCMonthMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCSecondMetricH2PersistenceDAO.java} | 26 +--
.../AbstractInstanceMetricH2PersistenceDAO.java | 96 ++++++++
.../imp/InstanceDayMetricH2PersistenceDAO.java} | 26 +--
.../imp/InstanceHourMetricH2PersistenceDAO.java} | 26 +--
.../imp/InstanceMinuteMetricH2PersistenceDAO.java} | 26 +--
.../imp/InstanceMonthMetricH2PersistenceDAO.java} | 26 +--
.../AbstractInstanceMappingH2PersistenceDAO.java | 62 +++++
.../InstanceMappingDayH2PersistenceDAO.java} | 34 +--
.../impp/InstanceMappingHourH2PersistenceDAO.java} | 24 +-
.../InstanceMappingMinuteH2PersistenceDAO.java} | 24 +-
.../InstanceMappingMonthH2PersistenceDAO.java} | 24 +-
...actInstanceReferenceMetricH2PersistenceDAO.java | 98 ++++++++
...nstanceReferenceDayMetricH2PersistenceDAO.java} | 26 +--
...stanceReferenceHourMetricH2PersistenceDAO.java} | 26 +--
...anceReferenceMinuteMetricH2PersistenceDAO.java} | 26 +--
...tanceReferenceMonthMetricH2PersistenceDAO.java} | 26 +--
.../AbstractMemoryMetricH2PersistenceDAO.java | 72 ++++++
.../MemoryDayMetricH2PersistenceDAO.java} | 34 +--
.../MemoryHourMetricH2PersistenceDAO.java} | 34 +--
.../MemoryMinuteMetricH2PersistenceDAO.java} | 34 +--
.../MemoryMonthMetricH2PersistenceDAO.java} | 34 +--
.../MemorySecondMetricH2PersistenceDAO.java} | 34 +--
.../AbstractMemoryPoolMetricH2PersistenceDAO.java | 72 ++++++
.../MemoryPoolDayMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolHourMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolMinuteMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolMonthMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolSecondMetricH2PersistenceDAO.java} | 34 +--
.../ApplicationRegisterH2DAO.java} | 9 +-
.../InstanceRegisterH2DAO.java} | 8 +-
.../NetworkAddressRegisterH2DAO.java | 2 +-
.../ServiceNameRegisterH2DAO.java} | 8 +-
.../smp/AbstractServiceMetricH2PersistenceDAO.java | 96 ++++++++
.../ServiceDayMetricH2PersistenceDAO.java} | 34 +--
.../ServiceHourMetricH2PersistenceDAO.java} | 34 +--
.../ServiceMinuteMetricH2PersistenceDAO.java} | 34 +--
.../ServiceMonthMetricH2PersistenceDAO.java} | 34 +--
...ractServiceReferenceMetricH2PersistenceDAO.java | 102 ++++++++
...ServiceReferenceDayMetricH2PersistenceDAO.java} | 34 +--
...erviceReferenceHourMetricH2PersistenceDAO.java} | 34 +--
...viceReferenceMinuteMetricH2PersistenceDAO.java} | 34 +--
...rviceReferenceMonthMetricH2PersistenceDAO.java} | 34 +--
.../h2/define/GlobalTraceH2TableDefine.java | 3 +-
.../h2/define/SegmentCostH2TableDefine.java | 5 +-
.../storage/h2/define/SegmentH2TableDefine.java | 1 -
.../ApplicationAlarmH2TableDefine.java} | 24 +-
.../ApplicationAlarmListH2TableDefine.java} | 26 ++-
.../ApplicationReferenceAlarmH2TableDefine.java | 46 ++++
...ApplicationReferenceAlarmListH2TableDefine.java | 46 ++++
.../define/alarm/InstanceAlarmH2TableDefine.java | 46 ++++
.../alarm/InstanceAlarmListH2TableDefine.java | 46 ++++
.../alarm/InstanceReferenceAlarmH2TableDefine.java | 48 ++++
.../InstanceReferenceAlarmListH2TableDefine.java | 48 ++++
.../ServiceAlarmH2TableDefine.java} | 30 +--
.../ServiceAlarmListH2TableDefine.java} | 32 +--
.../alarm/ServiceReferenceAlarmH2TableDefine.java | 50 ++++
.../ServiceReferenceAlarmListH2TableDefine.java | 50 ++++
.../AbstractApplicationMetricH2TableDefine.java | 61 +++++
.../amp/ApplicationDayMetricH2TableDefine.java} | 17 +-
.../amp/ApplicationHourMetricH2TableDefine.java} | 17 +-
.../amp/ApplicationMinuteMetricH2TableDefine.java} | 17 +-
.../amp/ApplicationMonthMetricH2TableDefine.java} | 17 +-
...AbstractApplicationComponentH2TableDefine.java} | 14 +-
.../ApplicationComponentDayH2TableDefine.java} | 17 +-
.../ApplicationComponentHourH2TableDefine.java} | 17 +-
.../ApplicationComponentMinuteH2TableDefine.java} | 17 +-
.../ApplicationComponentMonthH2TableDefine.java} | 17 +-
.../AbstractApplicationMappingH2TableDefine.java} | 14 +-
.../ApplicationMappingDayH2TableDefine.java} | 17 +-
.../ApplicationMappingHourH2TableDefine.java} | 17 +-
.../ApplicationMappingMinuteH2TableDefine.java} | 17 +-
.../ApplicationMappingMonthH2TableDefine.java} | 17 +-
...ctApplicationReferenceMetricH2TableDefine.java} | 18 +-
...pplicationReferenceDayMetricH2TableDefine.java} | 17 +-
...plicationReferenceHourMetricH2TableDefine.java} | 17 +-
...icationReferenceMinuteMetricH2TableDefine.java} | 17 +-
...licationReferenceMonthMetricH2TableDefine.java} | 17 +-
.../AbstractCpuMetricH2TableDefine.java} | 13 +-
.../cpu/CpuDayMetricH2TableDefine.java} | 17 +-
.../cpu/CpuHourMetricH2TableDefine.java} | 17 +-
.../cpu/CpuMinuteMetricH2TableDefine.java} | 17 +-
.../cpu/CpuMonthMetricH2TableDefine.java} | 17 +-
.../cpu/CpuSecondMetricH2TableDefine.java} | 17 +-
.../AbstractGCMetricH2TableDefine.java} | 14 +-
.../gc/GCDayMetricH2TableDefine.java} | 17 +-
.../gc/GCHourMetricH2TableDefine.java} | 17 +-
.../gc/GCMinuteMetricH2TableDefine.java} | 17 +-
.../gc/GCMonthMetricH2TableDefine.java} | 17 +-
.../gc/GCSecondMetricH2TableDefine.java} | 17 +-
.../AbstractInstanceMetricH2TableDefine.java} | 13 +-
.../imp/InstanceDayMetricH2TableDefine.java} | 17 +-
.../imp/InstanceHourMetricH2TableDefine.java} | 17 +-
.../imp/InstanceMinuteMetricH2TableDefine.java} | 17 +-
.../imp/InstanceMonthMetricH2TableDefine.java} | 17 +-
.../AbstractInstanceMappingH2TableDefine.java} | 11 +-
.../InstanceMappingDayH2TableDefine.java} | 17 +-
.../InstanceMappingHourH2TableDefine.java} | 17 +-
.../InstanceMappingMinuteH2TableDefine.java} | 17 +-
.../InstanceMappingMonthH2TableDefine.java} | 17 +-
...tractInstanceReferenceMetricH2TableDefine.java} | 14 +-
.../InstanceReferenceDayMetricH2TableDefine.java} | 16 +-
.../InstanceReferenceHourMetricH2TableDefine.java} | 16 +-
...nstanceReferenceMinuteMetricH2TableDefine.java} | 16 +-
...InstanceReferenceMonthMetricH2TableDefine.java} | 16 +-
.../AbstractMemoryMetricH2TableDefine.java} | 15 +-
.../memory/MemoryDayMetricH2TableDefine.java} | 17 +-
.../memory/MemoryHourMetricH2TableDefine.java} | 17 +-
.../memory/MemoryMinuteMetricH2TableDefine.java} | 17 +-
.../memory/MemoryMonthMetricH2TableDefine.java} | 17 +-
.../memory/MemorySecondMetricH2TableDefine.java} | 17 +-
.../AbstractMemoryPoolMetricH2TableDefine.java} | 15 +-
.../mpool/MemoryPoolDayMetricH2TableDefine.java} | 17 +-
.../mpool/MemoryPoolHourMetricH2TableDefine.java} | 17 +-
.../MemoryPoolMinuteMetricH2TableDefine.java} | 17 +-
.../mpool/MemoryPoolMonthMetricH2TableDefine.java} | 17 +-
.../MemoryPoolSecondMetricH2TableDefine.java} | 17 +-
.../{ => register}/ApplicationH2TableDefine.java | 4 +-
.../{ => register}/InstanceH2TableDefine.java | 4 +-
.../NetworkAddressH2TableDefine.java | 2 +-
.../{ => register}/ServiceNameH2TableDefine.java | 2 +-
.../AbstractServiceMetricH2TableDefine.java} | 15 +-
.../smp/ServiceDayMetricH2TableDefine.java} | 17 +-
.../smp/ServiceHourMetricH2TableDefine.java} | 17 +-
.../smp/ServiceMinuteMetricH2TableDefine.java} | 17 +-
.../smp/ServiceMonthMetricH2TableDefine.java} | 17 +-
...stractServiceReferenceMetricH2TableDefine.java} | 17 +-
.../ServiceReferenceDayMetricH2TableDefine.java} | 17 +-
.../ServiceReferenceHourMetricH2TableDefine.java} | 17 +-
...ServiceReferenceMinuteMetricH2TableDefine.java} | 17 +-
.../ServiceReferenceMonthMetricH2TableDefine.java} | 17 +-
.../main/resources/META-INF/defines/storage.define | 103 ++++++--
...alking.apm.collector.core.module.ModuleProvider | 3 +-
261 files changed, 4163 insertions(+), 4014 deletions(-)
copy apm-collector/{apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java => apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/BooleanUtils.java} (55%)
rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/{ApplicationEsRegisterDAO.java => ApplicationRegisterEsDAO.java} (95%)
rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/{InstanceEsRegisterDAO.java => InstanceRegisterEsDAO.java} (94%)
rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/register/{ServiceNameEsRegisterDAO.java => ServiceNameRegisterEsDAO.java} (94%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/base/dao/AbstractPersistenceH2DAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationAlarmH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationAlarmListH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2MinutePersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2MinutePersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationMinuteMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceAlarmH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceAlarmListH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMinuteMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/CpuSecondMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GCSecondMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceAlarmListH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceMappingH2MinutePersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceMinuteMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceReferenceAlarmH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceReferenceAlarmListH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceReferenceMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/MemoryPoolSecondMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/MemorySecondMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceAlarmListH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceMinuteMetricH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceReferenceAlarmH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceReferenceAlarmListH2PersistenceDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceReferenceMetricH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/acp/AbstractApplicationComponentH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/acp/ApplicationComponentDayH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/acp/ApplicationComponentHourH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/acp/ApplicationComponentMinuteH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/acp/ApplicationComponentMonthH2PersistenceDAO.java} (51%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationReferenceAlarmH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationReferenceAlarmListH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/InstanceAlarmH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/InstanceAlarmListH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/InstanceReferenceAlarmH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/InstanceReferenceAlarmListH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ServiceAlarmH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ServiceAlarmListH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ServiceReferenceAlarmH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ServiceReferenceAlarmListH2PersistenceDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/amp/AbstractApplicationMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/amp/ApplicationDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/amp/ApplicationHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/amp/ApplicationMinuteMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationComponentH2TableDefine.java => dao/amp/ApplicationMonthMetricH2PersistenceDAO.java} (50%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ampp/AbstractApplicationMappingH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationMappingH2TableDefine.java => dao/ampp/ApplicationMappingDayH2PersistenceDAO.java} (53%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => ampp/ApplicationMappingHourH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationMappingH2TableDefine.java => dao/ampp/ApplicationMappingMinuteH2PersistenceDAO.java} (53%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/ApplicationMappingH2TableDefine.java => dao/ampp/ApplicationMappingMonthH2PersistenceDAO.java} (53%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/armp/AbstractApplicationReferenceMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => armp/ApplicationReferenceDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => armp/ApplicationReferenceHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => armp/ApplicationReferenceMinuteMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => armp/ApplicationReferenceMonthMetricH2PersistenceDAO.java} (50%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => cache}/ApplicationH2CacheDAO.java (98%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => cache}/InstanceH2CacheDAO.java (94%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => cache}/NetworkAddressH2CacheDAO.java (98%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => cache}/ServiceNameH2CacheDAO.java (98%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cpump/AbstractCpuMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/CpuMetricH2TableDefine.java => dao/cpump/CpuDayMetricH2PersistenceDAO.java} (55%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/CpuMetricH2TableDefine.java => dao/cpump/CpuHourMetricH2PersistenceDAO.java} (55%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/CpuMetricH2TableDefine.java => dao/cpump/CpuMinuteMetricH2PersistenceDAO.java} (54%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/CpuMetricH2TableDefine.java => dao/cpump/CpuMonthMetricH2PersistenceDAO.java} (55%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/CpuMetricH2TableDefine.java => dao/cpump/CpuSecondMetricH2PersistenceDAO.java} (54%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/gcmp/AbstractGCMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/GlobalTraceH2TableDefine.java => dao/gcmp/GCDayMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/GlobalTraceH2TableDefine.java => dao/gcmp/GCHourMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/GCMetricH2TableDefine.java => dao/gcmp/GCMinuteMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/GCMetricH2TableDefine.java => dao/gcmp/GCMonthMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/GCMetricH2TableDefine.java => dao/gcmp/GCSecondMetricH2PersistenceDAO.java} (51%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/imp/AbstractInstanceMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/imp/InstanceDayMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/imp/InstanceHourMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/imp/InstanceMinuteMetricH2PersistenceDAO.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/imp/InstanceMonthMetricH2PersistenceDAO.java} (51%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/impp/AbstractInstanceMappingH2PersistenceDAO.java
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{InstanceAlarmH2PersistenceDAO.java => impp/InstanceMappingDayH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/impp/InstanceMappingHourH2PersistenceDAO.java} (52%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/impp/InstanceMappingMinuteH2PersistenceDAO.java} (52%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/impp/InstanceMappingMonthH2PersistenceDAO.java} (52%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/irmp/AbstractInstanceReferenceMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/irmp/InstanceReferenceDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/irmp/InstanceReferenceHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/irmp/InstanceReferenceMinuteMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{define/InstanceMappingH2TableDefine.java => dao/irmp/InstanceReferenceMonthMetricH2PersistenceDAO.java} (50%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/memorymp/AbstractMemoryMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => memorymp/MemoryDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => memorymp/MemoryHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => memorymp/MemoryMinuteMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => memorymp/MemoryMonthMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => memorymp/MemorySecondMetricH2PersistenceDAO.java} (50%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/mpoolmp/AbstractMemoryPoolMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => mpoolmp/MemoryPoolDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => mpoolmp/MemoryPoolHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => mpoolmp/MemoryPoolMinuteMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => mpoolmp/MemoryPoolMonthMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => mpoolmp/MemoryPoolSecondMetricH2PersistenceDAO.java} (50%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ApplicationH2RegisterDAO.java => register/ApplicationRegisterH2DAO.java} (92%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{InstanceH2RegisterDAO.java => register/InstanceRegisterH2DAO.java} (94%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => register}/NetworkAddressRegisterH2DAO.java (97%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceNameH2RegisterDAO.java => register/ServiceNameRegisterH2DAO.java} (92%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/smp/AbstractServiceMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => smp/ServiceDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => smp/ServiceHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => smp/ServiceMinuteMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => smp/ServiceMonthMetricH2PersistenceDAO.java} (50%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/srmp/AbstractServiceReferenceMetricH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => srmp/ServiceReferenceDayMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => srmp/ServiceReferenceHourMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => srmp/ServiceReferenceMinuteMetricH2PersistenceDAO.java} (50%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ServiceAlarmH2PersistenceDAO.java => srmp/ServiceReferenceMonthMetricH2PersistenceDAO.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{CpuMetricH2TableDefine.java => alarm/ApplicationAlarmH2TableDefine.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ApplicationComponentH2TableDefine.java => alarm/ApplicationAlarmListH2TableDefine.java} (55%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationReferenceAlarmH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationReferenceAlarmListH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/InstanceAlarmH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/InstanceAlarmListH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/InstanceReferenceAlarmH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/InstanceReferenceAlarmListH2TableDefine.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{MemoryMetricH2TableDefine.java => alarm/ServiceAlarmH2TableDefine.java} (51%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{MemoryPoolMetricH2TableDefine.java => alarm/ServiceAlarmListH2TableDefine.java} (52%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ServiceReferenceAlarmH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ServiceReferenceAlarmListH2TableDefine.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/amp/AbstractApplicationMetricH2TableDefine.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/amp/ApplicationDayMetricH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/amp/ApplicationHourMetricH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/amp/ApplicationMinuteMetricH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/amp/ApplicationMonthMetricH2TableDefine.java} (61%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ApplicationComponentH2TableDefine.java => appcomp/AbstractApplicationComponentH2TableDefine.java} (79%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appcomp/ApplicationComponentDayH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appcomp/ApplicationComponentHourH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appcomp/ApplicationComponentMinuteH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appcomp/ApplicationComponentMonthH2TableDefine.java} (60%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ApplicationMappingH2TableDefine.java => appmapping/AbstractApplicationMappingH2TableDefine.java} (79%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appmapping/ApplicationMappingDayH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appmapping/ApplicationMappingHourH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appmapping/ApplicationMappingMinuteH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/appmapping/ApplicationMappingMonthH2TableDefine.java} (61%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ApplicationReferenceMetricH2TableDefine.java => armp/AbstractApplicationReferenceMetricH2TableDefine.java} (87%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/armp/ApplicationReferenceDayMetricH2TableDefine.java} (59%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/armp/ApplicationReferenceHourMetricH2TableDefine.java} (59%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/armp/ApplicationReferenceMinuteMetricH2TableDefine.java} (59%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/armp/ApplicationReferenceMonthMetricH2TableDefine.java} (59%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{CpuMetricH2TableDefine.java => cpu/AbstractCpuMetricH2TableDefine.java} (76%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/cpu/CpuDayMetricH2TableDefine.java} (64%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/cpu/CpuHourMetricH2TableDefine.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/cpu/CpuMinuteMetricH2TableDefine.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/cpu/CpuMonthMetricH2TableDefine.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/cpu/CpuSecondMetricH2TableDefine.java} (63%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{GCMetricH2TableDefine.java => gc/AbstractGCMetricH2TableDefine.java} (82%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/gc/GCDayMetricH2TableDefine.java} (64%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/gc/GCHourMetricH2TableDefine.java} (64%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/gc/GCMinuteMetricH2TableDefine.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/gc/GCMonthMetricH2TableDefine.java} (64%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/gc/GCSecondMetricH2TableDefine.java} (63%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{InstanceMetricH2TableDefine.java => imp/AbstractInstanceMetricH2TableDefine.java} (86%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/imp/InstanceDayMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/imp/InstanceHourMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/imp/InstanceMinuteMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/imp/InstanceMonthMetricH2TableDefine.java} (62%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{InstanceMappingH2TableDefine.java => instmapping/AbstractInstanceMappingH2TableDefine.java} (80%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/instmapping/InstanceMappingDayH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/instmapping/InstanceMappingHourH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/instmapping/InstanceMappingMinuteH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/instmapping/InstanceMappingMonthH2TableDefine.java} (61%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{InstanceReferenceMetricH2TableDefine.java => irmp/AbstractInstanceReferenceMetricH2TableDefine.java} (80%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/irmp/InstanceReferenceDayMetricH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/irmp/InstanceReferenceHourMetricH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/irmp/InstanceReferenceMinuteMetricH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/irmp/InstanceReferenceMonthMetricH2TableDefine.java} (60%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{MemoryMetricH2TableDefine.java => memory/AbstractMemoryMetricH2TableDefine.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/memory/MemoryDayMetricH2TableDefine.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/memory/MemoryHourMetricH2TableDefine.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/memory/MemoryMinuteMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/memory/MemoryMonthMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/memory/MemorySecondMetricH2TableDefine.java} (62%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{MemoryPoolMetricH2TableDefine.java => mpool/AbstractMemoryPoolMetricH2TableDefine.java} (79%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/mpool/MemoryPoolDayMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/mpool/MemoryPoolHourMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/mpool/MemoryPoolMinuteMetricH2TableDefine.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/mpool/MemoryPoolMonthMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/mpool/MemoryPoolSecondMetricH2TableDefine.java} (61%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ => register}/ApplicationH2TableDefine.java (93%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ => register}/InstanceH2TableDefine.java (95%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ => register}/NetworkAddressH2TableDefine.java (95%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ => register}/ServiceNameH2TableDefine.java (95%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ServiceMetricH2TableDefine.java => smp/AbstractServiceMetricH2TableDefine.java} (80%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/smp/ServiceDayMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/smp/ServiceHourMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/smp/ServiceMinuteMetricH2TableDefine.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/smp/ServiceMonthMetricH2TableDefine.java} (62%)
rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/{ServiceReferenceMetricH2TableDefine.java => srmp/AbstractServiceReferenceMetricH2TableDefine.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/srmp/ServiceReferenceDayMetricH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/srmp/ServiceReferenceHourMetricH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/srmp/ServiceReferenceMinuteMetricH2TableDefine.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/{base/define/H2ColumnDefine.java => define/srmp/ServiceReferenceMonthMetricH2TableDefine.java} (60%)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge pull request #749 from
peng-yongsheng/feature/storage_h2
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 10ef53e6c2a2e670133b3d1eb5b79d4613820bc7
Merge: 195cc2a 5ba36ca
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Jan 13 07:31:38 2018 +0800
Merge pull request #749 from peng-yongsheng/feature/storage_h2
Feature/storage h2
.../src/main/resources/application.yml | 20 +-
.../apm/collector/core/data/AbstractData.java | 26 +--
.../skywalking/apm/collector/core/data/Data.java | 6 -
.../apm/collector/core/data/StreamData.java | 4 +-
.../apm/collector/core/util/BooleanUtils.java} | 28 ++-
.../grpc/service/GRPCRemoteDeserializeService.java | 3 -
.../grpc/service/GRPCRemoteSerializeService.java | 6 -
.../apm/collector/storage/StorageModule.java | 8 +-
.../apm/collector/storage/base/sql/SqlBuilder.java | 4 +-
.../storage/table/alarm/ApplicationAlarm.java | 4 +-
.../storage/table/alarm/ApplicationAlarmList.java | 4 +-
.../table/alarm/ApplicationReferenceAlarm.java | 4 +-
.../table/alarm/ApplicationReferenceAlarmList.java | 4 +-
.../storage/table/alarm/InstanceAlarm.java | 4 +-
.../storage/table/alarm/InstanceAlarmList.java | 4 +-
.../table/alarm/InstanceReferenceAlarm.java | 4 +-
.../table/alarm/InstanceReferenceAlarmList.java | 4 +-
.../storage/table/alarm/ServiceAlarm.java | 4 +-
.../storage/table/alarm/ServiceAlarmList.java | 4 +-
.../storage/table/alarm/ServiceReferenceAlarm.java | 4 +-
.../table/alarm/ServiceReferenceAlarmList.java | 4 +-
.../table/application/ApplicationComponent.java | 4 +-
.../table/application/ApplicationMapping.java | 4 +-
.../table/application/ApplicationMetric.java | 4 +-
.../application/ApplicationReferenceMetric.java | 4 +-
.../storage/table/global/GlobalTrace.java | 5 +-
.../storage/table/instance/InstanceMapping.java | 4 +-
.../storage/table/instance/InstanceMetric.java | 4 +-
.../table/instance/InstanceReferenceMetric.java | 4 +-
.../apm/collector/storage/table/jvm/CpuMetric.java | 3 +-
.../apm/collector/storage/table/jvm/GCMetric.java | 3 +-
.../collector/storage/table/jvm/MemoryMetric.java | 23 +-
.../storage/table/jvm/MemoryPoolMetric.java | 4 +-
.../storage/table/register/Application.java | 10 +-
.../collector/storage/table/register/Instance.java | 10 +-
.../storage/table/register/NetworkAddress.java | 4 +-
.../storage/table/register/ServiceName.java | 5 +-
.../collector/storage/table/segment/Segment.java | 5 +-
.../storage/table/segment/SegmentCost.java | 13 +-
.../storage/table/service/ServiceMetric.java | 4 +-
.../table/service/ServiceReferenceMetric.java | 4 +-
.../storage/es/StorageModuleEsProvider.java | 12 +-
.../es/base/define/ElasticSearchColumnDefine.java | 3 +-
.../es/dao/cache/ApplicationEsCacheDAO.java | 5 +-
.../storage/es/dao/cache/InstanceEsCacheDAO.java | 5 +-
...isterDAO.java => ApplicationRegisterEsDAO.java} | 6 +-
...RegisterDAO.java => InstanceRegisterEsDAO.java} | 8 +-
...isterDAO.java => ServiceNameRegisterEsDAO.java} | 6 +-
.../es/define/SegmentCostEsTableDefine.java | 2 +-
...stractInstanceReferenceMetricEsTableDefine.java | 2 +
.../memory/AbstractMemoryMetricEsTableDefine.java | 3 +-
.../define/register/ApplicationEsTableDefine.java | 2 +-
.../es/define/register/InstanceEsTableDefine.java | 2 +-
.../smp/AbstractServiceMetricEsTableDefine.java | 2 +
...bstractServiceReferenceMetricEsTableDefine.java | 4 +
.../storage/h2/StorageModuleH2Provider.java | 258 ++++++++++++++++-----
.../h2/base/dao/AbstractPersistenceH2DAO.java | 95 ++++++++
.../storage/h2/base/define/H2ColumnDefine.java | 3 +-
.../h2/dao/ApplicationAlarmH2PersistenceDAO.java | 55 -----
.../dao/ApplicationAlarmListH2PersistenceDAO.java | 55 -----
...ApplicationComponentH2MinutePersistenceDAO.java | 101 --------
.../ApplicationMappingH2MinutePersistenceDAO.java | 99 --------
.../ApplicationMinuteMetricH2PersistenceDAO.java | 153 ------------
.../ApplicationReferenceAlarmH2PersistenceDAO.java | 55 -----
...licationReferenceAlarmListH2PersistenceDAO.java | 55 -----
...ationReferenceMinuteMetricH2PersistenceDAO.java | 156 -------------
.../h2/dao/CpuSecondMetricH2PersistenceDAO.java | 70 ------
.../h2/dao/GCSecondMetricH2PersistenceDAO.java | 66 ------
.../h2/dao/GlobalTraceH2PersistenceDAO.java | 5 +-
.../h2/dao/InstanceAlarmListH2PersistenceDAO.java | 55 -----
.../dao/InstanceMappingH2MinutePersistenceDAO.java | 102 --------
.../dao/InstanceMinuteMetricH2PersistenceDAO.java | 146 ------------
.../InstanceReferenceAlarmH2PersistenceDAO.java | 55 -----
...InstanceReferenceAlarmListH2PersistenceDAO.java | 55 -----
.../InstanceReferenceMetricH2PersistenceDAO.java | 146 ------------
.../MemoryPoolSecondMetricH2PersistenceDAO.java | 69 ------
.../h2/dao/MemorySecondMetricH2PersistenceDAO.java | 69 ------
.../h2/dao/ServiceAlarmListH2PersistenceDAO.java | 55 -----
.../dao/ServiceMinuteMetricH2PersistenceDAO.java | 148 ------------
.../dao/ServiceReferenceAlarmH2PersistenceDAO.java | 55 -----
.../ServiceReferenceAlarmListH2PersistenceDAO.java | 55 -----
.../ServiceReferenceMetricH2PersistenceDAO.java | 153 ------------
...stractApplicationComponentH2PersistenceDAO.java | 60 +++++
.../ApplicationComponentDayH2PersistenceDAO.java} | 26 +--
.../ApplicationComponentHourH2PersistenceDAO.java} | 26 +--
...pplicationComponentMinuteH2PersistenceDAO.java} | 26 +--
...ApplicationComponentMonthH2PersistenceDAO.java} | 26 +--
.../alarm/ApplicationAlarmH2PersistenceDAO.java | 73 ++++++
.../ApplicationAlarmListH2PersistenceDAO.java | 73 ++++++
.../ApplicationReferenceAlarmH2PersistenceDAO.java | 75 ++++++
...licationReferenceAlarmListH2PersistenceDAO.java | 75 ++++++
.../dao/alarm/InstanceAlarmH2PersistenceDAO.java | 75 ++++++
.../alarm/InstanceAlarmListH2PersistenceDAO.java | 75 ++++++
.../InstanceReferenceAlarmH2PersistenceDAO.java | 80 +++++++
...InstanceReferenceAlarmListH2PersistenceDAO.java | 79 +++++++
.../h2/dao/alarm/ServiceAlarmH2PersistenceDAO.java | 77 ++++++
.../alarm/ServiceAlarmListH2PersistenceDAO.java | 77 ++++++
.../ServiceReferenceAlarmH2PersistenceDAO.java | 83 +++++++
.../ServiceReferenceAlarmListH2PersistenceDAO.java | 83 +++++++
.../AbstractApplicationMetricH2PersistenceDAO.java | 99 ++++++++
.../amp/ApplicationDayMetricH2PersistenceDAO.java} | 28 +--
.../ApplicationHourMetricH2PersistenceDAO.java} | 28 +--
.../ApplicationMinuteMetricH2PersistenceDAO.java} | 28 +--
.../ApplicationMonthMetricH2PersistenceDAO.java} | 28 +--
...AbstractApplicationMappingH2PersistenceDAO.java | 60 +++++
.../ApplicationMappingDayH2PersistenceDAO.java} | 24 +-
.../ApplicationMappingHourH2PersistenceDAO.java} | 34 +--
.../ApplicationMappingMinuteH2PersistenceDAO.java} | 24 +-
.../ApplicationMappingMonthH2PersistenceDAO.java} | 24 +-
...ApplicationReferenceMetricH2PersistenceDAO.java | 102 ++++++++
...icationReferenceDayMetricH2PersistenceDAO.java} | 34 +--
...cationReferenceHourMetricH2PersistenceDAO.java} | 34 +--
...tionReferenceMinuteMetricH2PersistenceDAO.java} | 34 +--
...ationReferenceMonthMetricH2PersistenceDAO.java} | 34 +--
.../h2/dao/{ => cache}/ApplicationH2CacheDAO.java | 2 +-
.../h2/dao/{ => cache}/InstanceH2CacheDAO.java | 9 +-
.../dao/{ => cache}/NetworkAddressH2CacheDAO.java | 2 +-
.../h2/dao/{ => cache}/ServiceNameH2CacheDAO.java | 2 +-
.../cpump/AbstractCpuMetricH2PersistenceDAO.java | 64 +++++
.../cpump/CpuDayMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuHourMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuMinuteMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuMonthMetricH2PersistenceDAO.java} | 24 +-
.../cpump/CpuSecondMetricH2PersistenceDAO.java} | 24 +-
.../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java | 67 ++++++
.../gcmp/GCDayMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCHourMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCMinuteMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCMonthMetricH2PersistenceDAO.java} | 26 +--
.../gcmp/GCSecondMetricH2PersistenceDAO.java} | 26 +--
.../AbstractInstanceMetricH2PersistenceDAO.java | 96 ++++++++
.../imp/InstanceDayMetricH2PersistenceDAO.java} | 26 +--
.../imp/InstanceHourMetricH2PersistenceDAO.java} | 26 +--
.../imp/InstanceMinuteMetricH2PersistenceDAO.java} | 26 +--
.../imp/InstanceMonthMetricH2PersistenceDAO.java} | 26 +--
.../AbstractInstanceMappingH2PersistenceDAO.java | 62 +++++
.../InstanceMappingDayH2PersistenceDAO.java} | 34 +--
.../impp/InstanceMappingHourH2PersistenceDAO.java} | 24 +-
.../InstanceMappingMinuteH2PersistenceDAO.java} | 24 +-
.../InstanceMappingMonthH2PersistenceDAO.java} | 24 +-
...actInstanceReferenceMetricH2PersistenceDAO.java | 98 ++++++++
...nstanceReferenceDayMetricH2PersistenceDAO.java} | 26 +--
...stanceReferenceHourMetricH2PersistenceDAO.java} | 26 +--
...anceReferenceMinuteMetricH2PersistenceDAO.java} | 26 +--
...tanceReferenceMonthMetricH2PersistenceDAO.java} | 26 +--
.../AbstractMemoryMetricH2PersistenceDAO.java | 72 ++++++
.../MemoryDayMetricH2PersistenceDAO.java} | 34 +--
.../MemoryHourMetricH2PersistenceDAO.java} | 34 +--
.../MemoryMinuteMetricH2PersistenceDAO.java} | 34 +--
.../MemoryMonthMetricH2PersistenceDAO.java} | 34 +--
.../MemorySecondMetricH2PersistenceDAO.java} | 34 +--
.../AbstractMemoryPoolMetricH2PersistenceDAO.java | 72 ++++++
.../MemoryPoolDayMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolHourMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolMinuteMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolMonthMetricH2PersistenceDAO.java} | 34 +--
.../MemoryPoolSecondMetricH2PersistenceDAO.java} | 34 +--
.../ApplicationRegisterH2DAO.java} | 9 +-
.../InstanceRegisterH2DAO.java} | 8 +-
.../NetworkAddressRegisterH2DAO.java | 2 +-
.../ServiceNameRegisterH2DAO.java} | 8 +-
.../smp/AbstractServiceMetricH2PersistenceDAO.java | 96 ++++++++
.../ServiceDayMetricH2PersistenceDAO.java} | 34 +--
.../ServiceHourMetricH2PersistenceDAO.java} | 34 +--
.../ServiceMinuteMetricH2PersistenceDAO.java} | 34 +--
.../ServiceMonthMetricH2PersistenceDAO.java} | 34 +--
...ractServiceReferenceMetricH2PersistenceDAO.java | 102 ++++++++
...ServiceReferenceDayMetricH2PersistenceDAO.java} | 34 +--
...erviceReferenceHourMetricH2PersistenceDAO.java} | 34 +--
...viceReferenceMinuteMetricH2PersistenceDAO.java} | 34 +--
...rviceReferenceMonthMetricH2PersistenceDAO.java} | 34 +--
.../h2/define/GlobalTraceH2TableDefine.java | 3 +-
.../h2/define/SegmentCostH2TableDefine.java | 5 +-
.../storage/h2/define/SegmentH2TableDefine.java | 1 -
.../ApplicationAlarmH2TableDefine.java} | 24 +-
.../ApplicationAlarmListH2TableDefine.java} | 26 ++-
.../ApplicationReferenceAlarmH2TableDefine.java | 46 ++++
...ApplicationReferenceAlarmListH2TableDefine.java | 46 ++++
.../define/alarm/InstanceAlarmH2TableDefine.java | 46 ++++
.../alarm/InstanceAlarmListH2TableDefine.java | 46 ++++
.../alarm/InstanceReferenceAlarmH2TableDefine.java | 48 ++++
.../InstanceReferenceAlarmListH2TableDefine.java | 48 ++++
.../ServiceAlarmH2TableDefine.java} | 30 +--
.../ServiceAlarmListH2TableDefine.java} | 32 +--
.../alarm/ServiceReferenceAlarmH2TableDefine.java | 50 ++++
.../ServiceReferenceAlarmListH2TableDefine.java | 50 ++++
.../AbstractApplicationMetricH2TableDefine.java | 61 +++++
.../amp/ApplicationDayMetricH2TableDefine.java} | 17 +-
.../amp/ApplicationHourMetricH2TableDefine.java} | 17 +-
.../amp/ApplicationMinuteMetricH2TableDefine.java} | 17 +-
.../amp/ApplicationMonthMetricH2TableDefine.java} | 17 +-
...AbstractApplicationComponentH2TableDefine.java} | 14 +-
.../ApplicationComponentDayH2TableDefine.java} | 17 +-
.../ApplicationComponentHourH2TableDefine.java} | 17 +-
.../ApplicationComponentMinuteH2TableDefine.java} | 17 +-
.../ApplicationComponentMonthH2TableDefine.java} | 17 +-
.../AbstractApplicationMappingH2TableDefine.java} | 14 +-
.../ApplicationMappingDayH2TableDefine.java} | 17 +-
.../ApplicationMappingHourH2TableDefine.java} | 17 +-
.../ApplicationMappingMinuteH2TableDefine.java} | 17 +-
.../ApplicationMappingMonthH2TableDefine.java} | 17 +-
...ctApplicationReferenceMetricH2TableDefine.java} | 18 +-
...pplicationReferenceDayMetricH2TableDefine.java} | 17 +-
...plicationReferenceHourMetricH2TableDefine.java} | 17 +-
...icationReferenceMinuteMetricH2TableDefine.java} | 17 +-
...licationReferenceMonthMetricH2TableDefine.java} | 17 +-
.../AbstractCpuMetricH2TableDefine.java} | 13 +-
.../cpu/CpuDayMetricH2TableDefine.java} | 17 +-
.../cpu/CpuHourMetricH2TableDefine.java} | 17 +-
.../cpu/CpuMinuteMetricH2TableDefine.java} | 17 +-
.../cpu/CpuMonthMetricH2TableDefine.java} | 17 +-
.../cpu/CpuSecondMetricH2TableDefine.java} | 17 +-
.../AbstractGCMetricH2TableDefine.java} | 14 +-
.../gc/GCDayMetricH2TableDefine.java} | 17 +-
.../gc/GCHourMetricH2TableDefine.java} | 17 +-
.../gc/GCMinuteMetricH2TableDefine.java} | 17 +-
.../gc/GCMonthMetricH2TableDefine.java} | 17 +-
.../gc/GCSecondMetricH2TableDefine.java} | 17 +-
.../AbstractInstanceMetricH2TableDefine.java} | 13 +-
.../imp/InstanceDayMetricH2TableDefine.java} | 17 +-
.../imp/InstanceHourMetricH2TableDefine.java} | 17 +-
.../imp/InstanceMinuteMetricH2TableDefine.java} | 17 +-
.../imp/InstanceMonthMetricH2TableDefine.java} | 17 +-
.../AbstractInstanceMappingH2TableDefine.java} | 11 +-
.../InstanceMappingDayH2TableDefine.java} | 17 +-
.../InstanceMappingHourH2TableDefine.java} | 17 +-
.../InstanceMappingMinuteH2TableDefine.java} | 17 +-
.../InstanceMappingMonthH2TableDefine.java} | 17 +-
...tractInstanceReferenceMetricH2TableDefine.java} | 14 +-
.../InstanceReferenceDayMetricH2TableDefine.java} | 16 +-
.../InstanceReferenceHourMetricH2TableDefine.java} | 16 +-
...nstanceReferenceMinuteMetricH2TableDefine.java} | 16 +-
...InstanceReferenceMonthMetricH2TableDefine.java} | 16 +-
.../AbstractMemoryMetricH2TableDefine.java} | 15 +-
.../memory/MemoryDayMetricH2TableDefine.java} | 17 +-
.../memory/MemoryHourMetricH2TableDefine.java} | 17 +-
.../memory/MemoryMinuteMetricH2TableDefine.java} | 17 +-
.../memory/MemoryMonthMetricH2TableDefine.java} | 17 +-
.../memory/MemorySecondMetricH2TableDefine.java} | 17 +-
.../AbstractMemoryPoolMetricH2TableDefine.java} | 15 +-
.../mpool/MemoryPoolDayMetricH2TableDefine.java} | 17 +-
.../mpool/MemoryPoolHourMetricH2TableDefine.java} | 17 +-
.../MemoryPoolMinuteMetricH2TableDefine.java} | 17 +-
.../mpool/MemoryPoolMonthMetricH2TableDefine.java} | 17 +-
.../MemoryPoolSecondMetricH2TableDefine.java} | 17 +-
.../{ => register}/ApplicationH2TableDefine.java | 4 +-
.../{ => register}/InstanceH2TableDefine.java | 4 +-
.../NetworkAddressH2TableDefine.java | 2 +-
.../{ => register}/ServiceNameH2TableDefine.java | 2 +-
.../AbstractServiceMetricH2TableDefine.java} | 15 +-
.../smp/ServiceDayMetricH2TableDefine.java} | 17 +-
.../smp/ServiceHourMetricH2TableDefine.java} | 17 +-
.../smp/ServiceMinuteMetricH2TableDefine.java} | 17 +-
.../smp/ServiceMonthMetricH2TableDefine.java} | 17 +-
...stractServiceReferenceMetricH2TableDefine.java} | 17 +-
.../ServiceReferenceDayMetricH2TableDefine.java} | 17 +-
.../ServiceReferenceHourMetricH2TableDefine.java} | 17 +-
...ServiceReferenceMinuteMetricH2TableDefine.java} | 17 +-
.../ServiceReferenceMonthMetricH2TableDefine.java} | 17 +-
.../main/resources/META-INF/defines/storage.define | 103 ++++++--
...alking.apm.collector.core.module.ModuleProvider | 3 +-
261 files changed, 4163 insertions(+), 4014 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.