You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/02/27 07:21:57 UTC
[iotdb] 01/01: Merge remote-tracking branch 'origin/master' into geely_car_0206
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch geely_car_0206
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 746d5f5423275da652ec92dde45cea0f1095903a
Merge: 8a1b279a91 c5bea4166e
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Feb 27 15:21:31 2023 +0800
Merge remote-tracking branch 'origin/master' into geely_car_0206
.../manager/consensus/ConsensusManager.java | 3 +
.../iotdb/consensus/config/ConsensusConfig.java | 15 ++
.../iotdb/consensus/ratis/RatisConsensus.java | 13 +-
.../ratis/metrics/IoTDBMetricRegistry.java | 8 +-
.../ratis/metrics/MetricRegistryManager.java | 13 +-
.../consensus/ratis/metrics/RatisMetricSet.java | 10 +
.../iotdb/consensus/ratis/metrics/TimerProxy.java | 2 +-
.../apache/iotdb/consensus/iot/ReplicateTest.java | 2 +
.../apache/iotdb/consensus/iot/StabilityTest.java | 2 +
.../iotdb/consensus/ratis/RatisConsensusTest.java | 2 +
.../iotdb/consensus/simple/RecoveryTest.java | 2 +
docs/UserGuide/Reference/Common-Config-Manual.md | 9 -
.../zh/UserGuide/Reference/Common-Config-Manual.md | 9 -
.../iotdb/it/env/cluster/MppCommonConfig.java | 6 -
.../it/env/cluster/MppSharedCommonConfig.java | 7 -
.../iotdb/it/env/remote/RemoteCommonConfig.java | 5 -
.../org/apache/iotdb/itbase/env/CommonConfig.java | 2 -
.../iotdb/db/it/query/IoTDBPaginationIT.java | 9 -
.../db/integration/IoTDBQueryMemoryControlIT.java | 277 ---------------------
.../db/integration/env/StandaloneEnvConfig.java | 7 -
.../apache/iotdb/metrics/config/MetricConfig.java | 2 +-
.../iotdb/metrics/config/MetricConfigTest.java | 4 +-
.../resources/conf/iotdb-common.properties | 5 -
.../resources/conf/iotdb-datanode.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 12 -
.../db/consensus/DataRegionConsensusImpl.java | 2 +
.../db/consensus/SchemaRegionConsensusImpl.java | 2 +
.../exception/sql/PathNumOverLimitException.java | 33 ---
.../mpp/common/schematree/ClusterSchemaTree.java | 33 ++-
.../plan/analyze/ColumnPaginationController.java | 34 +--
.../db/mpp/plan/parser/StatementGenerator.java | 2 +-
32 files changed, 101 insertions(+), 443 deletions(-)