You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/05/09 16:55:04 UTC

[iotdb] 01/08: Merge branch 'master' of github.com:apache/iotdb into IOTDB-5848

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

rong pushed a commit to branch IOTDB-5848
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 500e2b854cb7c0cfe70413001ae7e77f211d78ad
Merge: ad0d1fae91 e39060e1d1
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Mon May 8 21:23:50 2023 +0800

    Merge branch 'master' of github.com:apache/iotdb into IOTDB-5848

 consensus/pom.xml                                  |  2 +-
 .../iotdb/consensus/config/IoTConsensusConfig.java | 36 ++++----
 .../consensus/iot/logdispatcher/LogDispatcher.java |  8 +-
 .../logdispatcher/LogDispatcherThreadMetrics.java  | 22 +++++
 .../consensus/iot/logdispatcher/SyncStatus.java    |  2 -
 docs/UserGuide/API/Programming-Java-Native-API.md  | 98 ----------------------
 docs/UserGuide/Reference/Common-Config-Manual.md   | 29 ++++---
 docs/UserGuide/Reference/DataNode-Config-Manual.md |  4 +-
 .../UserGuide/API/Programming-Java-Native-API.md   | 93 --------------------
 .../zh/UserGuide/Reference/Common-Config-Manual.md | 29 ++++---
 .../UserGuide/Reference/DataNode-Config-Manual.md  |  4 +-
 .../iotdb/db/it/selectinto/IoTDBSelectIntoIT.java  | 30 +++++++
 .../resources/conf/iotdb-common.properties         | 15 +++-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 40 +++++----
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 26 +++---
 .../operator/process/DeviceViewIntoOperator.java   |  6 +-
 .../org/apache/iotdb/db/wal/buffer/WALBuffer.java  |  9 +-
 17 files changed, 175 insertions(+), 278 deletions(-)