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 2023/12/13 07:42:12 UTC
(iotdb) branch IOTDB-6199 updated (7447af76882 -> 8979ce6879d)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-6199
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 7447af76882 self test
add a93cf09d1bd Enhance the exapmle of parameter dn_seed_config_node (#11686)
add c450e768980 Enhance parameter dn_seed_config_node commets order (#11687)
add 4922dad4d17 Add last time check for inner space compaction task (#11553)
add 9af1e765c5d Cache the internal compaction estimation result if compaction task is failed to run (#11586)
add acde4457a3d [IOTDB-6264] Load: Optimized Validation Messages with 'write_data' Permissions When Loading TsFiles Without schema Creation (#11684)
add 09b7e86fd63 add config for inner compaction selector (#11693)
add b1d3dc63c9e [IOTDB-6265] Construct SessionPool using empty nodeUrls should throw exception
add 5caeeb3e3b7 Pipe: automatically start pipe upon creation & allow to start RUNNING pipe & allow to stop STOPPED pipe (#11690)
add a061c0d4514 Pipe: Make error message reported by pipe parameter check clearer (#11695)
add b57f320153b Make slimit and soffset available in align by device with template
add 1dfdae910bf [IOTDB-6266] Add the ability to flush syncIndex and update reader periodically for IoTConsensus (#11691)
add e75bc1c4675 Enable Jenkins Log when CI failed (#11700)
add f5a05fba466 Enable jenkins log when ci failed (#11701)
add bcc3b3dd4a1 Pipe schema: RPC request & response datastructures (#11680)
new 8979ce6879d resolve conflicts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 4 +
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 2 +-
.../IoTDBAlignByDeviceWithTemplateIT.java | 82 +++++++
.../iotdb/pipe/it/IoTDBPipeSwitchStatusIT.java | 22 +-
.../apache/iotdb/pipe/it/IoTDBPipeSyntaxIT.java | 2 +-
.../parameter/PipeParameterValidator.java | 6 +-
.../java/org/apache/iotdb/session/Session.java | 8 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 8 +-
.../java/org/apache/iotdb/session/SessionTest.java | 12 +
.../session/pool/SessionPoolExceptionTest.java | 12 +
.../payload/request/PipeTransferConfigPlanReq.java | 78 ++++++
.../confignode/persistence/pipe/PipeTaskInfo.java | 28 ++-
.../impl/pipe/task/CreatePipeProcedureV2.java | 2 +
.../impl/pipe/task/StartPipeProcedureV2.java | 19 +-
.../impl/pipe/task/StopPipeProcedureV2.java | 19 +-
.../apache/iotdb/consensus/iot/IoTConsensus.java | 31 ++-
.../consensus/iot/IoTConsensusServerImpl.java | 14 +-
.../consensus/iot/client/DispatchLogHandler.java | 2 +-
.../iot/logdispatcher/IndexController.java | 3 +-
.../consensus/iot/logdispatcher/LogDispatcher.java | 11 +
.../consensus/iot/logdispatcher/SyncStatus.java | 4 +-
.../iot/logdispatcher/IndexControllerTest.java | 14 +-
.../resources/conf/iotdb-datanode.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 42 ++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 24 ++
.../iotdb/db/pipe/agent/task/PipeTaskAgent.java | 6 +-
.../request/PipeTransferFilePieceReq.java | 4 +-
.../evolvable/request/PipeTransferFileSealReq.java | 4 +-
.../request/PipeTransferHandshakeReq.java | 4 +-
.../request/PipeTransferSchemaPlanReq.java | 105 ++++++++
.../request/PipeTransferTabletBatchReq.java | 4 +-
.../request/PipeTransferTabletBinaryReq.java | 4 +-
.../request/PipeTransferTabletInsertNodeReq.java | 4 +-
.../request/PipeTransferTabletRawReq.java | 4 +-
.../pipe/receiver/thrift/IoTDBThriftReceiver.java | 2 +-
.../receiver/thrift/IoTDBThriftReceiverAgent.java | 2 +-
.../receiver/thrift/IoTDBThriftReceiverV1.java | 36 ++-
.../plan/analyze/LoadTsfileAnalyzer.java | 39 +--
.../queryengine/plan/analyze/TemplatedAnalyze.java | 42 +++-
...=> CompactionLastTimeCheckFailedException.java} | 16 +-
.../execute/task/AbstractCompactionTask.java | 2 +-
.../execute/task/InnerSpaceCompactionTask.java | 8 +-
.../readchunk/AlignedSeriesCompactionExecutor.java | 12 +
.../readchunk/SingleSeriesCompactionExecutor.java | 13 +
.../utils/writer/AbstractCompactionWriter.java | 11 +
.../writer/AbstractCrossCompactionWriter.java | 11 +-
.../writer/AbstractInnerCompactionWriter.java | 2 +
.../utils/writer/FastInnerCompactionWriter.java | 4 +
.../compaction/schedule/CompactionWorker.java | 9 +-
.../estimator/AbstractCompactionEstimator.java | 27 ++-
.../impl/RewriteCrossSpaceCompactionSelector.java | 6 +-
.../impl/SizeTieredCompactionSelector.java | 8 +-
...est.java => PipeDataNodeThriftRequestTest.java} | 80 +++++-
.../compaction/CompactionOverlapCheckTest.java | 269 +++++++++++++++++++++
.../utils/CompactionUpdateFileCountTest.java | 2 +-
.../resources/conf/iotdb-common.properties | 10 +-
.../iotdb/commons/concurrent/ThreadName.java | 4 +-
.../request}/IoTDBConnectorRequestVersion.java | 2 +-
.../payload/request}/PipeRequestType.java | 8 +-
.../request/PipeTransferSnapshotPieceReq.java} | 78 +++---
.../request/PipeTransferSnapshotSealReq.java} | 74 +++---
.../payload/request/TransferConfigPlanReq.java} | 4 +-
.../response/PipeTransferSnapshotPieceResp.java} | 39 +--
63 files changed, 1175 insertions(+), 235 deletions(-)
create mode 100644 iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/request/PipeTransferConfigPlanReq.java
create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaPlanReq.java
copy iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/exception/{CompactionRecoverException.java => CompactionLastTimeCheckFailedException.java} (68%)
rename iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/{PipeThriftRequestTest.java => PipeDataNodeThriftRequestTest.java} (67%)
create mode 100644 iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionOverlapCheckTest.java
rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol => node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/request}/IoTDBConnectorRequestVersion.java (94%)
rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable => node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/request}/PipeRequestType.java (89%)
copy iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferFilePieceReq.java => node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/request/PipeTransferSnapshotPieceReq.java} (53%)
copy iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferFileSealReq.java => node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/request/PipeTransferSnapshotSealReq.java} (52%)
copy iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/airgap/AirGapPseudoTPipeTransferRequest.java => node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/request/TransferConfigPlanReq.java} (86%)
copy iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/reponse/PipeTransferFilePieceResp.java => node-commons/src/main/java/org/apache/iotdb/commons/pipe/connector/payload/response/PipeTransferSnapshotPieceResp.java} (59%)
(iotdb) 01/01: resolve conflicts
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch IOTDB-6199
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8979ce6879dc686b4d94c494f37b4d1dfed8d2d9
Merge: 7447af76882 bcc3b3dd4a1
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Wed Dec 13 15:42:04 2023 +0800
resolve conflicts
Jenkinsfile | 4 +
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 2 +-
.../IoTDBAlignByDeviceWithTemplateIT.java | 82 +++++++
.../iotdb/pipe/it/IoTDBPipeSwitchStatusIT.java | 22 +-
.../apache/iotdb/pipe/it/IoTDBPipeSyntaxIT.java | 2 +-
.../parameter/PipeParameterValidator.java | 6 +-
.../java/org/apache/iotdb/session/Session.java | 8 +-
.../org/apache/iotdb/session/pool/SessionPool.java | 8 +-
.../java/org/apache/iotdb/session/SessionTest.java | 12 +
.../session/pool/SessionPoolExceptionTest.java | 12 +
.../payload/request/PipeTransferConfigPlanReq.java | 78 ++++++
.../confignode/persistence/pipe/PipeTaskInfo.java | 28 ++-
.../impl/pipe/task/CreatePipeProcedureV2.java | 2 +
.../impl/pipe/task/StartPipeProcedureV2.java | 19 +-
.../impl/pipe/task/StopPipeProcedureV2.java | 19 +-
.../apache/iotdb/consensus/iot/IoTConsensus.java | 31 ++-
.../consensus/iot/IoTConsensusServerImpl.java | 14 +-
.../consensus/iot/client/DispatchLogHandler.java | 2 +-
.../iot/logdispatcher/IndexController.java | 3 +-
.../consensus/iot/logdispatcher/LogDispatcher.java | 11 +
.../consensus/iot/logdispatcher/SyncStatus.java | 4 +-
.../iot/logdispatcher/IndexControllerTest.java | 14 +-
.../resources/conf/iotdb-datanode.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 42 ++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 24 ++
.../iotdb/db/pipe/agent/task/PipeTaskAgent.java | 6 +-
.../request/PipeTransferFilePieceReq.java | 4 +-
.../evolvable/request/PipeTransferFileSealReq.java | 4 +-
.../request/PipeTransferHandshakeReq.java | 4 +-
.../request/PipeTransferSchemaPlanReq.java | 105 ++++++++
.../request/PipeTransferTabletBatchReq.java | 4 +-
.../request/PipeTransferTabletBinaryReq.java | 4 +-
.../request/PipeTransferTabletInsertNodeReq.java | 4 +-
.../request/PipeTransferTabletRawReq.java | 4 +-
.../pipe/receiver/thrift/IoTDBThriftReceiver.java | 2 +-
.../receiver/thrift/IoTDBThriftReceiverAgent.java | 2 +-
.../receiver/thrift/IoTDBThriftReceiverV1.java | 36 ++-
.../plan/analyze/LoadTsfileAnalyzer.java | 39 +--
.../queryengine/plan/analyze/TemplatedAnalyze.java | 42 +++-
.../CompactionLastTimeCheckFailedException.java} | 23 +-
.../execute/task/AbstractCompactionTask.java | 2 +-
.../execute/task/InnerSpaceCompactionTask.java | 8 +-
.../readchunk/AlignedSeriesCompactionExecutor.java | 12 +
.../readchunk/SingleSeriesCompactionExecutor.java | 13 +
.../utils/writer/AbstractCompactionWriter.java | 11 +
.../writer/AbstractCrossCompactionWriter.java | 11 +-
.../writer/AbstractInnerCompactionWriter.java | 2 +
.../utils/writer/FastInnerCompactionWriter.java | 4 +
.../compaction/schedule/CompactionWorker.java | 9 +-
.../estimator/AbstractCompactionEstimator.java | 27 ++-
.../impl/RewriteCrossSpaceCompactionSelector.java | 6 +-
.../impl/SizeTieredCompactionSelector.java | 8 +-
...est.java => PipeDataNodeThriftRequestTest.java} | 80 +++++-
.../compaction/CompactionOverlapCheckTest.java | 269 +++++++++++++++++++++
.../utils/CompactionUpdateFileCountTest.java | 2 +-
.../resources/conf/iotdb-common.properties | 10 +-
.../iotdb/commons/concurrent/ThreadName.java | 4 +-
.../request}/IoTDBConnectorRequestVersion.java | 2 +-
.../payload/request}/PipeRequestType.java | 8 +-
.../request/PipeTransferSnapshotPieceReq.java} | 78 +++---
.../request/PipeTransferSnapshotSealReq.java} | 74 +++---
.../payload/request/TransferConfigPlanReq.java} | 17 +-
.../response/PipeTransferSnapshotPieceResp.java | 81 +++++++
63 files changed, 1238 insertions(+), 234 deletions(-)
diff --cc iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
index ac8b90c34e5,fa569c94e28..fa65567ac1e
--- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
+++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
@@@ -511,8 -455,10 +514,11 @@@ public class SessionPool implements ISe
this.version = builder.version;
this.thriftDefaultBufferSize = builder.thriftDefaultBufferSize;
this.thriftMaxFrameSize = builder.thriftMaxFrameSize;
+ initThreadPool();
- if (builder.nodeUrls != null && builder.nodeUrls.size() > 0) {
+ if (builder.nodeUrls != null) {
+ if (builder.nodeUrls.isEmpty()) {
+ throw new IllegalArgumentException("nodeUrls shouldn't be empty.");
+ }
this.nodeUrls = builder.nodeUrls;
this.host = null;
this.port = -1;