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/09/29 09:06:51 UTC

[iotdb] 01/01: Merge branch 'master' into add_write_check_above_consensus_layer

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

xingtanzjr pushed a commit to branch test_yukun_0929
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 8a83465cec0c61f261dcc87b8e3c9cb968799465
Merge: 0040c466fe 71d5f65bf9
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu Sep 29 16:14:58 2022 +0800

    Merge branch 'master' into add_write_check_above_consensus_layer

 .../resources/conf/iotdb-confignode.properties     |  4 +-
 .../iotdb/confignode/conf/ConfigNodeConfig.java    |  4 +-
 .../thrift/ConfigNodeRPCServiceProcessorTest.java  |  2 +-
 docs/UserGuide/Data-Concept/Time-Partition.md      |  6 +-
 .../Reference/ConfigNode-Config-Manual.md          |  3 +-
 docs/UserGuide/Reference/DataNode-Config-Manual.md |  3 +-
 docs/zh/UserGuide/Data-Concept/Time-Partition.md   |  8 +--
 .../Reference/ConfigNode-Config-Manual.md          |  5 +-
 .../UserGuide/Reference/DataNode-Config-Manual.md  | 12 ++--
 .../iotdb/confignode/IoTDBClusterPartitionIT.java  |  2 +-
 .../resources/conf/iotdb-datanode.properties       |  4 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  8 +--
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 22 ++++++-
 .../apache/iotdb/db/engine/StorageEngineV2.java    |  4 +-
 .../mpp/plan/analyze/FakePartitionFetcherImpl.java | 77 +++++++++++++++++++++-
 .../apache/iotdb/db/utils/TimePartitionUtils.java  | 19 +-----
 .../iotdb/db/mpp/plan/analyze/AnalyzeTest.java     | 14 ++++
 17 files changed, 145 insertions(+), 52 deletions(-)