You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/11/25 14:11:28 UTC

[iotdb] branch lmh/UpdateEnDoc updated (772f3450c6 -> bca03b3ccc)

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

hui pushed a change to branch lmh/UpdateEnDoc
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 772f3450c6 update userGuide(en)
     add 444bfade77 update trigger jar
     add 9f12b58c0b [IOTDB-5028] Using `show timeseries` to query the schema in import-csv (#8130)
     add 91aa0341ae [IOTDB-4994] Unify reporter (#8144)
     add 26bcaea5d7 Add readme docs for TsFile tools (#8154)
     add e9b287c064 Update auth config (#8162)
     add c1cd52be0a change log level of RatisConsensus(#8146)
     add 818c3e6272 Update description of missing params to user-guide (#8157)
     add 713f03ba74 Update doc of mem control (#8159)
     add bcd0305f70 Fix the issue when doing distribution plan for aggregation
     add b0c2d67f41 make simple consensuse as default for confignode (#8160)
     add 1eb95896db add mqtt broker and rest service document (#8161)
     add 53d69a7d33 Split trigger doc into muitlple files for better display (#8169)
     add bca03b3ccc merge master

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/iotdb/tool/ImportCsv.java |   65 +-
 .../statemachine/ConfigNodeRegionStateMachine.java |    2 +-
 .../iotdb/confignode/manager/ConfigManager.java    |    1 -
 .../manager/load/LoadManagerMetrics.java           |  104 +-
 .../iotdb/confignode/manager/node/NodeManager.java |    6 -
 .../persistence/metric/NodeInfoMetrics.java        |   95 --
 .../persistence/metric/PartitionInfoMetrics.java   |   14 +-
 .../thrift/ConfigNodeRPCServiceHandlerMetrics.java |    2 +-
 .../thrift/ConfigNodeRPCServiceMetrics.java        |    2 +-
 .../confignode1conf/iotdb-confignode.properties    |    5 +-
 .../confignode2conf/iotdb-confignode.properties    |    3 +-
 .../confignode3conf/iotdb-confignode.properties    |    3 +-
 .../multileader/MultiLeaderServerMetrics.java      |    4 +-
 .../logdispatcher/LogDispatcherThreadMetrics.java  |    4 +-
 .../MultiLeaderMemoryManagerMetrics.java           |    2 +-
 .../iotdb/consensus/ratis/RatisConsensus.java      |    6 +-
 .../IoTDB-Data-Dir-Overview-Tool.md                |   82 ++
 .../TsFile-Resource-Sketch-Tool.md                 |   79 ++
 .../Maintenance-Tools/TsFile-Sketch-Tool.md        |  108 ++
 docs/UserGuide/Reference/Common-Config-Manual.md   | 1087 +++++++++++-----
 .../UserGuide/Trigger/Configuration-Parameters.md  |   20 +-
 .../Trigger.md => Trigger/Implement-Trigger.md}    |  201 +--
 docs/UserGuide/Trigger/Instructions.md             |   51 +
 docs/UserGuide/Trigger/Notes.md                    |   30 +
 docs/UserGuide/Trigger/Trigger-Management.md       |  152 +++
 .../IoTDB-Data-Dir-Overview-Tool.md                |   82 ++
 .../TsFile-Resource-Sketch-Tool.md                 |   79 ++
 .../Maintenance-Tools/TsFile-Sketch-Tool.md        |  108 ++
 .../zh/UserGuide/Reference/Common-Config-Manual.md | 1324 ++++++++++++--------
 .../Configuration-Parameters.md}                   |    9 +-
 .../Trigger/{Trigger.md => Implement-Trigger.md}   |  198 +--
 docs/zh/UserGuide/Trigger/Instructions.md          |   46 +
 docs/zh/UserGuide/Trigger/Notes.md                 |   33 +
 docs/zh/UserGuide/Trigger/Trigger-Management.md    |  152 +++
 .../trigger/example/TriggerFireTimesCounter.java   |    5 +
 .../src/test/resources/TriggerFireTimesCounter.jar |  Bin 1324 -> 1397 bytes
 metrics/dropwizard-metrics/pom.xml                 |    5 -
 .../reporter/DropwizardIoTDBReporter.java          |   79 --
 .../dropwizard/reporter/DropwizardJmxReporter.java |    9 +-
 .../dropwizard/reporter/DropwizardMetricType.java  |   38 -
 .../reporter/DropwizardMetricsExporter.java        |  168 ---
 .../reporter/DropwizardPrometheusReporter.java     |  118 --
 .../metrics/dropwizard/reporter/IoTDBReporter.java |  278 ----
 .../type/DropwizardHistogramSnapshot.java          |    7 -
 ... org.apache.iotdb.metrics.reporter.JmxReporter} |    4 +-
 metrics/interface/pom.xml                          |   11 +-
 .../iotdb/metrics/AbstractMetricManager.java       |   99 +-
 .../iotdb/metrics/AbstractMetricService.java       |  153 +--
 .../metrics/{reporter => }/CompositeReporter.java  |    3 +-
 .../iotdb/metrics/DoNothingMetricService.java      |    4 +-
 .../metrics/impl/DoNothingHistogramSnapshot.java   |    7 -
 .../metricsets/jvm/JvmClassLoaderMetrics.java      |    4 +-
 .../metrics/metricsets/jvm/JvmCompileMetrics.java  |    2 +-
 .../iotdb/metrics/metricsets/jvm/JvmGcMetrics.java |    4 +-
 .../metrics/metricsets/jvm/JvmMemoryMetrics.java   |   22 +-
 .../metrics/metricsets/jvm/JvmThreadMetrics.java   |    8 +-
 .../iotdb/metrics/reporter/InternalReporter.java   |  104 --
 .../reporter/{Reporter.java => JmxReporter.java}   |   14 +-
 .../apache/iotdb/metrics/reporter/Reporter.java    |    4 -
 .../reporter/iotdb/InternalIoTDBReporter.java      |   67 +
 .../metrics/reporter/iotdb/IoTDBReporter.java      |  103 ++
 .../MemoryInternalIoTDBReporter.java}              |   30 +-
 .../reporter/iotdb/SessionIoTDBReporter.java       |  175 +++
 .../reporter/prometheus/PrometheusReporter.java    |  222 ++++
 .../reporter/prometheus}/PrometheusTextWriter.java |   44 +-
 .../org/apache/iotdb/metrics/type/AutoGauge.java   |    7 +
 .../org/apache/iotdb/metrics/type/Counter.java     |    7 +
 .../java/org/apache/iotdb/metrics/type/Gauge.java  |    7 +
 .../org/apache/iotdb/metrics/type/Histogram.java   |    8 +
 .../iotdb/metrics/type/HistogramSnapshot.java      |   18 +-
 .../org/apache/iotdb/metrics/type/IMetric.java     |    6 +-
 .../java/org/apache/iotdb/metrics/type/Rate.java   |   11 +
 .../java/org/apache/iotdb/metrics/type/Timer.java  |    7 +
 .../iotdb/metrics/utils/IoTDBMetricsUtils.java     |   75 +-
 .../org/apache/iotdb/metrics/utils/MetricInfo.java |    9 +-
 .../org/apache/iotdb/metrics/utils/MetricType.java |    1 +
 .../micrometer/MicrometerMetricManager.java        |    1 +
 .../micrometer/reporter/IoTDBMeterRegistry.java    |  149 ---
 .../micrometer/reporter/IoTDBRegistryConfig.java   |   50 -
 .../reporter/MicrometerIoTDBReporter.java          |   92 --
 .../micrometer/reporter/MicrometerJmxReporter.java |    7 +-
 .../reporter/MicrometerPrometheusReporter.java     |  118 --
 .../type/MicrometerHistogramSnapshot.java          |    7 -
 ... org.apache.iotdb.metrics.reporter.JmxReporter} |    4 +-
 .../resources/conf/iotdb-common.properties         |   14 +-
 .../commons/service/metric/MetricService.java      |   10 +-
 .../resources/conf/iotdb-datanode.properties       |    2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   18 -
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   14 +-
 .../iotdb/db/engine/cache/ChunkCacheMetrics.java   |    2 +-
 .../cache/TimeSeriesMetadataCacheMetrics.java      |    4 +-
 .../iotdb/db/engine/flush/FlushManagerMetrics.java |    4 +-
 .../db/engine/storagegroup/DataRegionMetrics.java  |    2 +-
 .../storagegroup/TsFileProcessorInfoMetrics.java   |    2 +-
 .../metadata/cache/DataNodeSchemaCacheMetrics.java |    2 +-
 .../rescon/SchemaStatisticsManagerMetrics.java     |    2 +-
 .../exchange/MPPDataExchangeServiceMetrics.java    |    2 +-
 ...MppDataExchangeServiceThriftHandlerMetrics.java |    2 +-
 .../plan/planner/distribution/SourceRewriter.java  |    2 +-
 .../pool/RawQueryReadTaskPoolManagerMetrics.java   |    4 +-
 .../service/DataNodeInternalRPCServiceMetrics.java |    2 +-
 .../apache/iotdb/db/service/RPCServiceMetrics.java |    2 +-
 .../iotdb/db/service/metrics/FileMetrics.java      |   14 +-
 .../db/service/metrics/IoTDBInternalReporter.java  |  126 +-
 .../iotdb/db/service/metrics/ProcessMetrics.java   |   21 +-
 .../iotdb/db/service/metrics/SystemMetrics.java    |   23 +-
 .../InternalServiceThriftHandlerMetrics.java       |    5 +-
 .../handler/RPCServiceThriftHandlerMetrics.java    |    2 +-
 .../apache/iotdb/db/metric/MetricServiceTest.java  |   64 +-
 .../datanode1conf/iotdb-datanode.properties        |    3 +-
 .../datanode2conf/iotdb-datanode.properties        |    3 +-
 .../datanode3conf/iotdb-datanode.properties        |    3 +-
 site/src/main/.vuepress/config.js                  |   18 +-
 113 files changed, 3714 insertions(+), 3192 deletions(-)
 delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/metric/NodeInfoMetrics.java
 create mode 100644 docs/UserGuide/Maintenance-Tools/IoTDB-Data-Dir-Overview-Tool.md
 create mode 100644 docs/UserGuide/Maintenance-Tools/TsFile-Resource-Sketch-Tool.md
 create mode 100644 docs/UserGuide/Maintenance-Tools/TsFile-Sketch-Tool.md
 copy server/file-changelists/TsFileMods-changelist.md => docs/UserGuide/Trigger/Configuration-Parameters.md (61%)
 rename docs/UserGuide/{Triggers/Trigger.md => Trigger/Implement-Trigger.md} (51%)
 create mode 100644 docs/UserGuide/Trigger/Instructions.md
 create mode 100644 docs/UserGuide/Trigger/Notes.md
 create mode 100644 docs/UserGuide/Trigger/Trigger-Management.md
 create mode 100644 docs/zh/UserGuide/Maintenance-Tools/IoTDB-Data-Dir-Overview-Tool.md
 create mode 100644 docs/zh/UserGuide/Maintenance-Tools/TsFile-Resource-Sketch-Tool.md
 create mode 100644 docs/zh/UserGuide/Maintenance-Tools/TsFile-Sketch-Tool.md
 copy docs/zh/UserGuide/{Syntax-Conventions/Detailed-Grammar.md => Trigger/Configuration-Parameters.md} (64%)
 rename docs/zh/UserGuide/Trigger/{Trigger.md => Implement-Trigger.md} (51%)
 create mode 100644 docs/zh/UserGuide/Trigger/Instructions.md
 create mode 100644 docs/zh/UserGuide/Trigger/Notes.md
 create mode 100644 docs/zh/UserGuide/Trigger/Trigger-Management.md
 delete mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/DropwizardIoTDBReporter.java
 delete mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/DropwizardMetricType.java
 delete mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/DropwizardMetricsExporter.java
 delete mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/DropwizardPrometheusReporter.java
 delete mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/IoTDBReporter.java
 rename metrics/dropwizard-metrics/src/main/resources/META-INF/services/{org.apache.iotdb.metrics.reporter.Reporter => org.apache.iotdb.metrics.reporter.JmxReporter} (85%)
 rename metrics/interface/src/main/java/org/apache/iotdb/metrics/{reporter => }/CompositeReporter.java (97%)
 delete mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/InternalReporter.java
 copy metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/{Reporter.java => JmxReporter.java} (77%)
 create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/InternalIoTDBReporter.java
 create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/IoTDBReporter.java
 rename metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/{MemoryInternalReporter.java => iotdb/MemoryInternalIoTDBReporter.java} (64%)
 create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/SessionIoTDBReporter.java
 create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/prometheus/PrometheusReporter.java
 rename metrics/{dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter => interface/src/main/java/org/apache/iotdb/metrics/reporter/prometheus}/PrometheusTextWriter.java (72%)
 delete mode 100644 metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/IoTDBMeterRegistry.java
 delete mode 100644 metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/IoTDBRegistryConfig.java
 delete mode 100644 metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/MicrometerIoTDBReporter.java
 delete mode 100644 metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/MicrometerPrometheusReporter.java
 rename metrics/micrometer-metrics/src/main/resources/META-INF/services/{org.apache.iotdb.metrics.reporter.Reporter => org.apache.iotdb.metrics.reporter.JmxReporter} (85%)