[iotdb] 04/04: fix conflicts

[ha...@apache.org]

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

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

commit 49b19a4915f85180db1d825377892d6b13f2357e
Merge: 27883e0 20ecbc7
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Mar 11 17:34:30 2021 +0800

    fix conflicts

 .../java/org/apache/iotdb/cluster/ClientMain.java  |  5 +-
 .../cluster/client/sync/SyncClientAdaptor.java     |  6 +-
 .../apache/iotdb/cluster/metadata/CMManager.java   | 14 ++---
 .../apache/iotdb/cluster/metadata/MetaPuller.java  | 15 ++---
 .../iotdb/cluster/query/LocalQueryExecutor.java    |  6 +-
 .../caller/PullMeasurementSchemaHandler.java       |  7 ++-
 .../cluster/client/sync/SyncClientAdaptorTest.java |  5 +-
 .../org/apache/iotdb/cluster/common/IoTDBTest.java |  4 +-
 .../org/apache/iotdb/cluster/common/TestUtils.java |  9 +--
 .../caller/PullMeasurementSchemaHandlerTest.java   | 10 ++--
 .../cluster/server/member/DataGroupMemberTest.java |  3 +-
 .../cluster/server/member/MetaGroupMemberTest.java | 10 ++--
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |  5 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  3 +-
 .../apache/iotdb/db/engine/memtable/IMemTable.java |  3 +-
 .../db/engine/memtable/PrimitiveMemTable.java      |  1 -
 .../iotdb/db/engine/memtable/WritableMemChunk.java |  1 -
 .../db/engine/merge/manage/MergeResource.java      | 12 ++--
 .../db/engine/merge/task/MergeMultiChunkTask.java  |  6 +-
 .../iotdb/db/engine/merge/task/MergeTask.java      |  4 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  4 +-
 .../apache/iotdb/db/metadata/MLogTxtWriter.java    |  4 +-
 .../org/apache/iotdb/db/metadata/MManager.java     | 13 +++--
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  8 +--
 .../apache/iotdb/db/metadata/MeasurementMeta.java  | 14 ++---
 .../iotdb/db/metadata/mnode/MeasurementMNode.java  | 11 ++--
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  8 +--
 .../db/qp/physical/sys/MeasurementMNodePlan.java   |  9 +--
 .../db/tools/upgrade/TsFileOnlineUpgradeTool.java  | 29 +++++-----
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |  3 +-
 .../query/reader/series/SeriesReaderTestUtil.java  |  3 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  3 +-
 .../java/org/apache/iotdb/session/Session.java     |  6 +-
 .../iotdb/spark/tsfile/NarrowConverter.scala       |  4 +-
 .../apache/iotdb/spark/tsfile/WideConverter.scala  |  5 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 13 +++--
 .../apache/iotdb/tsfile/write/TsFileWriter.java    | 13 +++--
 .../tsfile/write/chunk/ChunkGroupWriterImpl.java   |  3 +-
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  |  8 +--
 .../tsfile/write/chunk/IChunkGroupWriter.java      |  4 +-
 .../apache/iotdb/tsfile/write/page/PageWriter.java |  6 +-
 .../tsfile/write/schema/IMeasurementSchema.java    | 15 +++++
 .../tsfile/write/schema/MeasurementSchema.java     | 67 ++++++++++++----------
 .../apache/iotdb/tsfile/write/schema/Schema.java   | 25 ++++----
 .../write/writer/RestorableTsFileIOWriter.java     |  8 +--
 .../org/apache/iotdb/tsfile/utils/RecordUtils.java |  4 +-
 .../tsfile/write/DefaultDeviceTemplateTest.java    |  3 +-
 .../write/schema/converter/SchemaBuilderTest.java  | 17 +++---
 48 files changed, 236 insertions(+), 203 deletions(-)

diff --cc server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index dd18de4,3538aa1..f22070e
--- 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
@@@ -186,20 -157,10 +185,20 @@@ public abstract class AbstractMemTable 
    public void write(
        String deviceId,
        String measurement,
-       MeasurementSchema schema,
+       IMeasurementSchema schema,
        long insertTime,
        Object objectValue) {
 -    IWritableMemChunk memSeries = createIfNotExistAndGet(deviceId, measurement, schema);
 +    IWritableMemChunk memSeries = createIfNotExistAndGet(deviceId, schema);
 +    memSeries.write(insertTime, objectValue);
 +  }
 +
 +  @Override
 +  public void write(
 +      String deviceId,
 +      IMeasurementSchema schema,
 +      long insertTime,
 +      Object objectValue) {
 +    IWritableMemChunk memSeries = createIfNotExistAndGet(deviceId, schema);
      memSeries.write(insertTime, objectValue);
    }
  
diff --cc tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
index 3b2368d,e035787..db073ca
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
@@@ -325,34 -359,4 +359,5 @@@ public class MeasurementSchem
    public void setType(TSDataType type) {
      this.type = type.serialize();
    }
 +
-   @Override
-   public TSEncoding getTimeTSEncoding() {
-     // TODO Auto-generated method stub
-     return null;
-   }
- 
-   @Override
-   public List<String> getValueMeasurementIdList() {
-     // TODO Auto-generated method stub
-     return null;
-   }
- 
-   @Override
-   public List<TSDataType> getValueTSDataTypeList() {
-     // TODO Auto-generated method stub
-     return null;
-   }
- 
-   @Override
-   public List<TSEncoding> getValueTSEncodingList() {
-     // TODO Auto-generated method stub
-     return null;
-   }
- 
-   @Override
-   public List<Encoder> getValueEncoderList() {
-     // TODO Auto-generated method stub
-     return null;
-   }
  }