[iotdb] branch clusterVector updated: remove debug system out

[xiangweiwei]

This is an automated email from the ASF dual-hosted git repository.

xiangweiwei pushed a commit to branch clusterVector
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/clusterVector by this push:
     new b4f8909  remove debug system out
b4f8909 is described below

commit b4f89095dc59cbfbe162f410d146eb3675092a09
Author: Alima777 <wxw19981...@gmail.com>
AuthorDate: Mon Oct 18 15:47:04 2021 +0800

    remove debug system out
---
 .../apache/iotdb/cluster/metadata/CMManager.java    |  3 ---
 .../iotdb/cluster/query/LocalQueryExecutor.java     | 21 ++++-----------------
 .../cluster/query/reader/ClusterReaderFactory.java  | 15 ++++-----------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
index c5034a2..0ef525f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
@@ -196,7 +196,6 @@ public class CMManager extends MManager {
     }
 
     String measurement = fullPath.getMeasurement();
-    System.out.println("FullPath: " + fullPath.getExactFullPath());
     if (fullPath instanceof VectorPartialPath) {
       if (((VectorPartialPath) fullPath).getSubSensorsList().size() != 1) {
         return TSDataType.VECTOR;
@@ -204,7 +203,6 @@ public class CMManager extends MManager {
         measurement = ((VectorPartialPath) fullPath).getSubSensor(0);
       }
     }
-    System.out.println("Measurement: " + measurement);
 
     // try remote cache first
     try {
@@ -240,7 +238,6 @@ public class CMManager extends MManager {
         } else {
           cacheMeta(fullPath, measurementMNode, true);
         }
-        System.out.println(measurementSchema);
         return measurementMNode.getDataType(measurement);
       } else {
         throw e;
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java
index b217cb6..30ca2e0 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java
@@ -278,7 +278,7 @@ public class LocalQueryExecutor {
     }
   }
 
-  private PartialPath getPathFromRequest(List<String> pathString) throws 
QueryProcessException {
+  private PartialPath getPathFromRequest(List<String> pathString) {
     try {
       if (pathString.size() == 1) {
         return new PartialPath(pathString.get(0));
@@ -286,7 +286,8 @@ public class LocalQueryExecutor {
         return new VectorPartialPath(pathString.get(0), pathString.subList(1, 
pathString.size()));
       }
     } catch (IllegalPathException e) {
-      throw new QueryProcessException(e.getMessage());
+      logger.error("Failed to create partial path, fullPath is {}.", 
pathString, e);
+      return null;
     }
   }
 
@@ -308,21 +309,7 @@ public class LocalQueryExecutor {
     dataGroupMember.syncLeaderWithConsistencyCheck(false);
 
     List<PartialPath> paths = Lists.newArrayList();
-    request
-        .getPath()
-        .forEach(
-            path -> {
-              try {
-                if (path.size() == 1) {
-                  paths.add(new PartialPath(path.get(0)));
-                } else {
-                  List<String> subSensorsList = path.subList(1, path.size());
-                  paths.add(new VectorPartialPath(path.get(0), 
subSensorsList));
-                }
-              } catch (IllegalPathException e) {
-                logger.warn("Failed to create partial path, fullPath is {}.", 
path, e);
-              }
-            });
+    request.getPath().forEach(path -> paths.add(getPathFromRequest(path)));
 
     List<TSDataType> dataTypes = Lists.newArrayList();
     request.getDataTypeOrdinal().forEach(dataType -> 
dataTypes.add(TSDataType.values()[dataType]));
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
index 2ef44ff..ed201f2 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
@@ -707,15 +707,7 @@ public class ClusterReaderFactory {
     List<List<String>> fullPaths = Lists.newArrayList();
     paths.forEach(
         path -> {
-          // if vector path, add its vectorId and all sub sensors
-          if (path instanceof VectorPartialPath) {
-            List<String> result = new ArrayList<>();
-            result.add(path.getFullPath());
-            result.addAll(((VectorPartialPath) path).getSubSensorsList());
-            fullPaths.add(result);
-          } else {
-            fullPaths.add(Collections.singletonList(path.getFullPath()));
-          }
+          fullPaths.add(getPathStringList(path));
         });
 
     List<Integer> dataTypeOrdinals = Lists.newArrayList();
@@ -759,10 +751,11 @@ public class ClusterReaderFactory {
     return request;
   }
 
-  /** If vector path, return vectorId with all subSensors. Else just return 
path string. */
+  /** If vector path, return its vectorId with all subSensors. Else just 
return path string. */
   private List<String> getPathStringList(Path path) {
     if (path instanceof VectorPartialPath) {
-      List<String> pathWithSubSensors = new ArrayList<>();
+      List<String> pathWithSubSensors =
+          new ArrayList<>(((VectorPartialPath) 
path).getSubSensorsList().size() + 1);
       pathWithSubSensors.add(path.getFullPath());
       pathWithSubSensors.addAll(((VectorPartialPath) 
path).getSubSensorsList());
       return pathWithSubSensors;