You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/01/03 01:25:18 UTC

[incubator-iotdb] 01/01: Merge branch 'master' into abstract_SeriesReaderWithoutValueFilter

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

jiangtian pushed a commit to branch abstract_SeriesReaderWithoutValueFilter
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit fdb445abbfad1271763199c7c56dba0e9241de8c
Merge: 40c6e94 0734ec1
Author: jt2594838 <jt...@163.com>
AuthorDate: Fri Jan 3 09:24:31 2020 +0800

    Merge branch 'master' into abstract_SeriesReaderWithoutValueFilter

 docs/Development-VoteRelease.md                    | 198 +++++++++++++++++++++
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |  18 ++
 .../engine/storagegroup/StorageGroupProcessor.java |  13 ++
 .../db/engine/storagegroup/TsFileProcessor.java    |   4 +-
 .../db/engine/storagegroup/TsFileResource.java     |  58 ++++--
 .../iotdb/db/qp/physical/sys/ShowTTLPlan.java      |  18 +-
 .../iotdb/db/tools/TsFileResourcePrinter.java      |   8 +-
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java |  31 ++--
 .../writelog/recover/TsFileRecoverPerformer.java   |  22 +--
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |   3 +
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   3 +
 11 files changed, 329 insertions(+), 47 deletions(-)