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:15 UTC
[iotdb] branch separate_insert_plan_xkf updated (b246bb5 -> dc06e75)
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch separate_insert_plan_xkf
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from b246bb5 replace vector measurement schema
add 1197d07 move vector -> aligned
add 8df7791 Merge branch 'new_vector' of https://github.com/apache/iotdb into new_vector
add e3e3748 [IOTDB-1672] Separate AlignedInsertPlan from current InsertPlan (#4313)
add 92de56f [IOTDB-1910] Support aligned timeseries in TsFile metadata index (#4291)
add da316c7 Fix .s1 .s2 in TsFile
new dc06e75 Merge branch 'new_vector' of git://github.com/apache/iotdb into separate_insert_plan_xkf
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
rename tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/{TimeSeriesMetadataTest.java => TimeseriesMetadataTest.java} (98%)
[iotdb] 01/01: Merge branch 'new_vector' of
git://github.com/apache/iotdb into separate_insert_plan_xkf
Posted by xu...@apache.org.
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(-)