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/18 02:09:31 UTC

[incubator-iotdb] branch cluster_premerge2 updated (f2b4a97 -> 7a4efd7)

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 f2b4a97  Merge branch 'master' into cluster_premerge2
     add 44c9e49  [IOTDB-759] Refactor MNode by removing InternalMNode (#1345)
     add 63d2ca2  add audit log (#1373)
     add 7a4efd7  Merge branch 'master' into cluster_premerge2

No new revisions were added by this update.

Summary of changes:
 server/src/assembly/resources/conf/logback.xml     |  21 ++++
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   2 +
 .../iotdb/db/engine/merge/task/MergeTask.java      |  11 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  13 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  18 +--
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  32 ++---
 .../apache/iotdb/db/metadata/MetadataConstant.java |  11 +-
 .../iotdb/db/metadata/mnode/InternalMNode.java     | 135 --------------------
 .../org/apache/iotdb/db/metadata/mnode/MNode.java  | 137 +++++++++++++++++++--
 .../iotdb/db/metadata/mnode/MeasurementMNode.java  |  77 ++++++++++--
 .../iotdb/db/metadata/mnode/StorageGroupMNode.java |  22 +++-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  46 ++++---
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  33 +++--
 .../iotdb/db/metadata/MManagerImproveTest.java     |   5 +-
 .../org/apache/iotdb/db/metadata/MTreeTest.java    |  40 +++---
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |  12 +-
 16 files changed, 353 insertions(+), 262 deletions(-)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/InternalMNode.java