[iotdb] branch new_vector updated: fix insert bug

[haonan]

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 843bcd1  fix insert bug
843bcd1 is described below

commit 843bcd15fbd891657ef83a2366a9ad45f1bdc5ca
Author: HTHou <hhao...@outlook.com>
AuthorDate: Fri Oct 29 17:33:23 2021 +0800

    fix insert bug
---
 .../iotdb/db/engine/memtable/VectorWritableMemChunk.java     | 12 +++++++-----
 .../apache/iotdb/db/qp/physical/InsertTabletPlanTest.java    |  6 ++----
 2 files changed, 9 insertions(+), 9 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 a36588d..9ceb1bd 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
@@ -23,15 +23,15 @@ public class VectorWritableMemChunk implements 
IWritableMemChunk {
 
   private IMeasurementSchema schema;
   private VectorTVList list;
-  private Map<String, Integer> VectorIdIndexMap;
+  private Map<String, Integer> vectorIdIndexMap;
   private static final String UNSUPPORTED_TYPE = "Unsupported data type:";
   private static final Logger LOGGER = 
LoggerFactory.getLogger(VectorWritableMemChunk.class);
 
   public VectorWritableMemChunk(IMeasurementSchema schema) {
     this.schema = schema;
-    VectorIdIndexMap = new HashMap<>();
+    vectorIdIndexMap = new HashMap<>();
     for (int i = 0; i < schema.getSubMeasurementsCount(); i++) {
-      VectorIdIndexMap.put(schema.getSubMeasurementsList().get(i), i);
+      vectorIdIndexMap.put(schema.getSubMeasurementsList().get(i), i);
     }
     this.list = 
TVListAllocator.getInstance().allocate(schema.getSubMeasurementsTSDataTypeList());
   }
@@ -138,13 +138,15 @@ public class VectorWritableMemChunk implements 
IWritableMemChunk {
 
   private int[] checkColumnOrder(String[] measurementIds) {
     int[] columnOrder = new int[measurementIds.length];
-
+    for (int i = 0; i < measurementIds.length; i++) {
+      columnOrder[i] = vectorIdIndexMap.get(measurementIds[i]);
+    }
     return columnOrder;
   }
 
   @Override
   public long count() {
-    return list.size() * VectorIdIndexMap.size();
+    return list.size() * vectorIdIndexMap.size();
   }
 
   @Override
diff --git 
a/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletPlanTest.java
 
b/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletPlanTest.java
index 1fae60e..b4e5045 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletPlanTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertTabletPlanTest.java
@@ -200,8 +200,7 @@ public class InsertTabletPlanTest {
     PlanExecutor executor = new PlanExecutor();
     executor.insertTablet(tabletPlan);
 
-    Assert.assertEquals(
-        "[vector, vector, vector]", 
Arrays.toString(tabletPlan.getMeasurementMNodes()));
+    Assert.assertEquals("[s1, s2, s3]", 
Arrays.toString(tabletPlan.getMeasurementMNodes()));
 
     QueryPlan queryPlan =
         (QueryPlan) processor.parseSQLToPhysicalPlan("select ** from 
root.isp.d1");
@@ -229,8 +228,7 @@ public class InsertTabletPlanTest {
     PlanExecutor executor = new PlanExecutor();
     executor.insertTablet(tabletPlan);
 
-    Assert.assertEquals(
-        "[vector, vector, vector]", 
Arrays.toString(tabletPlan.getMeasurementMNodes()));
+    Assert.assertEquals("[s1, s2, s3]", 
Arrays.toString(tabletPlan.getMeasurementMNodes()));
 
     QueryPlan queryPlan =
         (QueryPlan) processor.parseSQLToPhysicalPlan("select ** from 
root.isp.d1");