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
commit 1f7aff37e9c4ecbf24fd9fe5d1c8a2e4d8031c8a Author: Alima777 <[email protected]> AuthorDate: Mon Oct 18 10:15:01 2021 +0800 implement raw vector query without value filter --- .../java/org/apache/iotdb/cluster/query/LocalQueryExecutor.java | 7 +++++-- .../apache/iotdb/cluster/query/reader/ClusterReaderFactory.java | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) 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 36a56e8..32677d4 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 @@ -306,13 +306,16 @@ public class LocalQueryExecutor { .forEach( fullPath -> { try { - if (fullPath.contains("$#$")) { + System.out.println("After RPC: " + fullPath); + if (fullPath.startsWith("VP$")) { String[] array = fullPath.split(":"); + String vectorId = array[0].replace("VP$", ""); + System.out.println("After RPC: " + vectorId); List<String> subSensorsList = new ArrayList<>(); for (int i = 1; i < array.length; i++) { subSensorsList.add(array[i]); } - paths.add(new VectorPartialPath(array[0], subSensorsList)); + paths.add(new VectorPartialPath(vectorId, subSensorsList)); } else { paths.add(new PartialPath(fullPath)); } 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 d692830..d55c510 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 @@ -708,12 +708,12 @@ public class ClusterReaderFactory { paths.forEach( path -> { if (path instanceof VectorPartialPath) { - StringBuilder builder = new StringBuilder(path.getFullPath()); + System.out.println("Before RPC" + path); + StringBuilder builder = new StringBuilder("VP$"); + builder.append(path.getFullPath()); List<String> subSensorsList = ((VectorPartialPath) path).getSubSensorsList(); for (String subSensor : subSensorsList) { builder.append(":"); - builder.append(path.getFullPath()); - builder.append("."); builder.append(subSensor); } fullPaths.add(builder.toString()); @@ -752,6 +752,7 @@ public class ClusterReaderFactory { if (valueFilter != null) { request.setValueFilterBytes(SerializeUtils.serializeFilter(valueFilter)); } + System.out.println("Before RPC: " + path); request.setPath(path.getFullPath()); request.setHeader(partitionGroup.getHeader()); request.setQueryId(context.getQueryId());
