You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2021/03/01 04:16:48 UTC

[iotdb] 02/02: Merge branch 'master' into metric2021

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

chaow pushed a commit to branch feature/metric2021
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 6ba7154fdb4682a2f07dde907b7952089a74c57f
Merge: 776b869 b986cd1
Author: chaow <xu...@gmail.com>
AuthorDate: Mon Mar 1 12:14:50 2021 +0800

    Merge branch 'master' into metric2021

 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |  1 +
 .../DDL Data Definition Language.md                | 31 ++++++++++
 .../DDL Data Definition Language.md                | 31 ++++++++++
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |  1 +
 .../org/apache/iotdb/db/metadata/MManager.java     | 13 ++++
 .../java/org/apache/iotdb/db/metadata/MTree.java   | 72 ++++++++++++++++++++++
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |  2 +
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  | 26 ++++++++
 .../db/qp/logical/sys/ShowChildNodesOperator.java  | 36 +++++++++++
 .../db/qp/physical/sys/ShowChildNodesPlan.java     | 39 ++++++++++++
 .../apache/iotdb/db/qp/physical/sys/ShowPlan.java  |  1 +
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    | 13 ++++
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  5 ++
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 35 +++++++++++
 .../iotdb/db/metadata/MManagerBasicTest.java       | 43 +++++++++++++
 .../org/apache/iotdb/db/metadata/MTreeTest.java    | 46 ++++++++++++++
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   |  7 +++
 17 files changed, 402 insertions(+)