You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/01/07 08:28:52 UTC
[iotdb] branch DeleteBug created (now 65d60d9)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch DeleteBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 65d60d9 fix delete bug
This branch includes the following new commits:
new 65d60d9 fix delete bug
The 1 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.
[iotdb] 01/01: fix delete bug
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch DeleteBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 65d60d95919fa88d4ba82e1e6d78335c84aa64f7
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Thu Jan 7 16:28:00 2021 +0800
fix delete bug
---
.../java/org/apache/iotdb/db/metadata/MTree.java | 44 +++++++++++-----------
.../org/apache/iotdb/db/metadata/MTreeTest.java | 23 +++++++++++
2 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 06969a6..561404c 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -110,10 +110,10 @@ public class MTree implements Serializable {
} else {
try {
QueryDataSource dataSource = QueryResourceManager.getInstance().
- getQueryDataSource(node.getPartialPath(), queryContext, null);
+ getQueryDataSource(node.getPartialPath(), queryContext, null);
LastPointReader lastReader = new LastPointReader(node.getPartialPath(),
- node.getSchema().getType(), Collections.emptySet(), queryContext,
- dataSource, Long.MAX_VALUE, null);
+ node.getSchema().getType(), Collections.emptySet(), queryContext,
+ dataSource, Long.MAX_VALUE, null);
last = lastReader.readLastPoint();
return (last != null ? last.getTimestamp() : Long.MIN_VALUE);
} catch (Exception e) {
@@ -459,9 +459,9 @@ public class MTree implements Serializable {
curNode.getParent().deleteAliasChild(((MeasurementMNode) curNode).getAlias());
}
curNode = curNode.getParent();
- // delete all empty ancestors except storage group
+ // delete all empty ancestors except storage group and MeasurementMNode
while (!IoTDBConstant.PATH_ROOT.equals(curNode.getName())
- && curNode.getChildren().size() == 0) {
+ && !(curNode instanceof MeasurementMNode) && curNode.getChildren().size() == 0) {
// if current storage group has no time series, return the storage group name
if (curNode instanceof StorageGroupMNode) {
return new Pair<>(curNode.getPartialPath(), deletedNode);
@@ -635,12 +635,11 @@ public class MTree implements Serializable {
}
/**
- * Get the storage group that given path belonged to or under given path
- * All related storage groups refer two cases:
- * 1. Storage groups with a prefix that is identical to path, e.g. given path "root.sg1",
- * storage group "root.sg1.sg2" and "root.sg1.sg3" will be added into result list.
- * 2. Storage group that this path belongs to, e.g. given path "root.sg1.d1", and it is in
- * storage group "root.sg1". Then we adds "root.sg1" into result list.
+ * Get the storage group that given path belonged to or under given path All related storage
+ * groups refer two cases: 1. Storage groups with a prefix that is identical to path, e.g. given
+ * path "root.sg1", storage group "root.sg1.sg2" and "root.sg1.sg3" will be added into result
+ * list. 2. Storage group that this path belongs to, e.g. given path "root.sg1.d1", and it is in
+ * storage group "root.sg1". Then we adds "root.sg1" into result list.
*
* @return a list contains all storage groups related to given path
*/
@@ -670,13 +669,11 @@ public class MTree implements Serializable {
}
/**
- * Traverse the MTree to match all storage group with prefix path.
- * When trying to find storage groups via a path, we divide into two cases:
- * 1. This path is only regarded as a prefix, in other words, this path is part of the result
- * storage groups.
- * 2. This path is a full path and we use this method to find its belonged storage group.
- * When prefixOnly is set to true, storage group paths in 1 is only added into result,
- * otherwise, both 1 and 2 are returned.
+ * Traverse the MTree to match all storage group with prefix path. When trying to find storage
+ * groups via a path, we divide into two cases: 1. This path is only regarded as a prefix, in
+ * other words, this path is part of the result storage groups. 2. This path is a full path and we
+ * use this method to find its belonged storage group. When prefixOnly is set to true, storage
+ * group paths in 1 is only added into result, otherwise, both 1 and 2 are returned.
*
* @param node the current traversing node
* @param nodes split the prefix path with '.'
@@ -782,11 +779,11 @@ public class MTree implements Serializable {
* Get all timeseries paths under the given path
*
* @param prefixPath a prefix path or a full path, may contain '*'.
- *
- * @return Pair.left contains all the satisfied paths
- * Pair.right means the current offset or zero if we don't set offset.
+ * @return Pair.left contains all the satisfied paths Pair.right means the current offset or zero
+ * if we don't set offset.
*/
- Pair<List<PartialPath>, Integer> getAllTimeseriesPathWithAlias(PartialPath prefixPath, int limit, int offset) throws MetadataException {
+ Pair<List<PartialPath>, Integer> getAllTimeseriesPathWithAlias(PartialPath prefixPath, int limit,
+ int offset) throws MetadataException {
PartialPath prePath = new PartialPath(prefixPath.getNodes());
ShowTimeSeriesPlan plan = new ShowTimeSeriesPlan(prefixPath);
plan.setLimit(limit);
@@ -1007,7 +1004,8 @@ public class MTree implements Serializable {
}
- List<Pair<PartialPath, String[]>> getAllMeasurementSchema(ShowTimeSeriesPlan plan, boolean removeCurrentOffset)
+ List<Pair<PartialPath, String[]>> getAllMeasurementSchema(ShowTimeSeriesPlan plan,
+ boolean removeCurrentOffset)
throws MetadataException {
List<Pair<PartialPath, String[]>> res;
String[] nodes = plan.getPath().getNodes();
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
index bd83fc8..ae5c2bd 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MTreeTest.java
@@ -500,4 +500,27 @@ public class MTreeTest {
assertEquals(root.searchAllRelatedStorageGroups(new PartialPath("root.vehicle.d1.s1")),
Arrays.asList(new PartialPath(sgPath1)));
}
+
+ @Test
+ public void testDeleteChildOfMeasurementMNode() throws MetadataException {
+ MTree root = new MTree();
+ String sgPath = "root.sg1";
+ root.setStorageGroup(new PartialPath(sgPath));
+ try {
+ root.createTimeseries(new PartialPath("root.sg1.a.b"), TSDataType.INT32, TSEncoding.RLE,
+ TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap(), null);
+ root.createTimeseries(new PartialPath("root.sg1.a.b.c"), TSDataType.INT32, TSEncoding.RLE,
+ TSFileDescriptor.getInstance().getConfig().getCompressor(), Collections.emptyMap(), null);
+ assertTrue(root.isPathExist(new PartialPath("root.sg1.a.b")));
+ assertTrue(root.isPathExist(new PartialPath("root.sg1.a.b.c")));
+
+ root.deleteTimeseriesAndReturnEmptyStorageGroup(new PartialPath("root.sg1.a.b.c"));
+
+ assertFalse(root.isPathExist(new PartialPath("root.sg1.a.b.c")));
+ assertTrue(root.isPathExist(new PartialPath("root.sg1.a.b")));
+
+ } catch (MetadataException e1) {
+ fail(e1.getMessage());
+ }
+ }
}