[incubator-skywalking] branch h2-storage updated (84e44b8 -> efeaf5b)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch h2-storage
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 84e44b8  Merge branch 'master' into h2-storage
     add b426390  Support metrics downsampling. (#1765)
     add c467e5c  Fixed JVM handler error. Forgot to use break in switch case code. (#1766)
     add efeaf5b  Merge branch 'master' into h2-storage

No new revisions were added by this update.

Summary of changes:
 .../skywalking/oap/server/core/CoreModule.java     |  3 +-
 .../oap/server/core/CoreModuleConfig.java          | 17 ++++--
 .../oap/server/core/CoreModuleProvider.java        |  2 +
 .../core/analysis/generated/all/AllDispatcher.java |  2 +-
 .../generated/all/AllHeatmapIndicator.java         | 10 +---
 .../analysis/generated/all/AllP50Indicator.java    | 10 +---
 .../analysis/generated/all/AllP75Indicator.java    | 10 +---
 .../analysis/generated/all/AllP90Indicator.java    | 10 +---
 .../analysis/generated/all/AllP95Indicator.java    | 10 +---
 .../analysis/generated/all/AllP99Indicator.java    | 10 +---
 .../generated/endpoint/EndpointAvgIndicator.java   | 12 ++--
 .../generated/endpoint/EndpointCpmIndicator.java   | 12 ++--
 .../generated/endpoint/EndpointDispatcher.java     |  2 +-
 .../generated/endpoint/EndpointP50Indicator.java   | 12 ++--
 .../generated/endpoint/EndpointP75Indicator.java   | 12 ++--
 .../generated/endpoint/EndpointP90Indicator.java   | 12 ++--
 .../generated/endpoint/EndpointP95Indicator.java   | 12 ++--
 .../generated/endpoint/EndpointP99Indicator.java   | 12 ++--
 .../generated/endpoint/EndpointSlaIndicator.java   | 12 ++--
 .../EndpointRelationCpmIndicator.java              | 12 ++--
 .../EndpointRelationDispatcher.java                |  2 +-
 .../EndpointRelationRespTimeIndicator.java         | 12 ++--
 .../generated/service/ServiceCpmIndicator.java     | 12 ++--
 .../generated/service/ServiceDispatcher.java       |  2 +-
 .../generated/service/ServiceP50Indicator.java     | 12 ++--
 .../generated/service/ServiceP75Indicator.java     | 12 ++--
 .../generated/service/ServiceP90Indicator.java     | 12 ++--
 .../generated/service/ServiceP95Indicator.java     | 12 ++--
 .../generated/service/ServiceP99Indicator.java     | 12 ++--
 .../service/ServiceRespTimeIndicator.java          | 12 ++--
 .../generated/service/ServiceSlaIndicator.java     | 12 ++--
 .../ServiceInstanceCpmIndicator.java               | 12 ++--
 .../serviceinstance/ServiceInstanceDispatcher.java |  2 +-
 .../ServiceInstanceRespTimeIndicator.java          | 12 ++--
 .../InstanceJvmCpuIndicator.java                   | 12 ++--
 .../ServiceInstanceJVMCPUDispatcher.java           |  2 +-
 .../InstanceJvmOldGcCountIndicator.java            | 12 ++--
 .../InstanceJvmOldGcTimeIndicator.java             | 12 ++--
 .../InstanceJvmYoungGcCountIndicator.java          | 12 ++--
 .../InstanceJvmYoungGcTimeIndicator.java           | 12 ++--
 .../ServiceInstanceJVMGCDispatcher.java            |  2 +-
 .../InstanceJvmMemoryHeapIndicator.java            | 12 ++--
 .../InstanceJvmMemoryHeapMaxIndicator.java         | 12 ++--
 .../InstanceJvmMemoryNoheapIndicator.java          | 12 ++--
 .../InstanceJvmMemoryNoheapMaxIndicator.java       | 12 ++--
 .../ServiceInstanceJVMMemoryDispatcher.java        |  4 +-
 .../ServiceInstanceJVMMemoryPoolDispatcher.java    |  2 +-
 .../ServiceInstanceRelationDispatcher.java         |  2 +-
 .../ServiceRelationClientCallSlaIndicator.java     | 12 ++--
 .../ServiceRelationClientCpmIndicator.java         | 12 ++--
 .../ServiceRelationClientRespTimeIndicator.java    | 12 ++--
 .../servicerelation/ServiceRelationDispatcher.java |  2 +-
 .../ServiceRelationServerCallSlaIndicator.java     | 12 ++--
 .../ServiceRelationServerCpmIndicator.java         | 12 ++--
 .../ServiceRelationServerRespTimeIndicator.java    | 12 ++--
 ...ConstOne.java => IndicatorAnnotationUtils.java} | 10 ++--
 .../analysis/worker/IndicatorPersistentWorker.java |  4 +-
 .../core/analysis/worker/IndicatorProcess.java     | 39 ++++++++++---
 .../core/analysis/worker/IndicatorTransWorker.java | 64 ++++++++++++++++++++++
 .../core/config/DownsamplingConfigService.java     | 57 +++++++++++++++++++
 ...der.java => DownsampleingModelNameBuilder.java} | 14 ++---
 .../{TimePyramid.java => Downsampling.java}        |  4 +-
 .../annotation/StorageAnnotationListener.java      |  5 +-
 .../oap/server/core/storage/model/Model.java       |  8 ++-
 .../server/core/storage/model/ModelInstaller.java  | 24 +++++++-
 .../provider/handler/JVMMetricsServiceHandler.java | 13 +++--
 .../handler/JVMMetricsServiceHandlerMainTest.java  |  7 ++-
 .../src/main/resources/application.yml             |  4 ++
 .../elasticsearch/query/AggregationQueryEsDAO.java | 12 ++--
 .../elasticsearch/query/MetricQueryEsDAO.java      |  8 +--
 .../elasticsearch/query/TopologyQueryEsDAO.java    | 44 ++++++---------
 71 files changed, 431 insertions(+), 412 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/{ConstOne.java => IndicatorAnnotationUtils.java} (84%)
 create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorTransWorker.java
 create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java
 rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{TimePyramidTableNameBuilder.java => DownsampleingModelNameBuilder.java} (73%)
 rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{TimePyramid.java => Downsampling.java} (94%)