You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2021/11/04 07:08:16 UTC
[iotdb] 01/01: Merge branch 'new_vector' of
git://github.com/apache/iotdb into separate_insert_plan_xkf
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch separate_insert_plan_xkf
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dc06e75f6a1d75f6e1238137c2316ea47d2adb42
Merge: b246bb5 da316c7
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Thu Nov 4 11:31:49 2021 +0800
Merge branch 'new_vector' of git://github.com/apache/iotdb into separate_insert_plan_xkf
# Conflicts:
# session/src/main/java/org/apache/iotdb/session/Session.java
# session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
.../iotdb/db/engine/memtable/AbstractMemTable.java | 2 +-
.../engine/memtable/AlignedWritableMemChunk.java | 3 +-
.../db/engine/memtable/IWritableMemChunk.java | 2 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 2 +-
.../tsfile/file/metadata/AlignedChunkMetadata.java | 10 ---
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 11 ---
.../iotdb/tsfile/file/metadata/IChunkMetadata.java | 4 --
.../file/metadata/MetadataIndexConstructor.java | 6 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 9 ---
.../iotdb/tsfile/read/TsFileSequenceReader.java | 35 ---------
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 4 +-
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 5 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 61 ++--------------
...tadataTest.java => TimeseriesMetadataTest.java} | 2 +-
.../tsfile/read/TimeSeriesMetadataReadTest.java | 7 +-
.../tsfile/write/MetadataIndexConstructorTest.java | 14 +++-
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 83 ++++++++++++----------
17 files changed, 81 insertions(+), 179 deletions(-)