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 2019/12/30 12:51:28 UTC

[incubator-iotdb] branch cluster_new updated (ddf75da -> 4b2f88f)

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

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


    from ddf75da  Merge branch 'master' into cluster_new
     add 36ba3d8  abstract TsFileFlushPolicy and allow specifying storage groups in flush command
     add 4b2f88f  Merge branch 'pull_up_file_close' into cluster_new

No new revisions were added by this update.

Summary of changes:
 .../org/apache/iotdb/db/engine/StorageEngine.java  | 53 +++++++-----------
 .../iotdb/db/engine/flush/TsFileFlushPolicy.java   | 54 ++++++++++++++++++
 .../engine/storagegroup/StorageGroupProcessor.java | 37 ++++---------
 .../db/engine/storagegroup/TsFileProcessor.java    |  7 +--
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 31 ++++++++++-
 .../db/engine/cache/DeviceMetaDataCacheTest.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 +-
 10 files changed, 187 insertions(+), 71 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/TsFileFlushPolicy.java