This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 3ca27c61502 [To dev/1.3] Pipe: Fixed the shouldMarkAsPipeRequest for
CreateTable and AlterLogicalView Sync (#16619) (#16620)
3ca27c61502 is described below
commit 3ca27c6150246442479c00cef74f883d027a77b8
Author: Caideyipi <[email protected]>
AuthorDate: Mon Oct 20 19:25:58 2025 +0800
[To dev/1.3] Pipe: Fixed the shouldMarkAsPipeRequest for CreateTable and
AlterLogicalView Sync (#16619) (#16620)
---
.github/workflows/cluster-it-1c3d.yml | 2 +-
.github/workflows/pipe-it-2cluster.yml | 2 +-
.../manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java | 2 +-
.../db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java | 3 ++-
.../plan/execution/config/executor/ClusterConfigTaskExecutor.java | 5 +++--
.../plan/execution/config/executor/IConfigTaskExecutor.java | 3 ++-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/cluster-it-1c3d.yml
b/.github/workflows/cluster-it-1c3d.yml
index 8f1adf10df4..cb4accedb48 100644
--- a/.github/workflows/cluster-it-1c3d.yml
+++ b/.github/workflows/cluster-it-1c3d.yml
@@ -46,7 +46,7 @@ jobs:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
- distribution: oracle
+ distribution: corretto
java-version: ${{ matrix.java }}
- name: IT/UT Test
shell: bash
diff --git a/.github/workflows/pipe-it-2cluster.yml
b/.github/workflows/pipe-it-2cluster.yml
index 446c2eda05a..6c5f11bc35c 100644
--- a/.github/workflows/pipe-it-2cluster.yml
+++ b/.github/workflows/pipe-it-2cluster.yml
@@ -471,7 +471,7 @@ jobs:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
- distribution: oracle
+ distribution: corretto
java-version: ${{ matrix.java }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
index 439e16dc554..1e27dbd6cce 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
@@ -434,7 +434,7 @@ public class IoTDBConfigNodeReceiver extends
IoTDBFileReceiver {
case DeleteTriggerInTable:
return configManager.dropTrigger(
new TDropTriggerReq(((DeleteTriggerInTablePlan)
plan).getTriggerName())
- .setIsGeneratedByPipe(true));
+ .setIsGeneratedByPipe(shouldMarkAsPipeRequest.get()));
case SetTTL:
return ((SetTTLPlan) plan).getTTL() == TTLCache.NULL_TTL
? configManager
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
index 29000d86285..8834cc495bf 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
@@ -545,7 +545,8 @@ public class IoTDBDataNodeReceiver extends
IoTDBFileReceiver {
}
return new TPipeTransferResp(
ClusterConfigTaskExecutor.getInstance()
- .alterLogicalViewByPipe((AlterLogicalViewNode)
req.getPlanNode()));
+ .alterLogicalViewByPipe(
+ (AlterLogicalViewNode) req.getPlanNode(),
shouldMarkAsPipeRequest.get()));
}
return new TPipeTransferResp(
executeStatementAndClassifyExceptions(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index fdcda582e7a..1ca57bea55f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@ -2616,7 +2616,8 @@ public class ClusterConfigTaskExecutor implements
IConfigTaskExecutor {
}
@Override
- public TSStatus alterLogicalViewByPipe(AlterLogicalViewNode
alterLogicalViewNode) {
+ public TSStatus alterLogicalViewByPipe(
+ final AlterLogicalViewNode alterLogicalViewNode, final boolean
shouldMarkAsPipeRequest) {
final Map<PartialPath, ViewExpression> viewPathToSourceMap =
alterLogicalViewNode.getViewPathToSourceMap();
@@ -2635,7 +2636,7 @@ public class ClusterConfigTaskExecutor implements
IConfigTaskExecutor {
new TAlterLogicalViewReq(
Coordinator.getInstance().createQueryId().getId(),
ByteBuffer.wrap(stream.toByteArray()))
- .setIsGeneratedByPipe(true);
+ .setIsGeneratedByPipe(shouldMarkAsPipeRequest);
TSStatus tsStatus;
try (ConfigNodeClient client =
CLUSTER_DELETION_CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID))
{
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
index 7ce0e4a8cad..b663017fadd 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java
@@ -220,7 +220,8 @@ public interface IConfigTaskExecutor {
SettableFuture<ConfigTaskResult> alterLogicalView(
AlterLogicalViewStatement alterLogicalViewStatement, MPPQueryContext
context);
- TSStatus alterLogicalViewByPipe(AlterLogicalViewNode alterLogicalViewNode);
+ TSStatus alterLogicalViewByPipe(
+ AlterLogicalViewNode alterLogicalViewNode, boolean
shouldMarkAsPipeRequest);
SettableFuture<ConfigTaskResult> getRegionId(GetRegionIdStatement
getRegionIdStatement);
