You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/08/25 12:32:42 UTC
[iotdb] 03/06: Merge branch 'master' of github.com:apache/iotdb
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/remove_confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ec14d940989526a1537e6c4325d9b480f8e6387c
Merge: db5e52cc9f 72a1de7cb8
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Thu Aug 25 10:20:14 2022 +0800
Merge branch 'master' of github.com:apache/iotdb
.../org/apache/iotdb/consensus/IStateMachine.java | 12 +-
.../org/apache/iotdb/consensus/common/Utils.java | 77 ++
.../iotdb/consensus/ratis/SnapshotStorage.java | 51 +-
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 63 +
external-api/pom.xml | 60 +
.../iotdb/external/api/IPropertiesLoader.java | 21 +-
.../iotdb/external/api/ISeriesNumerLimiter.java | 48 +
.../aggregation/IoTDBAggregationScanOrderIT.java | 113 ++
.../db/integration/sync/IoTDBSyncReceiverIT.java | 6 +-
.../db/integration/sync/IoTDBSyncSenderIT.java | 13 +-
...ortClientMock.java => MockTransportClient.java} | 42 +-
.../db/integration/sync/TransportHandlerMock.java | 58 -
.../apache/iotdb/commons/conf/IoTDBConstant.java | 4 +
.../apache/iotdb/commons/sync/SyncConstant.java | 2 +
pom.xml | 3 +
server/pom.xml | 5 +
.../resources/conf/iotdb-datanode.properties | 25 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 31 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 1388 ++++++++++----------
.../statemachine/DataRegionStateMachine.java | 6 +-
.../metadata/SeriesNumberOverflowException.java} | 28 +-
.../db/metadata/schemaregion/SchemaEngine.java | 30 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 104 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 87 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 13 +-
.../db/query/executor/AggregationExecutor.java | 4 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 5 +
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 5 +
.../service/thrift/impl/ClientRPCServiceImpl.java | 10 +-
.../db/service/thrift/impl/TSServiceImpl.java | 10 +-
.../java/org/apache/iotdb/db/sync/SyncService.java | 49 +-
.../iotdb/db/sync/common/ISyncInfoFetcher.java | 2 +-
.../iotdb/db/sync/common/LocalSyncInfoFetcher.java | 2 +-
.../org/apache/iotdb/db/sync/common/SyncInfo.java | 2 +-
.../db/sync/common/persistence/SyncLogReader.java | 2 +-
.../db/sync/common/persistence/SyncLogWriter.java | 2 +-
.../manager => sender/pipe}/PipeMessage.java | 2 +-
.../db/sync/sender/service/TransportHandler.java | 126 --
.../db/sync/transport/client/ClientWrapper.java | 124 --
.../db/sync/transport/client/ITransportClient.java | 23 +-
.../transport/client/IoTDBSinkTransportClient.java | 450 ++-----
.../db/sync/transport/client/SenderManager.java | 120 ++
.../transport/client/TransportClientFactory.java | 68 +
.../db/sync/transport/server/ReceiverManager.java | 323 ++---
.../org/apache/iotdb/db/utils/JarLoaderUtil.java | 150 +++
.../db/sync/receiver/manager/SyncInfoTest.java | 1 +
.../db/sync/receiver/recovery/SyncLogTest.java | 2 +-
.../iotdb/db/sync/transport/SyncTransportTest.java | 173 ++-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 3 +-
thrift/src/main/thrift/client.thrift | 17 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 +-
51 files changed, 2216 insertions(+), 1751 deletions(-)