You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/11/11 08:13:50 UTC

[iotdb] branch new_vector updated: vector -> aligned in insertPlanTests

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 9e7ebe1  vector -> aligned in insertPlanTests
9e7ebe1 is described below

commit 9e7ebe12276b69bb797dba5e00868f85e8c7e521
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Nov 11 16:13:01 2021 +0800

    vector -> aligned in insertPlanTests
---
 .../org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java |  8 ++++----
 .../apache/iotdb/db/qp/physical/InsertTabletPlanTest.java  | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java b/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java
index ccb4d68..b37337d 100644
--- a/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java
@@ -114,7 +114,7 @@ public class InsertRowPlanTest {
   public void testInsertRowPlanWithAlignedTimeseries()
       throws QueryProcessException, MetadataException, InterruptedException,
           QueryFilterOptimizationException, StorageEngineException, IOException {
-    InsertRowPlan vectorRowPlan = getInsertVectorRowPlan();
+    InsertRowPlan vectorRowPlan = getInsertAlignedRowPlan();
 
     PlanExecutor executor = new PlanExecutor();
     executor.insert(vectorRowPlan);
@@ -195,7 +195,7 @@ public class InsertRowPlanTest {
 
     IoTDBDescriptor.getInstance().getConfig().setAutoCreateSchemaEnabled(false);
 
-    InsertRowPlan rowPlan = getInsertVectorRowPlan();
+    InsertRowPlan rowPlan = getInsertAlignedRowPlan();
 
     PlanExecutor executor = new PlanExecutor();
     executor.insert(rowPlan);
@@ -212,7 +212,7 @@ public class InsertRowPlanTest {
 
   @Test
   public void testInsertRowSerialization() throws IllegalPathException, QueryProcessException {
-    InsertRowPlan plan1 = getInsertVectorRowPlan();
+    InsertRowPlan plan1 = getInsertAlignedRowPlan();
 
     PlanExecutor executor = new PlanExecutor();
     executor.insert(plan1);
@@ -230,7 +230,7 @@ public class InsertRowPlanTest {
     Assert.assertEquals(plan1, plan2);
   }
 
-  private InsertRowPlan getInsertVectorRowPlan() throws IllegalPathException {
+  private InsertRowPlan getInsertAlignedRowPlan() throws IllegalPathException {
     long time = 110L;
     TSDataType[] dataTypes =
         new TSDataType[] {TSDataType.DOUBLE, TSDataType.FLOAT, TSDataType.INT64};
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 9a593ed..c32976e 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
@@ -195,7 +195,7 @@ public class InsertTabletPlanTest {
   public void testInsertTabletPlanWithAlignedTimeseries()
       throws QueryProcessException, MetadataException, InterruptedException,
           QueryFilterOptimizationException, StorageEngineException, IOException {
-    InsertTabletPlan tabletPlan = getVectorInsertTabletPlan();
+    InsertTabletPlan tabletPlan = getAlignedInsertTabletPlan();
 
     PlanExecutor executor = new PlanExecutor();
     executor.insertTablet(tabletPlan);
@@ -216,7 +216,7 @@ public class InsertTabletPlanTest {
   public void testInsertNullableTabletPlanWithAlignedTimeseries()
       throws QueryProcessException, MetadataException, InterruptedException,
           QueryFilterOptimizationException, StorageEngineException, IOException {
-    InsertTabletPlan tabletPlan = getVectorInsertTabletPlan();
+    InsertTabletPlan tabletPlan = getAlignedInsertTabletPlan();
     tabletPlan.setBitMaps(new BitMap[3]);
     BitMap[] bitMaps = tabletPlan.getBitMaps();
     for (int i = 0; i < 3; i++) {
@@ -249,7 +249,7 @@ public class InsertTabletPlanTest {
     IoTDB.metaManager.createSchemaTemplate(plan);
     IoTDB.metaManager.setSchemaTemplate(new SetSchemaTemplatePlan("template1", "root.isp"));
 
-    InsertTabletPlan tabletPlan = getVectorInsertTabletPlan();
+    InsertTabletPlan tabletPlan = getAlignedInsertTabletPlan();
 
     PlanExecutor executor = new PlanExecutor();
 
@@ -328,7 +328,7 @@ public class InsertTabletPlanTest {
 
     IoTDB.metaManager.createSchemaTemplate(plan);
     IoTDB.metaManager.setSchemaTemplate(new SetSchemaTemplatePlan("template1", "root.isp"));
-    InsertTabletPlan tabletPlan = getVectorInsertTabletPlan();
+    InsertTabletPlan tabletPlan = getAlignedInsertTabletPlan();
 
     PlanExecutor executor = new PlanExecutor();
     executor.insertTablet(tabletPlan);
@@ -365,7 +365,7 @@ public class InsertTabletPlanTest {
 
   @Test
   public void testInsertTabletSerialization() throws IllegalPathException, QueryProcessException {
-    InsertTabletPlan plan1 = getVectorInsertTabletPlan();
+    InsertTabletPlan plan1 = getAlignedInsertTabletPlan();
 
     PlanExecutor executor = new PlanExecutor();
     executor.insertTablet(plan1);
@@ -386,7 +386,7 @@ public class InsertTabletPlanTest {
   @Test
   public void testInsertTabletWithBitMapsSerialization()
       throws IllegalPathException, QueryProcessException {
-    InsertTabletPlan plan1 = getVectorInsertTabletPlan();
+    InsertTabletPlan plan1 = getAlignedInsertTabletPlan();
     plan1.setBitMaps(new BitMap[3]);
     BitMap[] bitMaps = plan1.getBitMaps();
     for (int i = 0; i < 3; i++) {
@@ -411,7 +411,7 @@ public class InsertTabletPlanTest {
     Assert.assertEquals(plan1, plan2);
   }
 
-  private InsertTabletPlan getVectorInsertTabletPlan() throws IllegalPathException {
+  private InsertTabletPlan getAlignedInsertTabletPlan() throws IllegalPathException {
     long[] times = new long[] {110L, 111L, 112L, 113L};
     List<Integer> dataTypes = new ArrayList<>();
     dataTypes.add(TSDataType.DOUBLE.ordinal());