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/06/12 08:38:49 UTC

[incubator-iotdb] 03/04: Merge remote-tracking branch 'origin/master'

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

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

commit b6beda83508db690bddf63c2b871e09640dbef98
Merge: 7766000 2c4ab85
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jun 12 16:15:45 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .../db/engine/storagegroup/TsFileResource.java     |   4 +
 .../org/apache/iotdb/db/metadata/MManager.java     | 150 ++++++++++++++++++---
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  14 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   5 +
 .../db/writelog/recover/DeviceStringTest.java      | 114 ++++++++++++++++
 5 files changed, 258 insertions(+), 29 deletions(-)