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 <[email protected]> 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 "[email protected]" <[email protected]>.
