[iotdb] branch new_vector updated: move vector -> aligned

[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 1197d07  move vector -> aligned
     new 8df7791  Merge branch 'new_vector' of https://github.com/apache/iotdb 
into new_vector
1197d07 is described below

commit 1197d07faa97e996b75f7f3663c6b9016cea32be
Author: HTHou <hhao...@outlook.com>
AuthorDate: Tue Nov 2 20:49:36 2021 +0800

    move vector -> aligned
---
 .../java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java     | 2 +-
 .../org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java   | 3 +--
 .../java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java    | 2 +-
 .../java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 09656c4..4a1cda5 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -281,7 +281,7 @@ public abstract class AbstractMemTable implements IMemTable 
{
     IWritableMemChunk memSeries =
         createAlignedMemChunkIfNotExistAndGet(
             insertTabletPlan.getPrefixPath().getFullPath(), vectorSchema);
-    memSeries.writeVector(
+    memSeries.writeAlignedValues(
         insertTabletPlan.getTimes(),
         insertTabletPlan.getColumns(),
         insertTabletPlan.getBitMaps(),
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
index f155139..5daded1 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AlignedWritableMemChunk.java
@@ -130,7 +130,7 @@ public class AlignedWritableMemChunk implements 
IWritableMemChunk {
   }
 
   @Override
-  public void writeVector(
+  public void writeAlignedValues(
       long[] times,
       Object[] valueList,
       BitMap[] bitMaps,
@@ -213,7 +213,6 @@ public class AlignedWritableMemChunk implements 
IWritableMemChunk {
   @Override
   // TODO: THIS METHOLD IS FOR DELETING ONE COLUMN OF A VECTOR
   public int delete(long lowerBound, long upperBound, String measurementId) {
-    // TODO Auto-generated method stub
     return 0;
   }
 
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
index 17f3bc3..b8001c2 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java
@@ -69,7 +69,7 @@ public interface IWritableMemChunk {
   void write(
       long[] times, Object valueList, BitMap bitMap, TSDataType dataType, int 
start, int end);
 
-  void writeVector(
+  void writeAlignedValues(
       long[] times,
       Object[] valueList,
       BitMap[] bitMaps,
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
index 5e064af..aeb1c66 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunk.java
@@ -110,7 +110,7 @@ public class WritableMemChunk implements IWritableMemChunk {
   }
 
   @Override
-  public void writeVector(
+  public void writeAlignedValues(
       long[] times,
       Object[] valueList,
       BitMap[] bitMaps,