Skip to content

Commit 468a91a

Browse files
authored
Fixed the procedure has_more_state bug & Fixed the IT for encoding & compressor (apache#16729)
* IT-fix * fix
1 parent 93c5557 commit 468a91a

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,31 @@ public void testPureSchemaInclusion() throws Exception {
8181
// banned
8282
"create timeSeries root.ln.wf01.wt01.status with datatype=BOOLEAN,encoding=PLAIN",
8383
"ALTER timeSeries root.ln.wf01.wt01.status ADD TAGS tag3=v3",
84-
"ALTER timeSeries root.ln.wf01.wt01.status ADD ATTRIBUTES attr4=v4",
85-
"ALTER timeSeries root.** set compressor=ZSTD"),
84+
"ALTER timeSeries root.ln.wf01.wt01.status ADD ATTRIBUTES attr4=v4"),
8685
null);
8786

8887
TestUtils.assertDataEventuallyOnEnv(
8988
receiverEnv,
9089
"show timeseries root.ln.**",
9190
"Timeseries,Alias,Database,DataType,Encoding,Compression,Tags,Attributes,Deadband,DeadbandParameters,ViewType,",
9291
Collections.singleton(
93-
"root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,ZSTD,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
92+
"root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,LZ4,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
9493

9594
TestUtils.executeNonQueries(
9695
senderEnv,
9796
Arrays.asList(
98-
"insert into root.ln.wf01.wt01(time, status) values(now(), false)", "flush"),
97+
"ALTER timeSeries root.** set STORAGE_PROPERTIES compressor=ZSTD",
98+
"insert into root.ln.wf01.wt01(time, status) values(now(), false)",
99+
"flush"),
99100
null);
100101

102+
TestUtils.assertDataEventuallyOnEnv(
103+
receiverEnv,
104+
"show timeseries root.ln.**",
105+
"Timeseries,Alias,Database,DataType,Encoding,Compression,Tags,Attributes,Deadband,DeadbandParameters,ViewType,",
106+
Collections.singleton(
107+
"root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,ZSTD,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
108+
101109
TestUtils.assertDataAlwaysOnEnv(
102110
receiverEnv, "select * from root.ln.**", "Time,", Collections.emptySet());
103111
}

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterEncodingCompressorProcedure.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ protected Flow executeFromState(
126126
SerializeUtils.deserializeCompressorNullable(compressor),
127127
requestMessage);
128128
}
129-
alterEncodingCompressorInSchemaRegion(env);
129+
if (!alterEncodingCompressorInSchemaRegion(env)) {
130+
return Flow.NO_MORE_STATE;
131+
}
130132
break;
131133
case CLEAR_CACHE:
132134
LOGGER.info("Invalidate cache of timeSeries {}", requestMessage);
@@ -146,7 +148,7 @@ protected Flow executeFromState(
146148
}
147149
}
148150

149-
private void alterEncodingCompressorInSchemaRegion(final ConfigNodeProcedureEnv env) {
151+
private boolean alterEncodingCompressorInSchemaRegion(final ConfigNodeProcedureEnv env) {
150152
final Map<TConsensusGroupId, TRegionReplicaSet> relatedSchemaRegionGroup =
151153
env.getConfigManager().getRelatedSchemaRegionGroup(patternTree, mayAlterAudit);
152154

@@ -160,7 +162,7 @@ private void alterEncodingCompressorInSchemaRegion(final ConfigNodeProcedureEnv
160162
.collect(Collectors.toList()),
161163
false)));
162164
}
163-
return;
165+
return false;
164166
}
165167

166168
final DataNodeTSStatusTaskExecutor<TAlterEncodingCompressorReq> alterEncodingCompressorTask =
@@ -223,6 +225,7 @@ protected void onAllReplicasetFailure(
223225
};
224226
alterEncodingCompressorTask.execute();
225227
setNextState(AlterEncodingCompressorState.CLEAR_CACHE);
228+
return true;
226229
}
227230

228231
private void collectPayload4Pipe(final ConfigNodeProcedureEnv env) {

0 commit comments

Comments
 (0)