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/06/12 03:12:00 UTC

[incubator-iotdb] branch cluster_premerge2 updated (91d5222 -> 58d18dc)

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

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


    from 91d5222  Merge branch 'master' into cluster_premerge2
     add 8f87fd3  fix cannot set version when recover the uncompleted files (#1346)
     add e68d6c0  [IOTDB-727] Use the same String in MManager and TsFileResource (#1332)
     add 58d18dc  Merge branch 'master' into cluster_premerge2

No new revisions were added by this update.

Summary of changes:
 .../db/engine/storagegroup/TsFileResource.java     |   4 +
 .../org/apache/iotdb/db/metadata/MManager.java     |  31 ++++++
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  14 ++-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   5 +
 ...ceFromReaderTest.java => DeviceStringTest.java} | 118 ++++-----------------
 .../apache/iotdb/tsfile/utils/VersionUtils.java    |   5 +
 6 files changed, 69 insertions(+), 108 deletions(-)
 copy server/src/test/java/org/apache/iotdb/db/writelog/recover/{RecoverResourceFromReaderTest.java => DeviceStringTest.java} (50%)