You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ju...@apache.org on 2025/12/17 07:32:26 UTC
(iotdb) 06/07: Fixed the procedure has_more_state bug & Fixed the IT for encoding & compressor (#16729)
This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch cp-206
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 7816ace0b43b9cf920420647a5725f3e6c27902e
Author: Caideyipi <87...@users.noreply.github.com>
AuthorDate: Tue Nov 11 14:18:08 2025 +0800
Fixed the procedure has_more_state bug & Fixed the IT for encoding & compressor (#16729)
* IT-fix
* fix
---
.../dual/treemodel/manual/IoTDBPipeInclusionIT.java | 20 ++++++++++++++------
.../schema/AlterEncodingCompressorProcedure.java | 9 ++++++---
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
index 972b85bd139..c4b42553912 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
@@ -81,10 +81,9 @@ public class IoTDBPipeInclusionIT extends AbstractPipeDualTreeModelManualIT {
// banned
"create timeSeries root.ln.wf01.wt01.status with datatype=BOOLEAN,encoding=PLAIN",
"ALTER timeSeries root.ln.wf01.wt01.status ADD TAGS tag3=v3",
- "ALTER timeSeries root.ln.wf01.wt01.status ADD ATTRIBUTES attr4=v4",
- "ALTER timeSeries root.** set compressor=ZSTD"),
+ "ALTER timeSeries root.ln.wf01.wt01.status ADD ATTRIBUTES attr4=v4"),
null)) {
- return;
+ return;
}
TestUtils.assertDataEventuallyOnEnv(
@@ -92,16 +91,25 @@ public class IoTDBPipeInclusionIT extends AbstractPipeDualTreeModelManualIT {
"show timeseries root.ln.**",
"Timeseries,Alias,Database,DataType,Encoding,Compression,Tags,Attributes,Deadband,DeadbandParameters,ViewType,",
Collections.singleton(
- "root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,ZSTD,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
+ "root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,LZ4,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
if (!TestUtils.tryExecuteNonQueriesWithRetry(
senderEnv,
- Arrays.asList(
- "insert into root.ln.wf01.wt01(time, status) values(now(), false)", "flush"),
+ Arrays.asList(
+ "ALTER timeSeries root.** set STORAGE_PROPERTIES compressor=ZSTD",
+ "insert into root.ln.wf01.wt01(time, status) values(now(), false)",
+ "flush"),
null)) {
return;
}
+ TestUtils.assertDataEventuallyOnEnv(
+ receiverEnv,
+ "show timeseries root.ln.**",
+ "Timeseries,Alias,Database,DataType,Encoding,Compression,Tags,Attributes,Deadband,DeadbandParameters,ViewType,",
+ Collections.singleton(
+ "root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,ZSTD,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
+
TestUtils.assertDataAlwaysOnEnv(
receiverEnv, "select * from root.ln.**", "Time,", Collections.emptySet());
}
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterEncodingCompressorProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterEncodingCompressorProcedure.java
index bdae18e4692..773fb0a2b9a 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterEncodingCompressorProcedure.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterEncodingCompressorProcedure.java
@@ -127,7 +127,9 @@ public class AlterEncodingCompressorProcedure
SerializeUtils.deserializeCompressorNullable(compressor),
requestMessage);
}
- alterEncodingCompressorInSchemaRegion(env);
+ if (!alterEncodingCompressorInSchemaRegion(env)) {
+ return Flow.NO_MORE_STATE;
+ }
break;
case CLEAR_CACHE:
LOGGER.info("Invalidate cache of timeSeries {}", requestMessage);
@@ -147,7 +149,7 @@ public class AlterEncodingCompressorProcedure
}
}
- private void alterEncodingCompressorInSchemaRegion(final ConfigNodeProcedureEnv env) {
+ private boolean alterEncodingCompressorInSchemaRegion(final ConfigNodeProcedureEnv env) {
final Map<TConsensusGroupId, TRegionReplicaSet> relatedSchemaRegionGroup =
env.getConfigManager().getRelatedSchemaRegionGroup(patternTree);
@@ -161,7 +163,7 @@ public class AlterEncodingCompressorProcedure
.collect(Collectors.toList()),
false)));
}
- return;
+ return false;
}
final DataNodeTSStatusTaskExecutor<TAlterEncodingCompressorReq> alterEncodingCompressorTask =
@@ -224,6 +226,7 @@ public class AlterEncodingCompressorProcedure
};
alterEncodingCompressorTask.execute();
setNextState(AlterEncodingCompressorState.CLEAR_CACHE);
+ return true;
}
private void collectPayload4Pipe(final ConfigNodeProcedureEnv env) {