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

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

commit 5dcd47b6ffcfbd106c5d62c1946485e1a96a2089
Merge: 76985ee 0bdc1e1
Author: HTHou <[email protected]>
AuthorDate: Thu Sep 24 14:44:00 2020 +0800

    Merge branch 'master' of https://github.com/apache/incubator-iotdb into 
master_with_chunk_size

 .travis.yml                                        |  2 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  6 +--
 .../engine/storagegroup/StorageGroupProcessor.java | 53 ++++++++--------------
 .../org/apache/iotdb/db/metadata/MManager.java     | 45 +++++++++---------
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  | 10 ++--
 .../iotdb/db/qp/physical/crud/InsertPlan.java      | 24 +++-------
 .../iotdb/db/qp/physical/crud/InsertRowPlan.java   | 22 +++++----
 .../iotdb/db/writelog/recover/LogReplayer.java     | 21 ++++-----
 .../db/engine/cache/ChunkMetadataCacheTest.java    |  7 ---
 .../engine/modification/DeletionFileNodeTest.java  |  4 --
 .../db/engine/modification/DeletionQueryTest.java  |  5 +-
 .../storagegroup/StorageGroupProcessorTest.java    | 22 ++++-----
 .../iotdb/db/engine/storagegroup/TTLTest.java      | 12 ++---
 .../iotdb/db/writelog/recover/LogReplayerTest.java | 11 ++---
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  9 ++--
 15 files changed, 98 insertions(+), 155 deletions(-)

Reply via email to