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 2020/01/03 12:13:04 UTC
[incubator-iotdb] 01/03: Merge branch 'master' of
github.com:apache/incubator-iotdb
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 7a3d5fcf61e92a2d302773ff182f8f325aa6acaa
Merge: aa48a76 d09de2c
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jan 3 15:01:27 2020 +0800
Merge branch 'master' of github.com:apache/incubator-iotdb
README.md | 60 +++----
docs/Development-VoteRelease.md | 198 +++++++++++++++++++++
.../org/apache/iotdb/db/engine/StorageEngine.java | 54 +++---
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 54 ++++++
.../iotdb/db/engine/merge/task/MergeFileTask.java | 18 ++
.../engine/storagegroup/StorageGroupProcessor.java | 50 +++---
.../db/engine/storagegroup/TsFileProcessor.java | 10 +-
.../db/engine/storagegroup/TsFileResource.java | 58 ++++--
.../iotdb/db/qp/physical/sys/ShowTTLPlan.java | 18 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 31 +++-
.../iotdb/db/tools/TsFileResourcePrinter.java | 8 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 31 ++--
.../writelog/recover/TsFileRecoverPerformer.java | 22 +--
.../db/engine/cache/DeviceMetaDataCacheTest.java | 3 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 3 +
.../apache/iotdb/db/engine/merge/MergeTest.java | 3 +
.../storagegroup/StorageGroupProcessorTest.java | 3 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 3 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 64 ++++++-
.../iotdb/db/query/reader/ReaderTestHelper.java | 3 +-
20 files changed, 547 insertions(+), 147 deletions(-)