Skip to content

Commit 461d6de

Browse files
committed
Fix ser
1 parent 229baa9 commit 461d6de

2 files changed

Lines changed: 29 additions & 12 deletions

File tree

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/CreatePipeProcedureV2.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -552,18 +552,15 @@ public boolean equals(final Object o) {
552552
}
553553
final CreatePipeProcedureV2 that = (CreatePipeProcedureV2) o;
554554
return this.createPipeRequest.getPipeName().equals(that.createPipeRequest.getPipeName())
555-
&& this.createPipeRequest
556-
.getExtractorAttributes()
557-
.toString()
558-
.equals(that.createPipeRequest.getExtractorAttributes().toString())
559-
&& this.createPipeRequest
560-
.getProcessorAttributes()
561-
.toString()
562-
.equals(that.createPipeRequest.getProcessorAttributes().toString())
563-
&& this.createPipeRequest
564-
.getConnectorAttributes()
565-
.toString()
566-
.equals(that.createPipeRequest.getConnectorAttributes().toString());
555+
&& Objects.equals(
556+
this.createPipeRequest.getExtractorAttributes(),
557+
that.createPipeRequest.getExtractorAttributes())
558+
&& Objects.equals(
559+
this.createPipeRequest.getProcessorAttributes(),
560+
that.createPipeRequest.getProcessorAttributes())
561+
&& Objects.equals(
562+
this.createPipeRequest.getConnectorAttributes(),
563+
that.createPipeRequest.getConnectorAttributes());
567564
}
568565

569566
@Override

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/DropPipeProcedureV2.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
public class DropPipeProcedureV2 extends AbstractOperatePipeProcedureV2 {
4848

4949
private static final Logger LOGGER = LoggerFactory.getLogger(DropPipeProcedureV2.class);
50+
private static final int SERIALIZATION_VERSION_MAGIC = 0x44505632;
5051

5152
private String pipeName;
5253
private boolean isTableModel;
@@ -211,6 +212,8 @@ public void serialize(DataOutputStream stream) throws IOException {
211212
stream.writeShort(ProcedureType.DROP_PIPE_PROCEDURE_V2.getTypeCode());
212213
super.serialize(stream);
213214
ReadWriteIOUtils.write(pipeName, stream);
215+
ReadWriteIOUtils.write(SERIALIZATION_VERSION_MAGIC, stream);
216+
ReadWriteIOUtils.write(isTableModelSet, stream);
214217
if (isTableModelSet) {
215218
ReadWriteIOUtils.write(isTableModel, stream);
216219
if (pipeMetaToDrop == null) {
@@ -229,6 +232,23 @@ public void deserialize(ByteBuffer byteBuffer) {
229232
if (!byteBuffer.hasRemaining()) {
230233
return;
231234
}
235+
if (byteBuffer.remaining() >= Integer.BYTES) {
236+
final int position = byteBuffer.position();
237+
if (ReadWriteIOUtils.readInt(byteBuffer) == SERIALIZATION_VERSION_MAGIC) {
238+
if (!byteBuffer.hasRemaining()) {
239+
return;
240+
}
241+
isTableModelSet = ReadWriteIOUtils.readBool(byteBuffer);
242+
if (isTableModelSet) {
243+
isTableModel = ReadWriteIOUtils.readBool(byteBuffer);
244+
if (ReadWriteIOUtils.readBool(byteBuffer)) {
245+
pipeMetaToDrop = PipeMeta.deserialize4Coordinator(byteBuffer);
246+
}
247+
}
248+
return;
249+
}
250+
byteBuffer.position(position);
251+
}
232252
isTableModel = ReadWriteIOUtils.readBool(byteBuffer);
233253
isTableModelSet = true;
234254
if (byteBuffer.hasRemaining() && ReadWriteIOUtils.readBool(byteBuffer)) {

0 commit comments

Comments
 (0)