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

caogaofei pushed a commit to branch beyyes/master1
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 549a13bf711017768535150b43f515a60ed72ff5
Merge: 20556d3de1 95fa01f4fe
Author: Beyyes <[email protected]>
AuthorDate: Mon Nov 7 10:16:40 2022 +0800

    merge with master

 client-go                                          |    2 +-
 .../resources/conf/iotdb-confignode.properties     |   41 +-
 .../assembly/resources/sbin/start-confignode.bat   |    2 +-
 .../assembly/resources/sbin/start-confignode.sh    |    4 +-
 .../iotdb/confignode/conf/ConfigNodeConfig.java    |  167 ++-
 .../confignode/conf/ConfigNodeDescriptor.java      |   91 +-
 .../confignode/conf/ConfigNodeStartupCheck.java    |    6 +-
 .../statemachine/PartitionRegionStateMachine.java  |    3 +-
 .../iotdb/confignode/manager/ConsensusManager.java |   25 +-
 .../iotdb/confignode/manager/ProcedureManager.java |    4 +-
 .../iotdb/confignode/manager/UDFManager.java       |    4 +-
 .../iotdb/confignode/manager/node/NodeManager.java |    2 +-
 .../procedure/env/ConfigNodeProcedureEnv.java      |   60 +-
 .../procedure/store/ConfigProcedureStore.java      |    2 +-
 .../confignode1conf/iotdb-common.properties        |    2 +-
 .../confignode1conf/iotdb-confignode.properties    |    2 +-
 .../confignode2conf/iotdb-common.properties        |    2 +-
 .../confignode2conf/iotdb-confignode.properties    |    2 +-
 .../confignode3conf/iotdb-common.properties        |    2 +-
 .../confignode3conf/iotdb-confignode.properties    |    2 +-
 docker/src/main/Dockerfile-1c1d                    |    3 +
 docker/src/main/Dockerfile-1c1d-influxdb           |    5 +-
 docs/UserGuide/Alert/Alerting.md                   |    2 +-
 docs/UserGuide/{Alert => Process-Data}/Triggers.md |    2 +-
 docs/UserGuide/QuickStart/QuickStart.md            |    2 +-
 docs/UserGuide/UDF-Library/Data-Profiling.md       |   73 ++
 docs/UserGuide/Write-Data/REST-API.md              |   36 +-
 docs/zh/UserGuide/Alert/Alerting.md                |    2 +-
 .../UserGuide/{Alert => Process-Data}/Triggers.md  |    2 +-
 docs/zh/UserGuide/QuickStart/QuickStart.md         |    4 +-
 docs/zh/UserGuide/UDF-Library/Data-Profiling.md    |   74 ++
 docs/zh/UserGuide/Write-Data/REST-API.md           |   35 +-
 integration-test/README.md                         |    2 +-
 .../org/apache/iotdb/it/env/ConfigNodeWrapper.java |    2 +-
 .../org/apache/iotdb/it/env/DataNodeWrapper.java   |    2 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    2 +-
 .../java/org/apache/iotdb/db/it/IoTDBFilterIT.java |   62 +-
 .../it/IoTDBSyntaxConventionStringLiteralIT.java   |    4 +-
 library-udf/src/assembly/tools/register-UDF.bat    |    1 +
 library-udf/src/assembly/tools/register-UDF.sh     |    1 +
 .../iotdb/library/dprofile/UDAFQuantile.java       |  127 +++
 .../library/dprofile/util/HeapLongKLLSketch.java   |  356 +++++++
 .../dprofile/util/KLLSketchForQuantile.java        |  172 +++
 .../resources/conf/iotdb-common.properties         | 1122 +++++++++-----------
 .../apache/iotdb/commons/conf/IoTDBConstant.java   |    4 +-
 pom.xml                                            |    2 +-
 .../resources/conf/iotdb-datanode.properties       |   47 +-
 .../src/assembly/resources/sbin/start-datanode.bat |    2 +-
 .../src/assembly/resources/sbin/start-datanode.sh  |    4 +-
 .../src/assembly/resources/sbin/start-server.bat   |  177 ---
 server/src/assembly/resources/sbin/start-server.sh |  249 -----
 server/src/assembly/resources/sbin/stop-server.bat |   38 -
 server/src/assembly/resources/sbin/stop-server.sh  |   74 --
 .../assembly/resources/tools/detect-watermark.sh   |    2 +-
 .../assembly/resources/tools/rocksdb-transfer.bat  |    2 +-
 .../assembly/resources/tools/rocksdb-transfer.sh   |    2 +-
 .../resources/tools/schema/SchemaFileSketcher.sh   |    3 +-
 .../assembly/resources/tools/schema/mLogParser.sh  |    3 +-
 .../assembly/resources/tools/start-WalChecker.bat  |    2 +-
 .../assembly/resources/tools/start-WalChecker.sh   |    4 +-
 .../tools/tsfileToolSet/print-iotdb-data-dir.sh    |    3 +-
 .../tsfileToolSet/print-tsfile-resource-files.sh   |    3 +-
 .../tools/tsfileToolSet/print-tsfile-sketch.sh     |    3 +-
 .../tools/tsfileToolSet/print-tsfile-visdata.sh    |    3 +-
 .../resources/tools/tsfileToolSet/settle.sh        |    3 +-
 .../tools/tsfileToolSet/split-tsfile-tool.sh       |    3 +-
 .../tools/tsfileToolSet/validate-tsfile.sh         |    3 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |    6 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |    2 +-
 .../db/engine/storagegroup/TsFileResource.java     |    9 +-
 .../storagegroup/timeindex/DeviceTimeIndex.java    |   11 +
 .../storagegroup/timeindex/FileTimeIndex.java      |    5 +
 .../engine/storagegroup/timeindex/ITimeIndex.java  |    5 +
 .../storagegroup/timeindex/V012FileTimeIndex.java  |    6 +
 .../db/mpp/plan/analyze/ExpressionAnalyzer.java    |    2 +
 .../db/mpp/plan/execution/QueryExecution.java      |   11 +-
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   22 +-
 .../db/mpp/plan/scheduler/ClusterScheduler.java    |    6 +-
 .../scheduler/FixedRateFragInsStateTracker.java    |   46 +-
 .../plan/scheduler/IFragInstanceStateTracker.java  |    6 +
 .../mpp/plan/scheduler/SimpleQueryTerminator.java  |   30 +-
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |   21 +-
 .../java/org/apache/iotdb/db/service/DataNode.java |    2 +-
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java |    3 -
 .../datanode1conf/iotdb-datanode.properties        |    2 +-
 .../datanode2conf/iotdb-datanode.properties        |    2 +-
 .../datanode3conf/iotdb-datanode.properties        |    2 +-
 site/src/main/.vuepress/config.js                  |    4 +-
 88 files changed, 1894 insertions(+), 1463 deletions(-)

Reply via email to