This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch rc/1.2.2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1007e5496a3f43b02b7d7d1d98d32bea7ecd7785 Author: HTHou <[email protected]> AuthorDate: Tue Sep 26 19:19:32 2023 +0800 Revert "Fix possible NPE while executing show cluster or show cluster details" This reverts commit 4a1de7606e6404a014f9c683af2fd12c2847fc19. --- .../config/metadata/ShowClusterDetailsTask.java | 54 ++++------------------ .../execution/config/metadata/ShowClusterTask.java | 30 ++---------- 2 files changed, 14 insertions(+), 70 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java index 7c072de0742..65b7b3cf8a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java @@ -62,16 +62,8 @@ public class ShowClusterDetailsTask implements IConfigTask { builder.getTimeColumnBuilder().writeLong(0L); builder.getColumnBuilder(0).writeInt(nodeId); builder.getColumnBuilder(1).writeBinary(new Binary(NODE_TYPE_CONFIG_NODE)); - if (nodeStatus == null) { - builder.getColumnBuilder(2).appendNull(); - } else { - builder.getColumnBuilder(2).writeBinary(new Binary(nodeStatus)); - } - if (internalAddress == null) { - builder.getColumnBuilder(3).appendNull(); - } else { - builder.getColumnBuilder(3).writeBinary(new Binary(internalAddress)); - } + builder.getColumnBuilder(2).writeBinary(new Binary(nodeStatus)); + builder.getColumnBuilder(3).writeBinary(new Binary(internalAddress)); builder.getColumnBuilder(4).writeInt(internalPort); builder.getColumnBuilder(5).writeBinary(new Binary(Integer.toString(configConsensusPort))); builder.getColumnBuilder(6).writeBinary(new Binary("")); @@ -79,16 +71,8 @@ public class ShowClusterDetailsTask implements IConfigTask { builder.getColumnBuilder(8).writeBinary(new Binary("")); builder.getColumnBuilder(9).writeBinary(new Binary("")); builder.getColumnBuilder(10).writeBinary(new Binary("")); - if (versionInfo == null || versionInfo.getVersion() == null) { - builder.getColumnBuilder(11).appendNull(); - } else { - builder.getColumnBuilder(11).writeBinary(new Binary(versionInfo.getVersion())); - } - if (versionInfo == null || versionInfo.getBuildInfo() == null) { - builder.getColumnBuilder(12).appendNull(); - } else { - builder.getColumnBuilder(12).writeBinary(new Binary(versionInfo.getBuildInfo())); - } + builder.getColumnBuilder(11).writeBinary(new Binary(versionInfo.getVersion())); + builder.getColumnBuilder(12).writeBinary(new Binary(versionInfo.getBuildInfo())); builder.declarePosition(); } @@ -108,37 +92,17 @@ public class ShowClusterDetailsTask implements IConfigTask { builder.getTimeColumnBuilder().writeLong(0L); builder.getColumnBuilder(0).writeInt(nodeId); builder.getColumnBuilder(1).writeBinary(new Binary(NODE_TYPE_DATA_NODE)); - if (nodeStatus == null) { - builder.getColumnBuilder(2).appendNull(); - } else { - builder.getColumnBuilder(2).writeBinary(new Binary(nodeStatus)); - } - if (internalAddress == null) { - builder.getColumnBuilder(3).appendNull(); - } else { - builder.getColumnBuilder(3).writeBinary(new Binary(internalAddress)); - } + builder.getColumnBuilder(2).writeBinary(new Binary(nodeStatus)); + builder.getColumnBuilder(3).writeBinary(new Binary(internalAddress)); builder.getColumnBuilder(4).writeInt(internalPort); builder.getColumnBuilder(5).writeBinary(new Binary("")); - if (rpcAddress == null) { - builder.getColumnBuilder(6).appendNull(); - } else { - builder.getColumnBuilder(6).writeBinary(new Binary(rpcAddress)); - } + builder.getColumnBuilder(6).writeBinary(new Binary(rpcAddress)); builder.getColumnBuilder(7).writeBinary(new Binary(Integer.toString(rpcPort))); builder.getColumnBuilder(8).writeBinary(new Binary(Integer.toString(dataConsensusPort))); builder.getColumnBuilder(9).writeBinary(new Binary(Integer.toString(schemaConsensusPort))); builder.getColumnBuilder(10).writeBinary(new Binary(Integer.toString(mppPort))); - if (versionInfo == null || versionInfo.getVersion() == null) { - builder.getColumnBuilder(11).appendNull(); - } else { - builder.getColumnBuilder(11).writeBinary(new Binary(versionInfo.getVersion())); - } - if (versionInfo == null || versionInfo.getBuildInfo() == null) { - builder.getColumnBuilder(12).appendNull(); - } else { - builder.getColumnBuilder(12).writeBinary(new Binary(versionInfo.getBuildInfo())); - } + builder.getColumnBuilder(11).writeBinary(new Binary(versionInfo.getVersion())); + builder.getColumnBuilder(12).writeBinary(new Binary(versionInfo.getBuildInfo())); builder.declarePosition(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java index 7e85fa62d64..65ebb459a92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java @@ -67,32 +67,12 @@ public class ShowClusterTask implements IConfigTask { TNodeVersionInfo versionInfo) { builder.getTimeColumnBuilder().writeLong(0L); builder.getColumnBuilder(0).writeInt(nodeId); - if (nodeType == null) { - builder.getColumnBuilder(1).appendNull(); - } else { - builder.getColumnBuilder(1).writeBinary(new Binary(nodeType)); - } - if (nodeStatus == null) { - builder.getColumnBuilder(2).appendNull(); - } else { - builder.getColumnBuilder(2).writeBinary(new Binary(nodeStatus)); - } - if (hostAddress == null) { - builder.getColumnBuilder(3).appendNull(); - } else { - builder.getColumnBuilder(3).writeBinary(new Binary(hostAddress)); - } + builder.getColumnBuilder(1).writeBinary(new Binary(nodeType)); + builder.getColumnBuilder(2).writeBinary(new Binary(nodeStatus)); + builder.getColumnBuilder(3).writeBinary(new Binary(hostAddress)); builder.getColumnBuilder(4).writeInt(port); - if (versionInfo == null || versionInfo.getVersion() == null) { - builder.getColumnBuilder(5).appendNull(); - } else { - builder.getColumnBuilder(5).writeBinary(new Binary(versionInfo.getVersion())); - } - if (versionInfo == null || versionInfo.getBuildInfo() == null) { - builder.getColumnBuilder(6).appendNull(); - } else { - builder.getColumnBuilder(6).writeBinary(new Binary(versionInfo.getBuildInfo())); - } + builder.getColumnBuilder(5).writeBinary(new Binary(versionInfo.getVersion())); + builder.getColumnBuilder(6).writeBinary(new Binary(versionInfo.getBuildInfo())); builder.declarePosition(); }
