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 2025/07/07 07:34:34 UTC
(iotdb) 01/01: resolve conflicts
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch object_type
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b51e5da6d28e84eccaab4027c2ac442f9a8ec6f5
Merge: d48f2c50b63 a184469ada3
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Jul 7 15:34:24 2025 +0800
resolve conflicts
dependencies.json | 14 +--
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 16 ++++
.../java/org/apache/iotdb/session/Session.java | 17 ++--
.../apache/iotdb/session/util/SessionUtils.java | 103 ++++++++++++---------
.../iotdb/session/util/SessionUtilsTest.java | 26 +++++-
iotdb-core/ainode/ainode/core/ingress/iotdb.py | 1 +
.../ainode/core/manager/inference_manager.py | 27 +++---
.../ainode/ainode/core/manager/model_manager.py | 10 +-
.../ainode/core/model/built_in_model_factory.py | 8 +-
.../ainode/ainode/core/model/model_storage.py | 5 +-
iotdb-core/confignode/pom.xml | 2 +-
.../protocol/IoTDBConfigRegionAirGapConnector.java | 5 +
.../protocol/IoTDBConfigRegionConnector.java | 5 +
.../receiver/protocol/IoTDBConfigNodeReceiver.java | 3 +
iotdb-core/consensus/pom.xml | 14 +--
iotdb-core/datanode/pom.xml | 2 +-
.../iotdb/db/exception/load/LoadFileException.java | 4 +
.../task/builder/PipeDataNodeTaskBuilder.java | 68 +++++++++-----
.../airgap/IoTDBDataRegionAirGapConnector.java | 31 +++++++
.../airgap/IoTDBSchemaRegionAirGapConnector.java | 5 +
.../async/IoTDBDataRegionAsyncConnector.java | 14 +++
.../async/handler/PipeTransferTsFileHandler.java | 6 ++
.../thrift/sync/IoTDBDataRegionSyncConnector.java | 21 +++++
.../thrift/sync/IoTDBSchemaRegionConnector.java | 5 +
.../connector/util/builder/PipeTsFileBuilder.java | 40 ++++----
.../dataregion/IoTDBDataRegionExtractor.java | 10 +-
.../pipe/metric/overview/PipeResourceMetrics.java | 14 +++
.../pipeconsensus/PipeConsensusReceiver.java | 75 ++++++++-------
.../protocol/thrift/IoTDBDataNodeReceiver.java | 5 +
.../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 4 +
.../queryengine/plan/analyze/AnalyzeVisitor.java | 24 +++--
.../config/executor/ClusterConfigTaskExecutor.java | 6 +-
.../plan/planner/LogicalPlanBuilder.java | 4 +-
.../org/apache/iotdb/db/service/MQTTService.java | 2 +-
.../metrics/IoTDBInternalLocalReporter.java | 2 +-
.../dataregion/snapshot/SnapshotLoader.java | 67 ++++++++++----
.../tsfile/generator/TsFileNameGenerator.java | 63 +++++++------
.../allocation/AbstractNodeAllocationStrategy.java | 13 +--
.../db/storageengine/load/LoadTsFileManager.java | 12 ++-
.../storageengine/load/disk/ILoadDiskSelector.java | 3 +-
.../InheritSystemMultiDisksStrategySelector.java | 42 ++++++---
.../db/storageengine/load/disk/MinIOSelector.java | 3 +-
.../load/limiter/LoadTsFileRateLimiter.java | 64 ++-----------
.../storageengine/rescon/disk/FolderManager.java | 63 +++++++++++++
.../db/storageengine/rescon/disk/TierManager.java | 4 +
.../rescon/disk/strategy/DirectoryStrategy.java | 34 +++++++
.../strategy/MaxDiskUsableSpaceFirstStrategy.java | 3 +
.../MinFolderOccupiedSpaceFirstStrategy.java | 4 +
.../strategy/RandomOnDiskUsableSpaceStrategy.java | 4 +
.../rescon/disk/strategy/SequenceStrategy.java | 4 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 3 +-
iotdb-core/node-commons/pom.xml | 2 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 16 ++++
.../iotdb/commons/pipe/config/PipeConfig.java | 6 ++
.../iotdb/commons/pipe/config/PipeDescriptor.java | 6 ++
.../config/constant/PipeConnectorConstant.java | 5 +
.../connector/limiter/GlobalRPCRateLimiter.java} | 17 ++--
.../pipe/connector/limiter/GlobalRateLimiter.java | 14 +--
.../connector/limiter/TsFileSendRateLimiter.java} | 29 ++++--
.../connector/protocol/IoTDBAirGapConnector.java | 3 +
.../pipe/connector/protocol/IoTDBConnector.java | 4 +-
.../connector/protocol/IoTDBSslSyncConnector.java | 3 +
.../commons/pipe/receiver/IoTDBFileReceiver.java | 66 +++++++------
.../iotdb/commons/service/metric/enums/Metric.java | 1 +
.../apache/iotdb/commons/utils/JVMCommonUtils.java | 56 ++++++-----
pom.xml | 18 ++--
66 files changed, 829 insertions(+), 401 deletions(-)
diff --cc iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
index 36974127aad,d929f765607..1273e7adaf7
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java
@@@ -209,10 -190,10 +209,14 @@@ public class TierManager
: unSeqTiers.get(tierLevel).getNextFolder();
}
+ public String getNextFolderForObjectFile() throws DiskSpaceInsufficientException {
+ return objectTiers.get(0).getNextFolder();
+ }
+
+ public FolderManager getFolderManager(int tierLevel, boolean sequence) {
+ return sequence ? seqTiers.get(tierLevel) : unSeqTiers.get(tierLevel);
+ }
+
public List<String> getAllFilesFolders() {
List<String> folders = new ArrayList<>(seqDir2TierLevel.keySet());
folders.addAll(unSeqDir2TierLevel.keySet());