You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2022/04/14 09:32:09 UTC
[iotdb] branch metric_dependency_resolve updated: debug (#5538)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch metric_dependency_resolve
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/metric_dependency_resolve by this push:
new 5bea3e8feb debug (#5538)
5bea3e8feb is described below
commit 5bea3e8feb3dbee5f2373636a8bd173611a63464
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Thu Apr 14 17:32:02 2022 +0800
debug (#5538)
Co-authored-by: CRZbulabula <cr...@gmail.com>
---
.../iotdb/confignode/physical/PhysicalPlan.java | 1 -
.../physical/SerializeDeserializeUT.java | 27 ++++++++++++++++++++++
.../iotdb/consensus/ratis/RequestMessage.java | 1 -
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/physical/PhysicalPlan.java b/confignode/src/main/java/org/apache/iotdb/confignode/physical/PhysicalPlan.java
index 7bd81645a5..7f1c18f9fb 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/physical/PhysicalPlan.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/physical/PhysicalPlan.java
@@ -72,7 +72,6 @@ public abstract class PhysicalPlan implements IConsensusRequest {
buffer.reset();
throw e;
}
- buffer.flip();
}
protected abstract void serializeImpl(ByteBuffer buffer);
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/physical/SerializeDeserializeUT.java b/confignode/src/test/java/org/apache/iotdb/confignode/physical/SerializeDeserializeUT.java
index 0878cf483e..3dc71321d7 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/physical/SerializeDeserializeUT.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/physical/SerializeDeserializeUT.java
@@ -66,6 +66,7 @@ public class SerializeDeserializeUT {
RegisterDataNodePlan plan0 =
new RegisterDataNodePlan(new DataNodeLocation(1, new Endpoint("0.0.0.0", 6667)));
plan0.serialize(buffer);
+ buffer.flip();
RegisterDataNodePlan plan1 = (RegisterDataNodePlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
}
@@ -74,6 +75,7 @@ public class SerializeDeserializeUT {
public void QueryDataNodeInfoPlanTest() throws IOException {
QueryDataNodeInfoPlan plan0 = new QueryDataNodeInfoPlan(-1);
plan0.serialize(buffer);
+ buffer.flip();
QueryDataNodeInfoPlan plan1 = (QueryDataNodeInfoPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
}
@@ -82,6 +84,7 @@ public class SerializeDeserializeUT {
public void SetStorageGroupPlanTest() throws IOException {
SetStorageGroupPlan plan0 = new SetStorageGroupPlan(new StorageGroupSchema("sg"));
plan0.serialize(buffer);
+ buffer.flip();
SetStorageGroupPlan plan1 = (SetStorageGroupPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
}
@@ -107,6 +110,7 @@ public class SerializeDeserializeUT {
plan0.addRegion(schemaRegionSet);
plan0.serialize(buffer);
+ buffer.flip();
CreateRegionsPlan plan1 = (CreateRegionsPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
}
@@ -128,6 +132,7 @@ public class SerializeDeserializeUT {
CreateSchemaPartitionPlan plan0 = new CreateSchemaPartitionPlan();
plan0.setAssignedSchemaPartition(assignedSchemaPartition);
plan0.serialize(buffer);
+ buffer.flip();
CreateSchemaPartitionPlan plan1 =
(CreateSchemaPartitionPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
@@ -145,6 +150,7 @@ public class SerializeDeserializeUT {
new GetOrCreateSchemaPartitionPlan(PhysicalPlanType.GetOrCreateSchemaPartition);
plan0.setPartitionSlotsMap(partitionSlotsMap);
plan0.serialize(buffer);
+ buffer.flip();
GetOrCreateSchemaPartitionPlan plan1 =
(GetOrCreateSchemaPartitionPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
@@ -177,6 +183,7 @@ public class SerializeDeserializeUT {
CreateDataPartitionPlan plan0 = new CreateDataPartitionPlan();
plan0.setAssignedDataPartition(assignedDataPartition);
plan0.serialize(buffer);
+ buffer.flip();
CreateDataPartitionPlan plan1 = (CreateDataPartitionPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
}
@@ -197,6 +204,7 @@ public class SerializeDeserializeUT {
new GetOrCreateDataPartitionPlan(PhysicalPlanType.GetDataPartition);
plan0.setPartitionSlotsMap(partitionSlotsMap);
plan0.serialize(buffer);
+ buffer.flip();
GetOrCreateDataPartitionPlan plan1 =
(GetOrCreateDataPartitionPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
@@ -216,6 +224,7 @@ public class SerializeDeserializeUT {
new AuthorPlan(
PhysicalPlanType.CREATE_USER, "thulab", "", "passwd", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -223,6 +232,7 @@ public class SerializeDeserializeUT {
// create role
plan0 = new AuthorPlan(PhysicalPlanType.CREATE_ROLE, "", "admin", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -232,6 +242,7 @@ public class SerializeDeserializeUT {
new AuthorPlan(
PhysicalPlanType.UPDATE_USER, "tempuser", "", "", "newpwd", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -240,6 +251,7 @@ public class SerializeDeserializeUT {
plan0 =
new AuthorPlan(PhysicalPlanType.GRANT_USER, "tempuser", "", "", "", permissions, "root.ln");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -255,6 +267,7 @@ public class SerializeDeserializeUT {
permissions,
"root.ln");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -263,6 +276,7 @@ public class SerializeDeserializeUT {
plan0 =
new AuthorPlan(PhysicalPlanType.GRANT_ROLE, "", "temprole", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -272,6 +286,7 @@ public class SerializeDeserializeUT {
new AuthorPlan(
PhysicalPlanType.REVOKE_USER, "tempuser", "", "", "", permissions, "root.ln");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -281,6 +296,7 @@ public class SerializeDeserializeUT {
new AuthorPlan(
PhysicalPlanType.REVOKE_ROLE, "", "temprole", "", "", permissions, "root.ln");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -296,6 +312,7 @@ public class SerializeDeserializeUT {
new HashSet<>(),
"");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -303,6 +320,7 @@ public class SerializeDeserializeUT {
// drop user
plan0 = new AuthorPlan(PhysicalPlanType.DROP_USER, "xiaoming", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -310,6 +328,7 @@ public class SerializeDeserializeUT {
// drop role
plan0 = new AuthorPlan(PhysicalPlanType.DROP_ROLE, "", "admin", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -317,6 +336,7 @@ public class SerializeDeserializeUT {
// list user
plan0 = new AuthorPlan(PhysicalPlanType.LIST_USER, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -324,6 +344,7 @@ public class SerializeDeserializeUT {
// list role
plan0 = new AuthorPlan(PhysicalPlanType.LIST_ROLE, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -332,6 +353,7 @@ public class SerializeDeserializeUT {
plan0 =
new AuthorPlan(PhysicalPlanType.LIST_USER_PRIVILEGE, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -340,6 +362,7 @@ public class SerializeDeserializeUT {
plan0 =
new AuthorPlan(PhysicalPlanType.LIST_ROLE_PRIVILEGE, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -348,6 +371,7 @@ public class SerializeDeserializeUT {
plan0 =
new AuthorPlan(PhysicalPlanType.LIST_USER_PRIVILEGE, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -356,6 +380,7 @@ public class SerializeDeserializeUT {
plan0 =
new AuthorPlan(PhysicalPlanType.LIST_ROLE_PRIVILEGE, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -363,6 +388,7 @@ public class SerializeDeserializeUT {
// list all role of user
plan0 = new AuthorPlan(PhysicalPlanType.LIST_USER_ROLES, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
@@ -370,6 +396,7 @@ public class SerializeDeserializeUT {
// list all user of role
plan0 = new AuthorPlan(PhysicalPlanType.LIST_ROLE_USERS, "", "", "", "", new HashSet<>(), "");
plan0.serialize(buffer);
+ buffer.flip();
plan1 = (AuthorPlan) PhysicalPlan.Factory.create(buffer);
Assert.assertEquals(plan0, plan1);
cleanBuffer();
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
index 050358fdb2..5607c805ac 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java
@@ -61,7 +61,6 @@ public class RequestMessage implements Message {
actualRequest.serializeRequest(byteBuffer);
byteBuffer.flip();
serializedContent = ByteString.copyFrom(byteBuffer);
- byteBuffer.flip();
}
}
}