This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch jira_759
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 765c420 [IOTDB-726] CheckPoint of MTree
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 20cea74 Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
add 5bab6c6 Merge master
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 | 37 +++----
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 21 ----
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 19 ----
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 12 ---
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 5 +
...ceFromReaderTest.java => DeviceStringTest.java} | 118 ++++-----------------
.../apache/iotdb/tsfile/utils/VersionUtils.java | 5 +
9 files changed, 75 insertions(+), 177 deletions(-)
copy
server/src/test/java/org/apache/iotdb/db/writelog/recover/{RecoverResourceFromReaderTest.java
=> DeviceStringTest.java} (50%)
