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

caogaofei pushed a commit to branch beyyes/change_ip_port_of_cluster
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 0c0a1b85ac8903c500d5f87b34242995f35fdb39
Merge: ea0d2a10c2 634a128f94
Author: Beyyes <[email protected]>
AuthorDate: Thu Sep 22 15:25:33 2022 +0800

    merge with master

 .../resources/conf/iotdb-confignode.properties     |   18 +-
 .../confignode/client/DataNodeRequestType.java     |   46 +-
 .../async/handlers/ConfigNodeHeartbeatHandler.java |    4 +-
 .../async/handlers/DataNodeHeartbeatHandler.java   |    8 +-
 .../sync/datanode/SyncDataNodeClientPool.java      |    2 +
 .../confignode/manager/ClusterSchemaManager.java   |    2 +
 .../iotdb/confignode/manager/ConfigManager.java    |    8 +-
 .../iotdb/confignode/manager/ConsensusManager.java |    1 +
 .../apache/iotdb/confignode/manager/IManager.java  |    2 +
 .../iotdb/confignode/manager/ProcedureManager.java |    1 +
 .../iotdb/confignode/manager/load/LoadManager.java |    6 +-
 .../manager/load/LoadManagerMetrics.java           |    4 +-
 .../manager/load/balancer/RegionBalancer.java      |    4 +-
 .../manager/load/balancer/RouteBalancer.java       |    4 +-
 .../partition/GreedyPartitionAllocator.java        |    2 +-
 .../{load/heartbeat => node}/BaseNodeCache.java    |   28 +-
 .../ConfigNodeHeartbeatCache.java                  |    9 +-
 .../heartbeat => node}/DataNodeHeartbeatCache.java |   28 +-
 .../heartbeat => node}/NodeHeartbeatSample.java    |   37 +-
 .../confignode/manager/{ => node}/NodeManager.java |   57 +-
 .../manager/{ => partition}/PartitionManager.java  |    7 +-
 .../{load/heartbeat => partition}/RegionCache.java |    6 +-
 .../heartbeat => partition}/RegionGroupCache.java  |    2 +-
 .../RegionHeartbeatSample.java                     |    2 +-
 .../procedure/env/ConfigNodeProcedureEnv.java      |    9 +-
 .../procedure/env/DataNodeRemoveHandler.java       |    4 +-
 .../iotdb/confignode/service/ConfigNode.java       |    3 +-
 .../hash/DeviceGroupHashExecutorManualTest.java    |    2 +-
 .../load/balancer/router/LeaderRouterTest.java     |   10 +-
 .../balancer/router/LoadScoreGreedyRouterTest.java |    6 +-
 .../request/BatchIndexedConsensusRequest.java      |    8 +-
 .../multileader/logdispatcher/LogDispatcher.java   |    5 +-
 .../service/MultiLeaderRPCServiceProcessor.java    |    3 +-
 .../iotdb/consensus/ratis/SnapshotStorage.java     |   13 +-
 docs/UserGuide/Data-Concept/Time-zone.md           |    2 +-
 .../Delete-Data.md                                 |    0
 .../{Operate-Metadata => Delete-Data}/TTL.md       |    0
 .../Maintenance-Tools/Maintenance-Command.md       |   44 +-
 .../CSV-Tool.md                                    |    0
 .../Load-External-Tsfile.md                        |    0
 .../TsFile-Tool.md                                 |    0
 .../Write-Data.md                                  |    0
 docs/zh/UserGuide/Data-Concept/Time-zone.md        |    2 +-
 .../Delete-Data.md                                 |    0
 .../{Operate-Metadata => Delete-Data}/TTL.md       |    0
 .../Maintenance-Tools/Maintenance-Command.md       |   70 +-
 .../CSV-Tool.md                                    |    0
 .../Load-External-Tsfile.md                        |    0
 .../TsFile-Tool.md                                 |    0
 .../Write-Data.md                                  |    0
 .../iotdb/influxdb/session/InfluxDBSession.java    |   12 +-
 integration-test/checkstyle.xml                    |    2 +-
 .../java/org/apache/iotdb/it/env/AbstractEnv.java  |   14 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    6 +
 .../org/apache/iotdb/it/env/RemoteServerEnv.java   |   10 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |    8 +
 .../java/org/apache/iotdb/itbase/env/BaseEnv.java  |   65 +
 .../org/apache/iotdb/db/it/env/StandaloneEnv.java  |   48 +
 .../iotdb/session/IoTDBSessionComplexIT.java       |  407 +++++++
 .../session/IoTDBSessionDisableMemControlIT.java   |  220 ++++
 .../java/org/apache/iotdb/session/SessionTest.java |  180 +++
 .../apache/iotdb/session/pool/SessionPoolTest.java |   16 +-
 .../apache/iotdb/commons/cluster/NodeStatus.java   |    1 +
 .../apache/iotdb/commons/conf/CommonConfig.java    |   49 +-
 .../iotdb/commons/conf/CommonDescriptor.java       |   11 +
 .../resources/conf/iotdb-datanode.properties       |   13 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   32 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   17 +
 .../statemachine/DataRegionStateMachine.java       |  161 +--
 .../rewrite/task/ReadPointPerformerSubTask.java    |   10 +-
 .../utils/AlignedSeriesCompactionExecutor.java     |    1 +
 .../inner/utils/MultiTsFileDeviceIterator.java     |    4 +-
 .../utils/SingleSeriesCompactionExecutor.java      |    1 +
 .../compaction/performer/ICompactionPerformer.java |    4 +-
 .../impl/ReadChunkCompactionPerformer.java         |   15 +-
 .../impl/ReadPointCompactionPerformer.java         |   92 +-
 .../writer/AbstractCompactionWriter.java           |   12 +-
 .../writer/CrossSpaceCompactionWriter.java         |   35 +-
 .../writer/InnerSpaceCompactionWriter.java         |   30 +-
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   23 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   43 +-
 .../engine/memtable/AlignedWritableMemChunk.java   |   23 +-
 .../memtable/AlignedWritableMemChunkGroup.java     |   10 +-
 .../db/engine/memtable/IWritableMemChunk.java      |   16 +-
 .../db/engine/memtable/IWritableMemChunkGroup.java |    5 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |   29 +-
 .../db/engine/memtable/WritableMemChunkGroup.java  |   26 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |    9 +-
 .../db/engine/storagegroup/TsFileResource.java     |    8 +-
 .../db/mpp/plan/planner/LogicalPlanBuilder.java    |    4 +-
 .../plan/node/load/LoadSingleTsFileNode.java       |    5 +-
 .../plan/node/write/InsertMultiTabletsNode.java    |    5 +
 .../plan/planner/plan/node/write/InsertNode.java   |    5 +
 .../planner/plan/node/write/InsertRowNode.java     |   17 +
 .../planner/plan/node/write/InsertRowsNode.java    |    5 +
 .../plan/node/write/InsertRowsOfOneDeviceNode.java |    5 +
 .../planner/plan/node/write/InsertTabletNode.java  |   23 +
 .../db/query/control/SessionTimeoutManager.java    |   12 +-
 .../java/org/apache/iotdb/db/service/DataNode.java |    3 +
 .../impl/DataNodeInternalRPCServiceImpl.java       |   55 +-
 .../iotdb/db/tools/TsFileSplitByPartitionTool.java |    4 +-
 .../org/apache/iotdb/db/utils/CommonUtils.java     |   79 ++
 .../db/utils/datastructure/AlignedTVList.java      |   54 +
 .../iotdb/db/utils/datastructure/BinaryTVList.java |   46 +
 .../iotdb/db/utils/datastructure/TVList.java       |    7 +
 .../file/AbstractTsFileRecoverPerformer.java       |   18 +-
 .../ReadPointCompactionPerformerTest.java          |   70 +-
 .../cross/RewriteCompactionFileSelectorTest.java   |   30 +-
 .../compaction/inner/InnerSeqCompactionTest.java   |    7 +-
 .../compaction/inner/InnerUnseqCompactionTest.java |   13 +-
 .../inner/ReadChunkCompactionPerformerOldTest.java |    3 +-
 .../db/engine/memtable/PrimitiveMemTableTest.java  |   10 +-
 .../db/utils/datastructure/BinaryTVListTest.java   |   30 +
 .../db/utils/datastructure/VectorTVListTest.java   |   67 ++
 .../java/org/apache/iotdb/session/ISession.java    |    4 +-
 .../java/org/apache/iotdb/session/Session.java     |  136 +--
 .../session/{Config.java => SessionConfig.java}    |    2 +-
 .../apache/iotdb/session/SessionConnection.java    |    2 +-
 .../org/apache/iotdb/session/SessionDataSet.java   |    4 +-
 .../org/apache/iotdb/session/pool/SessionPool.java |   62 +-
 .../apache/iotdb/session/SessionCacheLeaderUT.java |   12 +-
 site/src/main/.vuepress/config.js                  |   36 +-
 .../src/main/thrift/confignode.thrift              |    2 +
 .../src/main/thrift/mutlileader.thrift             |    6 +-
 thrift/src/main/thrift/datanode.thrift             |   15 +-
 .../iotdb/tsfile/file/metadata/ChunkMetadata.java  |    8 +
 .../file/metadata/MetadataIndexConstructor.java    |    9 +-
 .../tsfile/file/metadata/MetadataIndexNode.java    |    2 +-
 .../iotdb/tsfile/file/metadata/TsFileMetadata.java |    9 +-
 .../iotdb/tsfile/read/TsFileDeviceIterator.java    |    4 +-
 .../write/writer/RestorableTsFileIOWriter.java     |   12 +
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |  337 ++++--
 .../write/writer/tsmiterator/DiskTSMIterator.java  |  132 ++
 .../write/writer/tsmiterator/TSMIterator.java      |  147 +++
 .../tsfile/write/TsFileIntegrityCheckingTool.java  |  251 ++++
 .../writer/TsFileIOWriterMemoryControlTest.java    | 1261 ++++++++++++++++++++
 136 files changed, 4418 insertions(+), 749 deletions(-)


Reply via email to