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 2020/12/01 01:47:23 UTC

[iotdb] 01/01: Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition

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

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

commit 918ad75711e41c6e78caeac795a6a2b713aa2c7a
Merge: 983bc70 ff104e9
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Tue Dec 1 09:36:32 2020 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition

 docs/zh/UserGuide/Concept/Data Type.md             |  2 +-
 .../db/engine/compaction/TsFileManagement.java     | 21 +++++
 .../level/LevelCompactionTsFileManagement.java     |  7 +-
 .../no/NoCompactionTsFileManagement.java           | 22 +----
 .../iotdb/db/engine/flush/FlushManagerMBean.java   |  8 +-
 .../db/engine/querycontext/ReadOnlyMemChunk.java   | 16 +++-
 .../org/apache/iotdb/db/metrics/sink/Sink.java     |  6 +-
 .../org/apache/iotdb/db/metrics/source/Source.java |  2 +-
 .../iotdb/db/integration/IoTDBCompactionIT.java    | 99 ++++++++++++++++++++++
 .../iotdb/db/integration/IoTDBRestartIT.java       | 61 ++++++++++++-
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   | 43 ++++++++++
 .../iotdb/tsfile/compress/IUnCompressor.java       |  2 +-
 .../tsfile/encoding/encoder/TSEncodingBuilder.java | 14 ++-
 13 files changed, 265 insertions(+), 38 deletions(-)