This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/fix_sonar in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2643889f8f8a97b5271c791980cafeb54aa28913 Author: Beyyes <[email protected]> AuthorDate: Mon Jun 19 15:31:39 2023 +0800 fix 4 bugs in mpp/plan/planner/plan --- .../db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java | 6 +++++- .../plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java | 6 ++++++ .../planner/plan/node/metedata/write/view/AlterLogicalViewNode.java | 5 +++++ .../plan/node/metedata/write/view/CreateLogicalViewNode.java | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java index d68184b04d3..ede066406b7 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java @@ -97,14 +97,18 @@ public class LoadSingleTsFileNode extends WritePlanNode { if (replicaSets.size() > 1) { return false; } + for (TRegionReplicaSet replicaSet : replicaSets) { List<TDataNodeLocation> dataNodeLocationList = replicaSet.getDataNodeLocations(); if (dataNodeLocationList.size() > 1) { return false; } localRegionReplicaSet = replicaSet; - return isDispatchedToLocal(dataNodeLocationList.get(0).getInternalEndPoint()); + if (dataNodeLocationList.size() == 1) { + return isDispatchedToLocal(dataNodeLocationList.get(0).getInternalEndPoint()); + } } + return true; } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java index dc0ca8a7c1a..1d77a916cf1 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java @@ -44,6 +44,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.TreeMap; public class CreateTimeSeriesNode extends WritePlanNode implements ICreateTimeSeriesPlan { @@ -368,6 +369,11 @@ public class CreateTimeSeriesNode extends WritePlanNode implements ICreateTimeSe || (attributes != null && attributes.equals(that.attributes))); } + @Override + public int hashCode() { + return Objects.hash(path, dataType, encoding, compressor, alias, props, tags, attributes); + } + @Override public TRegionReplicaSet getRegionReplicaSet() { return regionReplicaSet; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java index 5cdde4a5378..379d11fa6e6 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/AlterLogicalViewNode.java @@ -105,6 +105,11 @@ public class AlterLogicalViewNode extends WritePlanNode { && Objects.equals(this.viewPathToSourceMap, that.viewPathToSourceMap)); } + @Override + public int hashCode() { + return Objects.hash(this.getPlanNodeId(), this.viewPathToSourceMap); + } + @Override public int allowedChildCount() { // this node should never have any child diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java index 1995b0f2c35..5c34768ed3c 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java @@ -155,6 +155,11 @@ public class CreateLogicalViewNode extends WritePlanNode implements ICreateLogic && Objects.equals(this.viewPathToSourceMap, that.viewPathToSourceMap)); } + @Override + public int hashCode() { + return Objects.hash(this.getPlanNodeId(), this.viewPathToSourceMap); + } + @Override public int allowedChildCount() { // this node should never have any child
