This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new a2d10d3a9b6 ISchemaTree add interface getDeviceUsingTemplate (#11558)
a2d10d3a9b6 is described below
commit a2d10d3a9b678181c59707dd42ae61ac0f2091a4
Author: Chen YZ <[email protected]>
AuthorDate: Fri Nov 17 09:22:59 2023 +0800
ISchemaTree add interface getDeviceUsingTemplate (#11558)
---
.../common/schematree/ClusterSchemaTree.java | 10 ++++
.../queryengine/common/schematree/ISchemaTree.java | 8 ++++
.../SchemaTreeDeviceUsingTemplateVisitor.java | 54 ++++++++++++++++++++++
.../visitor/SchemaTreeDeviceVisitor.java | 6 ---
.../visitor/SchemaTreeVisitorFactory.java | 5 ++
.../common/schematree/ClusterSchemaTreeTest.java | 20 +++++++-
6 files changed, 96 insertions(+), 7 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java
index 02ca32371d6..6d0f6bc1f45 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java
@@ -30,6 +30,7 @@ import
org.apache.iotdb.db.queryengine.common.schematree.node.SchemaEntityNode;
import
org.apache.iotdb.db.queryengine.common.schematree.node.SchemaInternalNode;
import
org.apache.iotdb.db.queryengine.common.schematree.node.SchemaMeasurementNode;
import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode;
+import
org.apache.iotdb.db.queryengine.common.schematree.visitor.SchemaTreeDeviceUsingTemplateVisitor;
import
org.apache.iotdb.db.queryengine.common.schematree.visitor.SchemaTreeDeviceVisitor;
import
org.apache.iotdb.db.queryengine.common.schematree.visitor.SchemaTreeVisitorFactory;
import
org.apache.iotdb.db.queryengine.common.schematree.visitor.SchemaTreeVisitorWithLimitOffsetWrapper;
@@ -370,6 +371,15 @@ public class ClusterSchemaTree implements ISchemaTree {
return new ArrayList<>(templateMap.values());
}
+ @Override
+ public List<PartialPath> getDeviceUsingTemplate(int templateId) {
+ try (SchemaTreeDeviceUsingTemplateVisitor visitor =
+ SchemaTreeVisitorFactory.createSchemaTreeDeviceUsingTemplateVisitor(
+ root, ALL_MATCH_PATTERN, templateId)) {
+ return visitor.getAllResult();
+ }
+ }
+
public void mergeSchemaTree(ClusterSchemaTree schemaTree) {
this.hasLogicalMeasurementPath =
this.hasLogicalMeasurementPath ||
schemaTree.hasLogicalViewMeasurement();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ISchemaTree.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ISchemaTree.java
index 429083ca662..c32c0e56c86 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ISchemaTree.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ISchemaTree.java
@@ -84,6 +84,14 @@ public interface ISchemaTree {
*/
List<Template> getUsingTemplates();
+ /**
+ * Get all devices using the given template.
+ *
+ * @param templateId template id
+ * @return device path list
+ */
+ List<PartialPath> getDeviceUsingTemplate(int templateId);
+
/**
* If there is view in this schema tree, return true, else return false.
*
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceUsingTemplateVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceUsingTemplateVisitor.java
new file mode 100644
index 00000000000..510f2e85858
--- /dev/null
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceUsingTemplateVisitor.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.queryengine.common.schematree.visitor;
+
+import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode;
+
+public class SchemaTreeDeviceUsingTemplateVisitor extends
SchemaTreeVisitor<PartialPath> {
+
+ private final int templateId;
+
+ public SchemaTreeDeviceUsingTemplateVisitor(
+ SchemaNode root, PartialPath pathPattern, int templateId) {
+ super(root, pathPattern, false);
+ this.templateId = templateId;
+ }
+
+ @Override
+ protected boolean mayTargetNodeType(SchemaNode node) {
+ return node.isEntity();
+ }
+
+ @Override
+ protected boolean acceptInternalMatchedNode(SchemaNode node) {
+ return false;
+ }
+
+ @Override
+ protected boolean acceptFullMatchedNode(SchemaNode node) {
+ return node.isEntity() && node.getAsEntityNode().getTemplateId() ==
templateId;
+ }
+
+ @Override
+ protected PartialPath generateResult(SchemaNode nextMatchedNode) {
+ return getPartialPathFromRootToNode(nextMatchedNode);
+ }
+}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceVisitor.java
index 3dbd7329104..42fe1b15db1 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceVisitor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeDeviceVisitor.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.queryengine.common.schematree.visitor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo;
import
org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo;
import org.apache.iotdb.db.queryengine.common.schematree.MeasurementSchemaInfo;
@@ -37,11 +36,6 @@ public class SchemaTreeDeviceVisitor extends
SchemaTreeVisitor<DeviceSchemaInfo>
super(root, pathPattern, isPrefixMatch);
}
- public SchemaTreeDeviceVisitor(
- SchemaNode root, PartialPath pathPattern, boolean isPrefixMatch,
PathPatternTree scope) {
- super(root, pathPattern, isPrefixMatch, scope);
- }
-
@Override
protected boolean mayTargetNodeType(SchemaNode node) {
return node.isEntity();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeVisitorFactory.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeVisitorFactory.java
index df9e05f3838..a1cf8c13434 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeVisitorFactory.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/visitor/SchemaTreeVisitorFactory.java
@@ -35,6 +35,11 @@ public class SchemaTreeVisitorFactory {
return new SchemaTreeDeviceVisitor(root, pathPattern, isPrefixMatch);
}
+ public static SchemaTreeDeviceUsingTemplateVisitor
createSchemaTreeDeviceUsingTemplateVisitor(
+ SchemaNode root, PartialPath pathPattern, int templateId) {
+ return new SchemaTreeDeviceUsingTemplateVisitor(root, pathPattern,
templateId);
+ }
+
public static SchemaTreeVisitorWithLimitOffsetWrapper<MeasurementPath>
createSchemaTreeMeasurementVisitor(
SchemaNode root,
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
index 6383c0b808e..f0e4ec64719 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTreeTest.java
@@ -51,6 +51,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
import static org.apache.iotdb.commons.schema.SchemaConstant.NON_TEMPLATE;
@@ -865,6 +866,8 @@ public class ClusterSchemaTreeTest {
}
Assert.assertFalse(schemaTree1.hasNormalTimeSeries());
Assert.assertEquals(1, schemaTree1.getUsingTemplates().size());
+ checkDeviceUsingTemplate(
+ schemaTree1, 1, Sets.newSet("root.sg1.v1.d1", "root.sg1.v1.d2",
"root.sg1.v1"));
Template template2 =
new Template(
"t2",
@@ -872,12 +875,16 @@ public class ClusterSchemaTreeTest {
Arrays.asList(TSDataType.DOUBLE, TSDataType.INT32,
TSDataType.BOOLEAN),
Arrays.asList(TSEncoding.RLE, TSEncoding.RLE, TSEncoding.RLE),
Arrays.asList(CompressionType.SNAPPY, CompressionType.SNAPPY,
CompressionType.SNAPPY));
- template1.setId(1);
+ template2.setId(2);
ClusterSchemaTree schemaTree3 = new ClusterSchemaTree();
schemaTree3.appendTemplateDevice(new PartialPath("root.sg2.d1"), false, 2,
template2);
schemaTree1.mergeSchemaTree(schemaTree3);
Assert.assertFalse(schemaTree1.hasNormalTimeSeries());
Assert.assertEquals(2, schemaTree1.getUsingTemplates().size());
+
+ checkDeviceUsingTemplate(
+ schemaTree1, 1, Sets.newSet("root.sg1.v1.d1", "root.sg1.v1.d2",
"root.sg1.v1"));
+ checkDeviceUsingTemplate(schemaTree1, 2, Sets.newSet("root.sg2.d1"));
for (DeviceSchemaInfo deviceSchemaInfo : deviceSchemaInfoList) {
if (deviceSchemaInfo.getDevicePath().startsWith("root.sg1")) {
Assert.assertEquals(1, deviceSchemaInfo.getTemplateId());
@@ -927,6 +934,17 @@ public class ClusterSchemaTreeTest {
}
}
+ private void checkDeviceUsingTemplate(
+ ISchemaTree schemaTree, int templateId, Set<String> expected) {
+ List<PartialPath> deviceUsingTemplate =
schemaTree.getDeviceUsingTemplate(templateId);
+ Assert.assertEquals(expected.size(), deviceUsingTemplate.size());
+ for (PartialPath d : deviceUsingTemplate) {
+ Assert.assertTrue(expected.contains(d.getFullPath()));
+ expected.remove(d.getFullPath());
+ }
+ Assert.assertTrue(expected.isEmpty());
+ }
+
@Test
public void testMergeSchemaTreeAndSearchDeviceSchemaInfo() throws Exception {
ClusterSchemaTree schemaTree = new ClusterSchemaTree();
