This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a commit to branch mtree_checkpoint in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9befe2939621e0a1517af88fce281b5a4156b51d Merge: 83df79b a7ac8c1 Author: samperson1997 <[email protected]> AuthorDate: Tue Jun 9 19:07:55 2020 +0800 Merge remote-tracking branch 'origin/master' into mtree_checkpoint # Conflicts: # server/src/main/java/org/apache/iotdb/db/metadata/MTree.java .../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 | 95 +++++----- .../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, 549 insertions(+), 226 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/metadata/MManager.java index 2df29d7,ec46b77..adccf01 --- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java @@@ -456,8 -441,11 +456,8 @@@ public class MManager /** * remove the node from the tag inverted index - * - * @param node - * @throws IOException */ - private void removeFromTagInvertedIndex(LeafMNode node) throws IOException { + private void removeFromTagInvertedIndex(MeasurementMNode node) throws IOException { if (node.getOffset() < 0) { return; } diff --cc server/src/main/java/org/apache/iotdb/db/metadata/MTree.java index b2ff6f9,bfb2398..dff5040 --- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java @@@ -66,9 -42,25 +63,27 @@@ import org.apache.iotdb.tsfile.file.met import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.utils.Pair; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Serializable; + import java.util.ArrayDeque; + import java.util.ArrayList; + import java.util.Deque; + import java.util.HashMap; + import java.util.HashSet; + import java.util.LinkedList; + import java.util.List; + import java.util.Map; + import java.util.Map.Entry; + import java.util.Queue; + import java.util.Set; + import java.util.TreeSet; + import java.util.regex.Pattern; + + import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_SEPARATOR; + import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_WILDCARD; + /** * The hierarchical struct of the Metadata Tree is implemented in this class. */
