You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2021/03/14 09:01:34 UTC
[iotdb] 02/03: Merge remote-tracking branch 'origin/Vector' into
Vector
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch insertTablet
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bbcadd9d614f31c1b1327b251aa220903bb018fa
Merge: 2e667d3 0867605
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Sun Mar 14 16:46:06 2021 +0800
Merge remote-tracking branch 'origin/Vector' into Vector
.github/workflows/sonar-coveralls.yml | 14 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 35 +++--
.../iotdb/db/engine/memtable/AbstractMemTable.java | 59 ++++-----
.../db/engine/memtable/IWritableMemChunk.java | 2 +-
.../db/engine/memtable/PrimitiveMemTable.java | 5 +
.../iotdb/db/engine/memtable/WritableMemChunk.java | 6 +-
.../org/apache/iotdb/db/metadata/MManager.java | 140 ++++++++++++++------
.../java/org/apache/iotdb/db/metadata/MTree.java | 84 ++++++------
.../iotdb/db/metadata/logfile/MLogWriter.java | 32 +++--
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 21 ++-
.../iotdb/db/metadata/template/Template.java | 35 ++++-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 100 +++++++-------
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 27 ++--
.../db/qp/physical/crud/CreateTemplatePlan.java | 146 ++++++++++++++++++++-
.../db/qp/physical/crud/SetDeviceTemplatePlan.java | 55 +++++++-
.../physical/sys/CreateAlignedTimeSeriesPlan.java | 17 +--
.../apache/iotdb/db/rescon/TVListAllocator.java | 13 +-
.../iotdb/db/utils/datastructure/VectorTVList.java | 12 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 40 +++++-
.../db/engine/memtable/MemTableTestUtils.java | 58 ++++++++
.../db/engine/memtable/PrimitiveMemTableTest.java | 124 +++++++++--------
.../iotdb/db/metadata/MManagerBasicTest.java | 85 +++++++++---
.../iotdb/db/metadata/MManagerImproveTest.java | 18 ++-
.../write/schema/VectorMeasurementSchema.java | 2 +-
24 files changed, 810 insertions(+), 320 deletions(-)