You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/06/29 02:09:03 UTC
[iotdb] 02/03: Merge branch 'rel/0.12' of github.com:apache/iotdb into rel/0.12
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to tag v0.12.5.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 34d9274b5d752d3ec52c6f6e2939a39666909311
Merge: 874317f41b 931ca1916c
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Jun 29 10:05:26 2022 +0800
Merge branch 'rel/0.12' of github.com:apache/iotdb into rel/0.12
.../org/apache/iotdb/db/engine/StorageEngine.java | 75 ++++++-
.../db/engine/memtable/IWritableMemChunk.java | 6 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 13 +-
.../virtualSg/VirtualStorageGroupManager.java | 38 ++++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 12 +-
.../iotdb/db/utils/datastructure/BinaryTVList.java | 1 -
.../db/utils/datastructure/BooleanTVList.java | 1 -
.../iotdb/db/utils/datastructure/DoubleTVList.java | 1 -
.../iotdb/db/utils/datastructure/FloatTVList.java | 1 -
.../iotdb/db/utils/datastructure/IntTVList.java | 1 -
.../iotdb/db/utils/datastructure/LongTVList.java | 1 -
.../iotdb/db/utils/datastructure/TVList.java | 13 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 25 +--
.../writelog/recover/TsFileRecoverPerformer.java | 57 ++++-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 18 +-
.../IoTDBLoadExternalTsfileWithVirtualSGIT.java | 189 ++++++++++++++++
.../iotdb/db/writelog/recover/LogReplayerTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 250 ++++++++++++++++++++-
18 files changed, 641 insertions(+), 63 deletions(-)