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 2022/10/27 14:02:18 UTC

[iotdb] branch IOTDB-4619 updated (60861b12fd -> 312a142f51)

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

jackietien pushed a change to branch IOTDB-4619
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 60861b12fd fix ut
     add 72c8c18cd5 [IOTDB-4616] Support serialization and deserialization for confignode standalone mode (#7670)
     add 312a142f51 resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../statemachine/PartitionRegionStateMachine.java  | 73 +++++++++++++++++++++-
 .../iotdb/confignode/manager/ConsensusManager.java |  1 -
 .../confignode/writelog/io}/BatchLogReader.java    | 25 +++-----
 .../iotdb/confignode/writelog/io}/ILogReader.java  | 10 +--
 .../writelog/io}/SingleFileLogReader.java          | 22 ++-----
 5 files changed, 88 insertions(+), 43 deletions(-)
 copy {server/src/main/java/org/apache/iotdb/db/utils/writelog => confignode/src/main/java/org/apache/iotdb/confignode/writelog/io}/BatchLogReader.java (73%)
 copy {server/src/main/java/org/apache/iotdb/db/utils/writelog => confignode/src/main/java/org/apache/iotdb/confignode/writelog/io}/ILogReader.java (80%)
 copy {server/src/main/java/org/apache/iotdb/db/utils/writelog => confignode/src/main/java/org/apache/iotdb/confignode/writelog/io}/SingleFileLogReader.java (89%)