Skip to content

Commit 8763d9a

Browse files
CaideyipiJackieTien97
authored andcommitted
Fixed the procedure has_more_state bug & Fixed the IT for encoding & compressor (#16729)
* IT-fix * fix
1 parent 06ca819 commit 8763d9a

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,35 @@ 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)) {
87-
return;
86+
return;
8887
}
8988

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

9796
if (!TestUtils.tryExecuteNonQueriesWithRetry(
9897
senderEnv,
99-
Arrays.asList(
100-
"insert into root.ln.wf01.wt01(time, status) values(now(), false)", "flush"),
98+
Arrays.asList(
99+
"ALTER timeSeries root.** set STORAGE_PROPERTIES compressor=ZSTD",
100+
"insert into root.ln.wf01.wt01(time, status) values(now(), false)",
101+
"flush"),
101102
null)) {
102103
return;
103104
}
104105

106+
TestUtils.assertDataEventuallyOnEnv(
107+
receiverEnv,
108+
"show timeseries root.ln.**",
109+
"Timeseries,Alias,Database,DataType,Encoding,Compression,Tags,Attributes,Deadband,DeadbandParameters,ViewType,",
110+
Collections.singleton(
111+
"root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,ZSTD,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
112+
105113
TestUtils.assertDataAlwaysOnEnv(
106114
receiverEnv, "select * from root.ln.**", "Time,", Collections.emptySet());
107115
}

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
@@ -125,7 +125,9 @@ protected Flow executeFromState(
125125
SerializeUtils.deserializeCompressorNullable(compressor),
126126
requestMessage);
127127
}
128-
alterEncodingCompressorInSchemaRegion(env);
128+
if (!alterEncodingCompressorInSchemaRegion(env)) {
129+
return Flow.NO_MORE_STATE;
130+
}
129131
break;
130132
case CLEAR_CACHE:
131133
LOGGER.info("Invalidate cache of timeSeries {}", requestMessage);
@@ -145,7 +147,7 @@ protected Flow executeFromState(
145147
}
146148
}
147149

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

@@ -159,7 +161,7 @@ private void alterEncodingCompressorInSchemaRegion(final ConfigNodeProcedureEnv
159161
.collect(Collectors.toList()),
160162
false)));
161163
}
162-
return;
164+
return false;
163165
}
164166

165167
final DataNodeTSStatusTaskExecutor<TAlterEncodingCompressorReq> alterEncodingCompressorTask =
@@ -222,6 +224,7 @@ protected void onAllReplicasetFailure(
222224
};
223225
alterEncodingCompressorTask.execute();
224226
setNextState(AlterEncodingCompressorState.CLEAR_CACHE);
227+
return true;
225228
}
226229

227230
private void collectPayload4Pipe(final ConfigNodeProcedureEnv env) {

0 commit comments

Comments
 (0)