This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch xingtanzjr/write_instance_parallel in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8534b11a1432c2054d99ae4378285e63eb924c73 Author: Jinrui.Zhang <[email protected]> AuthorDate: Wed Apr 13 21:18:35 2022 +0800 fix UT error --- .../iotdb/commons/partition/RegionReplicaSet.java | 3 +-- .../db/mpp/sql/planner/plan/FragmentInstance.java | 19 +++++++++++++++++++ .../plan/node/source/SeriesAggregateScanNode.java | 3 +-- .../sql/planner/plan/node/source/SeriesScanNode.java | 3 +-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java index fa3e61ef10..955a021e50 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java @@ -55,8 +55,7 @@ public class RegionReplicaSet { @Override public String toString() { - return String.format( - "RegionReplicaSet[%s-%s]: %s", consensusGroupId.getType(), consensusGroupId, dataNodeList); + return String.format("RegionReplicaSet[%s]: %s", consensusGroupId, dataNodeList); } public void serializeImpl(ByteBuffer buffer) { diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java index 72177f06c8..a3065c8c03 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/FragmentInstance.java @@ -31,6 +31,7 @@ import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import java.nio.ByteBuffer; +import java.util.Objects; public class FragmentInstance implements IConsensusRequest { private final FragmentInstanceId id; @@ -154,4 +155,22 @@ public class FragmentInstance implements IConsensusRequest { regionReplicaSet.serializeImpl(buffer); hostEndpoint.serializeImpl(buffer); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + FragmentInstance instance = (FragmentInstance) o; + return Objects.equals(id, instance.id) + && type == instance.type + && Objects.equals(fragment, instance.fragment) + && Objects.equals(regionReplicaSet, instance.regionReplicaSet) + && Objects.equals(hostEndpoint, instance.hostEndpoint) + && Objects.equals(timeFilter, instance.timeFilter); + } + + @Override + public int hashCode() { + return Objects.hash(id, type, fragment, regionReplicaSet, hostEndpoint, timeFilter); + } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesAggregateScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesAggregateScanNode.java index 87c2ff1d05..756bf76f79 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesAggregateScanNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesAggregateScanNode.java @@ -195,8 +195,7 @@ public class SeriesAggregateScanNode extends SourceNode implements IOutputPlanNo Filter timeFilter = FilterFactory.deserialize(byteBuffer); // TODO serialize groupByTimeParameter - RegionReplicaSet regionReplicaSet = new RegionReplicaSet(); - RegionReplicaSet.deserializeImpl(byteBuffer); + RegionReplicaSet regionReplicaSet = RegionReplicaSet.deserializeImpl(byteBuffer); PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer); SeriesAggregateScanNode seriesAggregateScanNode = new SeriesAggregateScanNode( diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java index 9700720466..913890ffcd 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/SeriesScanNode.java @@ -209,8 +209,7 @@ public class SeriesScanNode extends SourceNode implements IOutputPlanNode { if (isNull == 1) valueFilter = FilterFactory.deserialize(byteBuffer); int limit = ReadWriteIOUtils.readInt(byteBuffer); int offset = ReadWriteIOUtils.readInt(byteBuffer); - RegionReplicaSet dataRegionReplicaSet = new RegionReplicaSet(); - RegionReplicaSet.deserializeImpl(byteBuffer); + RegionReplicaSet dataRegionReplicaSet = RegionReplicaSet.deserializeImpl(byteBuffer); PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer); SeriesScanNode seriesScanNode = new SeriesScanNode(planNodeId, partialPath); seriesScanNode.allSensors = allSensors;
