This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch force_ci/object_type in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 15f39d4854302b7cef2cb44a88c5e3f0479fb9fa Author: Caideyipi <[email protected]> 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 (cherry picked from commit 468a91a4d2e7c014b14f5712d400bcc68905e563) --- .../it/dual/treemodel/manual/IoTDBPipeInclusionIT.java | 16 ++++++++++++---- .../impl/schema/AlterEncodingCompressorProcedure.java | 9 ++++++--- 2 files changed, 18 insertions(+), 7 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 4778f1f9b9b..61eaf14bb4e 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,8 +81,7 @@ 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); TestUtils.assertDataEventuallyOnEnv( @@ -90,14 +89,23 @@ 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,")); TestUtils.executeNonQueries( senderEnv, Arrays.asList( - "insert into root.ln.wf01.wt01(time, status) values(now(), false)", "flush"), + "ALTER timeSeries root.** set STORAGE_PROPERTIES compressor=ZSTD", + "insert into root.ln.wf01.wt01(time, status) values(now(), false)", + "flush"), null); + 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 627547ce722..f92cc5d2dd8 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 @@ -126,7 +126,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); @@ -146,7 +148,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, mayAlterAudit); @@ -160,7 +162,7 @@ public class AlterEncodingCompressorProcedure .collect(Collectors.toList()), false))); } - return; + return false; } final DataNodeTSStatusTaskExecutor<TAlterEncodingCompressorReq> alterEncodingCompressorTask = @@ -223,6 +225,7 @@ public class AlterEncodingCompressorProcedure }; alterEncodingCompressorTask.execute(); setNextState(AlterEncodingCompressorState.CLEAR_CACHE); + return true; } private void collectPayload4Pipe(final ConfigNodeProcedureEnv env) {
