You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/10/21 11:47:40 UTC
[iotdb] 01/02: Merge branch 'master' into metric/multiLeader
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch ml_metrics_add_log
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c43bb6849a3c1e84fde6cef8a8afe83f94cca67e
Merge: 2dbae112cc 63768fb039
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Fri Oct 21 14:53:18 2022 +0800
Merge branch 'master' into metric/multiLeader
docs/zh/UserGuide/Alert/Alerting.md | 108 +-
docs/zh/UserGuide/Alert/Triggers.md | 1132 ++++++--------------
.../iotdb/external/api/IPropertiesLoader.java | 12 +-
...sNumerLimiter.java => ISeriesNumerMonitor.java} | 8 +-
.../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 1 +
.../util/TSFileConfigUtilCompletenessTest.java | 12 +-
grafana-plugin/README.md | 363 ++++++-
grafana-plugin/src/plugin.json | 4 +-
.../db/it/trigger/IoTDBTriggerManagementIT.java | 486 +++++++++
metrics/dropwizard-metrics/pom.xml | 6 -
.../apache/iotdb/commons/conf/IoTDBConstant.java | 4 -
.../resources/conf/iotdb-datanode.properties | 21 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 42 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 73 +-
.../db/engine/storagegroup/TsFileProcessor.java | 9 +-
.../db/metadata/schemaregion/SchemaEngine.java | 46 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 38 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 34 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 5 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 4 -
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 3 -
.../db/trigger/executor/TriggerFireVisitor.java | 3 +-
.../java/org/apache/iotdb/db/utils/FilesUtils.java | 43 +
.../org/apache/iotdb/db/utils/JarLoaderUtil.java | 150 ---
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 70 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 12 +
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 4 +-
27 files changed, 1406 insertions(+), 1287 deletions(-)