This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch mtree_checkpoint
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 83df79b [IOTDB-726] CheckPoint of MTree
add 6a927f4 IOTDB-750 Allow SubDevices in IoTDB.
add a7ac8c1 [IOTDB-755] Fix count bug (#1335)
new 9befe29 Merge remote-tracking branch 'origin/master' into
mtree_checkpoint
new 20b6bc3 [IOTDB-726] CheckPoint of MTree
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 | 99 +++++-----
.../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 +-
.../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 203 +++++++++++++++++++++
.../IoTDBAggregationAlignByDeviceIT.java | 113 ++++++++++++
.../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 ++++----
18 files changed, 544 insertions(+), 235 deletions(-)
rename server/src/main/java/org/apache/iotdb/db/metadata/mnode/{LeafMNode.java
=> MeasurementMNode.java} (72%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAddSubDeviceIT.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationAlignByDeviceIT.java
