[iotdb] 01/01: fix conflicts

[haonan]

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

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

commit da699d0d913cbd278cd8126241ba0b935ad18e27
Merge: 1daf2a2 fb51b68
Author: HTHou <hhao...@outlook.com>
AuthorDate: Sun Mar 14 11:19:01 2021 +0800

    fix conflicts

 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   2 +-
 .../metadata/AlignedTimeseriesException.java       |  31 ++++
 .../org/apache/iotdb/db/metadata/MManager.java     |  88 ++++++++++-
 .../java/org/apache/iotdb/db/metadata/MTree.java   | 172 ++++++++++++++++++---
 .../org/apache/iotdb/db/metadata/MetaUtils.java    |  15 ++
 .../iotdb/db/metadata/MManagerBasicTest.java       | 106 ++++++++++++-
 .../db/qp/physical/PhysicalPlanSerializeTest.java  |  20 +--
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   1 +
 8 files changed, 384 insertions(+), 51 deletions(-)

diff --cc 
server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index 3413082,7f9c91f..41144ca
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@@ -44,6 -45,8 +44,7 @@@ import java.util.concurrent.ExecutionEx
  import java.util.concurrent.Future;
  import java.util.concurrent.LinkedBlockingQueue;
  
 -import static org.apache.iotdb.db.rescon.PrimitiveArrayManager.ARRAY_SIZE;
+ 
  public class MemTableFlushTask {
  
    private static final Logger LOGGER = 
LoggerFactory.getLogger(MemTableFlushTask.class);
@@@ -160,7 -163,12 +161,6 @@@
        new Runnable() {
          private void writeOneSeries(
              TVList tvPairs, IChunkWriter seriesWriterImpl, TSDataType 
dataType) {
 -
 -          if (dataType == TSDataType.VECTOR) {
 -            writeOneVectorSeries(tvPairs, seriesWriterImpl);
 -            return;
 -          }
--
            for (int i = 0; i < tvPairs.size(); i++) {
              long time = tvPairs.getTime(i);