This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch enhance_merge_management in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ecfe945c2a17c7d711bbd9267bd5a4c54b0bd4b3 Merge: 75c7486 a7ac8c1 Author: jt2594838 <[email protected]> AuthorDate: Tue Jun 9 19:28:52 2020 +0800 Merge branch 'master' into enhance_merge_management # Conflicts: # server/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 docs/UserGuide/Server/Config Manual.md | 55 ++++++ docs/zh/UserGuide/Server/Config Manual.md | 58 ++++++ .../resources/conf/iotdb-engine.properties | 3 + .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 3 + .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 18 ++ .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 + .../iotdb/db/engine/merge/task/MergeTask.java | 4 +- .../engine/storagegroup/StorageGroupProcessor.java | 6 +- .../org/apache/iotdb/db/metadata/MManager.java | 60 +++--- .../java/org/apache/iotdb/db/metadata/MTree.java | 109 ++++++----- .../iotdb/db/metadata/mnode/InternalMNode.java | 2 +- .../{LeafMNode.java => MeasurementMNode.java} | 57 +----- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 14 +- .../db/qp/physical/crud/AlignByDevicePlan.java | 24 ++- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 71 +++++-- .../db/query/dataset/AlignByDeviceDataSet.java | 11 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 6 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +- .../apache/iotdb/db/utils/TypeInferenceUtils.java | 6 +- .../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 203 +++++++++++++++++++++ .../IoTDBAggregationAlignByDeviceIT.java | 113 ++++++++++++ .../iotdb/db/integration/IoTDBInsertNaNIT.java | 139 ++++++++++++++ .../apache/iotdb/db/integration/IoTDBLastIT.java | 12 +- .../iotdb/db/metadata/MManagerAdvancedTest.java | 14 +- .../iotdb/db/metadata/MManagerImproveTest.java | 4 +- .../org/apache/iotdb/db/metadata/MTreeTest.java | 77 ++++---- .../java/org/apache/iotdb/db/qp/PlannerTest.java | 13 ++ 27 files changed, 845 insertions(+), 241 deletions(-)
