[iotdb] branch new_vector updated: Fix query vector select ** from root

[ha...@apache.org]

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

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


The following commit(s) were added to refs/heads/new_vector by this push:
     new 50fb89c  Fix query vector select ** from root
50fb89c is described below

commit 50fb89cb7130b9c16d897423b8dd51e563ca6c61
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Nov 1 18:35:02 2021 +0800

    Fix query vector select ** from root
---
 .../org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java | 4 +---
 .../org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java   | 6 +-----
 .../main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java    | 6 ++++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
index 5889f08..dd16b8f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java
@@ -181,9 +181,7 @@ public class VectorWritableMemChunk implements IWritableMemChunk {
     list.increaseReferenceCount();
     List<Integer> columnIndexList = new ArrayList<>();
     for (String measurement : measurementList) {
-      if (vectorIdIndexMap.containsKey(measurement)) {
-        columnIndexList.add(vectorIdIndexMap.get(measurement));
-      }
+      columnIndexList.add(vectorIdIndexMap.get(measurement));
     }
     return list.getTvListByColumnIndex(columnIndexList);
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java b/server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
index ef35f4d..694ecd9 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/querycontext/ReadOnlyMemChunk.java
@@ -191,11 +191,7 @@ public class ReadOnlyMemChunk {
       while (iterator.hasNextTimeValuePair()) {
         TimeValuePair timeValuePair = iterator.nextTimeValuePair();
         timeStatistics.update(timeValuePair.getTimestamp());
-        if (schema.getSubMeasurementsTSDataTypeList().size() == 1) {
-          updateValueStatisticsForSingleColumn(schema, valueStatistics, timeValuePair);
-        } else {
-          updateValueStatistics(schema, valueStatistics, timeValuePair);
-        }
+        updateValueStatistics(schema, valueStatistics, timeValuePair);
       }
     }
     timeStatistics.setEmpty(isEmpty());
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java b/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java
index 8d4b205..2a09598 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.query.filter.TsFileFilter;
 import org.apache.iotdb.db.query.reader.series.AlignedSeriesReader;
 import org.apache.iotdb.db.utils.TestOnly;
 import org.apache.iotdb.db.utils.datastructure.TVList;
+import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.iotdb.tsfile.read.common.TimeRange;
@@ -95,6 +96,11 @@ public class AlignedPath extends PartialPath {
     schemaList.add(path.getMeasurementSchema());
   }
 
+  @Override
+  public String getDevice() {
+    return getFullPath();
+  }
+
   public List<String> getMeasurementList() {
     return measurementList;
   }