You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/01/14 14:46:25 UTC
[iotdb] branch master updated (2f49925 -> 001490b)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 2f49925 [IOTDB-2276] Optimize aligned query with value filter to accelerate it and reduce its memory footprint (#4768)
add 001490b [IOTDB-2315] Modify some problems of metric (#4782)
No new revisions were added by this update.
Summary of changes:
docs/UserGuide/System-Tools/Metric-Tool.md | 85 +++++-----
docs/zh/UserGuide/System-Tools/Metric-Tool.md | 90 +++++-----
metrics/ReadMe.md | 72 +++++---
.../dropwizard/DropwizardMetricManager.java | 29 +---
.../reporter/prometheus/PushGateway.java | 13 +-
.../dropwizard/DropwizardMetricManagerTest.java | 22 +--
.../metrics/dropwizard/DropwizardMetricTest.java | 181 ---------------------
.../dropwizard/DropwizardMetricTestPlan.java | 62 -------
.../metrics/dropwizard/PrometheusRunTest.java | 42 -----
.../src/test/resources/iotdb-metric.yml | 42 -----
.../main/assembly/resources/conf/iotdb-metric.yml | 11 +-
.../apache/iotdb/metrics/CompositeReporter.java | 18 +-
...ingCounter.java => DoNothingMetricService.java} | 15 +-
.../org/apache/iotdb/metrics/MetricManager.java | 12 --
.../org/apache/iotdb/metrics/MetricService.java | 88 +++++-----
.../apache/iotdb/metrics/config/MetricConfig.java | 46 ++++++
.../metrics/config/MetricConfigDescriptor.java | 43 ++++-
.../ReloadLevel.java} | 11 +-
.../iotdb/metrics/impl/DoNothingMetricManager.java | 20 ---
.../iotdb/metrics/utils/PredefinedMetric.java | 4 +-
.../iotdb/metrics/config/MetricConfigTest.java | 4 +-
.../micrometer/MicrometerMetricManager.java | 66 +-------
.../micrometer/reporter/MicrometerJmxReporter.java | 9 +-
.../reporter/MicrometerPrometheusReporter.java | 21 ++-
.../micrometer/MicrometerMetricManagerTest.java | 15 +-
.../metrics/micrometer/MicrometerMetricTest.java | 181 ---------------------
.../micrometer/MicrometerMetricTestPlan.java | 62 -------
.../src/test/resources/iotdb-metric.yml | 42 -----
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../iotdb/db/service/metrics/MetricsService.java | 164 ++++++-------------
31 files changed, 431 insertions(+), 1046 deletions(-)
delete mode 100644 metrics/dropwizard-metrics/src/test/java/org/apache/iotdb/metrics/dropwizard/DropwizardMetricTest.java
delete mode 100644 metrics/dropwizard-metrics/src/test/java/org/apache/iotdb/metrics/dropwizard/DropwizardMetricTestPlan.java
delete mode 100644 metrics/dropwizard-metrics/src/test/java/org/apache/iotdb/metrics/dropwizard/PrometheusRunTest.java
delete mode 100644 metrics/dropwizard-metrics/src/test/resources/iotdb-metric.yml
copy metrics/interface/src/main/java/org/apache/iotdb/metrics/{impl/DoNothingCounter.java => DoNothingMetricService.java} (77%)
copy metrics/interface/src/main/java/org/apache/iotdb/metrics/{utils/PredefinedMetric.java => config/ReloadLevel.java} (84%)
delete mode 100644 metrics/micrometer-metrics/src/test/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricTest.java
delete mode 100644 metrics/micrometer-metrics/src/test/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricTestPlan.java
delete mode 100644 metrics/micrometer-metrics/src/test/resources/iotdb-metric.yml