You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/05 05:40:15 UTC
[iotdb] branch master updated: [IOTDB-3084] Support schema fetch across sg (#5795)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr 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 f9fcfa1fd5 [IOTDB-3084] Support schema fetch across sg (#5795)
f9fcfa1fd5 is described below
commit f9fcfa1fd596c3b1ce08b3c38fad38ec7be6d276
Author: Marcos_Zyk <38...@users.noreply.github.com>
AuthorDate: Thu May 5 13:40:10 2022 +0800
[IOTDB-3084] Support schema fetch across sg (#5795)
* implement logic plan
* implement distribution plan
* fix serialize bug
* fix serialize bug
* rename schemaFetchNode to schemaFetchScanNode
* rename SchemaScan and SchemaMerge to SchemaQueryScan and SchemaQueryMerge
* rename SchemaScan to SchemaQueryScan
Co-authored-by: Jinrui.Zhang <xi...@gmail.com>
---
.../org/apache/iotdb/commons/path/PartialPath.java | 2 +
.../db/mpp/common/schematree/PathPatternTree.java | 26 ++++++-
.../operator/schema/DevicesSchemaScanOperator.java | 2 +-
...Operator.java => SchemaFetchMergeOperator.java} | 8 +--
...hOperator.java => SchemaFetchScanOperator.java} | 6 +-
...Operator.java => SchemaQueryMergeOperator.java} | 4 +-
...nOperator.java => SchemaQueryScanOperator.java} | 4 +-
.../schema/TimeSeriesSchemaScanOperator.java | 2 +-
.../db/mpp/plan/planner/DistributionPlanner.java | 82 ++++++++++++++++------
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 45 ++++++++----
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 39 +++++++---
.../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 13 ++--
.../mpp/plan/planner/plan/node/PlanNodeType.java | 18 +++--
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 19 +++--
.../plan/node/metedata/read/DevicesCountNode.java | 2 +-
.../node/metedata/read/DevicesSchemaScanNode.java | 2 +-
.../metedata/read/LevelTimeSeriesCountNode.java | 2 +-
...emaFetchNode.java => SchemaFetchMergeNode.java} | 41 +++--------
...hemaFetchNode.java => SchemaFetchScanNode.java} | 55 ++++++++++++---
...emaMergeNode.java => SchemaQueryMergeNode.java} | 16 ++---
...chemaScanNode.java => SchemaQueryScanNode.java} | 12 ++--
.../node/metedata/read/TimeSeriesCountNode.java | 2 +-
.../metedata/read/TimeSeriesSchemaScanNode.java | 2 +-
...rTest.java => SchemaFetchScanOperatorTest.java} | 12 ++--
...rTest.java => SchemaQueryScanOperatorTest.java} | 6 +-
.../db/mpp/plan/plan/DistributionPlannerTest.java | 4 +-
.../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 6 +-
.../read/DeviceSchemaScanNodeSerdeTest.java | 5 +-
.../metadata/read/SchemaFetchScanNodeTest.java | 51 ++++++++++++++
.../read/TimeSeriesSchemaScanNodeSerdeTest.java | 5 +-
30 files changed, 337 insertions(+), 156 deletions(-)
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java b/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
index f7cb0f3fdd..e29822ff4d 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
@@ -501,6 +501,8 @@ public class PartialPath extends Path implements Comparable<Path>, Cloneable {
}
}
+ // Attention!!! If you want to use serialize and deserialize of partialPath, must invoke
+ // PathDeserializeUtil.deserialize
public static PartialPath deserialize(ByteBuffer byteBuffer) {
Path path = Path.deserialize(byteBuffer);
PartialPath partialPath = new PartialPath();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
index f15ee39b68..4002204237 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
@@ -38,6 +38,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD;
+
public class PathPatternTree {
private PathPatternNode root;
@@ -68,6 +70,14 @@ public class PathPatternTree {
}
}
+ public PathPatternTree(List<PartialPath> pathList) {
+ this.root = new PathPatternNode(SQLConstant.ROOT);
+ this.pathList = new ArrayList<>();
+ for (PartialPath path : pathList) {
+ appendPath(path);
+ }
+ }
+
public PathPatternTree(PartialPath fullPath) {
this.root = new PathPatternNode(SQLConstant.ROOT);
this.pathList = new ArrayList<>();
@@ -162,7 +172,7 @@ public class PathPatternTree {
pathList.clear();
}
- public void searchAndConstruct(PathPatternNode curNode, String[] pathNodes, int pos) {
+ private void searchAndConstruct(PathPatternNode curNode, String[] pathNodes, int pos) {
if (pos == pathNodes.length - 1) {
return;
}
@@ -241,6 +251,20 @@ public class PathPatternTree {
return new PartialPath(nodeList.toArray(new String[0]));
}
+ public PathPatternTree extractInvolvedPartByPrefix(PartialPath prefixPath) {
+ if (pathList.isEmpty()) {
+ pathList = splitToPathList();
+ }
+ PartialPath pattern = prefixPath.concatNode(MULTI_LEVEL_PATH_WILDCARD);
+ List<PartialPath> involvedPath = new ArrayList<>();
+ for (PartialPath path : pathList) {
+ if (pattern.matchFullPath(path) || path.matchFullPath(pattern)) {
+ involvedPath.add(path);
+ }
+ }
+ return new PathPatternTree(involvedPath);
+ }
+
@TestOnly
public boolean equalWith(PathPatternTree that) {
if (this == that) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/DevicesSchemaScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/DevicesSchemaScanOperator.java
index 34950d1bf1..17c700f4ae 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/DevicesSchemaScanOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/DevicesSchemaScanOperator.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.tsfile.read.common.block.TsBlock;
import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
import org.apache.iotdb.tsfile.utils.Binary;
-public class DevicesSchemaScanOperator extends SchemaScanOperator {
+public class DevicesSchemaScanOperator extends SchemaQueryScanOperator {
private final boolean hasSgCol;
public DevicesSchemaScanOperator(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaMergeOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchMergeOperator.java
similarity index 95%
copy from server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaMergeOperator.java
copy to server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchMergeOperator.java
index 208033a3af..a599b83bfe 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaMergeOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchMergeOperator.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.mpp.execution.operator.schema;
import org.apache.iotdb.db.mpp.execution.operator.Operator;
@@ -28,14 +29,15 @@ import com.google.common.util.concurrent.ListenableFuture;
import java.util.List;
-public class SchemaMergeOperator implements ProcessOperator {
+public class SchemaFetchMergeOperator implements ProcessOperator {
+
private final PlanNodeId planNodeId;
private final OperatorContext operatorContext;
private final boolean[] noMoreTsBlocks;
private final List<Operator> children;
- public SchemaMergeOperator(
+ public SchemaFetchMergeOperator(
PlanNodeId planNodeId, OperatorContext operatorContext, List<Operator> children) {
this.planNodeId = planNodeId;
this.operatorContext = operatorContext;
@@ -50,8 +52,6 @@ public class SchemaMergeOperator implements ProcessOperator {
@Override
public TsBlock next() {
- // ToDo @xinzhongtianxia consider SHOW LATEST
-
for (int i = 0; i < children.size(); i++) {
if (!noMoreTsBlocks[i]) {
TsBlock tsBlock = children.get(i).next();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchScanOperator.java
similarity index 96%
rename from server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchOperator.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchScanOperator.java
index efd7fd70dd..542d974c5b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchScanOperator.java
@@ -41,9 +41,9 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Optional;
-public class SchemaFetchOperator implements SourceOperator {
+public class SchemaFetchScanOperator implements SourceOperator {
- private static final Logger logger = LoggerFactory.getLogger(SchemaFetchOperator.class);
+ private static final Logger logger = LoggerFactory.getLogger(SchemaFetchScanOperator.class);
private static final int MAX_BINARY_SIZE = 1024 * 1024;
private final PlanNodeId sourceId;
@@ -54,7 +54,7 @@ public class SchemaFetchOperator implements SourceOperator {
private TsBlock tsBlock;
private boolean isFinished = false;
- public SchemaFetchOperator(
+ public SchemaFetchScanOperator(
PlanNodeId planNodeId,
OperatorContext context,
PathPatternTree patternTree,
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaMergeOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryMergeOperator.java
similarity index 96%
rename from server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaMergeOperator.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryMergeOperator.java
index 208033a3af..061e306e81 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaMergeOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryMergeOperator.java
@@ -28,14 +28,14 @@ import com.google.common.util.concurrent.ListenableFuture;
import java.util.List;
-public class SchemaMergeOperator implements ProcessOperator {
+public class SchemaQueryMergeOperator implements ProcessOperator {
private final PlanNodeId planNodeId;
private final OperatorContext operatorContext;
private final boolean[] noMoreTsBlocks;
private final List<Operator> children;
- public SchemaMergeOperator(
+ public SchemaQueryMergeOperator(
PlanNodeId planNodeId, OperatorContext operatorContext, List<Operator> children) {
this.planNodeId = planNodeId;
this.operatorContext = operatorContext;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryScanOperator.java
similarity index 96%
rename from server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaScanOperator.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryScanOperator.java
index 836e27d168..b318c5e7db 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaScanOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryScanOperator.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.db.mpp.execution.operator.source.SourceOperator;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.tsfile.read.common.block.TsBlock;
-public abstract class SchemaScanOperator implements SourceOperator {
+public abstract class SchemaQueryScanOperator implements SourceOperator {
protected OperatorContext operatorContext;
protected TsBlock tsBlock;
@@ -37,7 +37,7 @@ public abstract class SchemaScanOperator implements SourceOperator {
protected PlanNodeId sourceId;
- protected SchemaScanOperator(
+ protected SchemaQueryScanOperator(
PlanNodeId sourceId,
OperatorContext operatorContext,
int limit,
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/TimeSeriesSchemaScanOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/TimeSeriesSchemaScanOperator.java
index 0c02c456bd..dfb9cf177f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/TimeSeriesSchemaScanOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/schema/TimeSeriesSchemaScanOperator.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.tsfile.utils.Binary;
import java.util.Map;
import java.util.stream.Collectors;
-public class TimeSeriesSchemaScanOperator extends SchemaScanOperator {
+public class TimeSeriesSchemaScanOperator extends SchemaQueryScanOperator {
private String key;
private String value;
private boolean isContains;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/DistributionPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/DistributionPlanner.java
index 5e08a30461..775601c0b6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/DistributionPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/DistributionPlanner.java
@@ -35,9 +35,10 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.SimplePlanNodeRewriter;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.WritePlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.AbstractSchemaMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.CountSchemaMergeNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaScanNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchScanNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.ExchangeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.TimeJoinNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.sink.FragmentSinkNode;
@@ -155,9 +156,10 @@ public class DistributionPlanner {
}
@Override
- public PlanNode visitSchemaMerge(SeriesSchemaMergeNode node, DistributionPlanContext context) {
- SeriesSchemaMergeNode root = (SeriesSchemaMergeNode) node.clone();
- SchemaScanNode seed = (SchemaScanNode) node.getChildren().get(0);
+ public PlanNode visitSchemaQueryMerge(
+ SchemaQueryMergeNode node, DistributionPlanContext context) {
+ SchemaQueryMergeNode root = (SchemaQueryMergeNode) node.clone();
+ SchemaQueryScanNode seed = (SchemaQueryScanNode) node.getChildren().get(0);
TreeSet<TRegionReplicaSet> schemaRegions =
new TreeSet<>(Comparator.comparingInt(region -> region.getRegionId().getId()));
analysis
@@ -172,14 +174,15 @@ public class DistributionPlanner {
int count = schemaRegions.size();
schemaRegions.forEach(
region -> {
- SchemaScanNode schemaScanNode = (SchemaScanNode) seed.clone();
- schemaScanNode.setPlanNodeId(context.queryContext.getQueryId().genPlanNodeId());
- schemaScanNode.setRegionReplicaSet(region);
+ SchemaQueryScanNode schemaQueryScanNode = (SchemaQueryScanNode) seed.clone();
+ schemaQueryScanNode.setPlanNodeId(context.queryContext.getQueryId().genPlanNodeId());
+ schemaQueryScanNode.setRegionReplicaSet(region);
if (count > 1) {
- schemaScanNode.setLimit(schemaScanNode.getOffset() + schemaScanNode.getLimit());
- schemaScanNode.setOffset(0);
+ schemaQueryScanNode.setLimit(
+ schemaQueryScanNode.getOffset() + schemaQueryScanNode.getLimit());
+ schemaQueryScanNode.setOffset(0);
}
- root.addChild(schemaScanNode);
+ root.addChild(schemaQueryScanNode);
});
return root;
}
@@ -187,7 +190,7 @@ public class DistributionPlanner {
@Override
public PlanNode visitCountMerge(CountSchemaMergeNode node, DistributionPlanContext context) {
CountSchemaMergeNode root = (CountSchemaMergeNode) node.clone();
- SchemaScanNode seed = (SchemaScanNode) node.getChildren().get(0);
+ SchemaQueryScanNode seed = (SchemaQueryScanNode) node.getChildren().get(0);
Set<TRegionReplicaSet> schemaRegions = new HashSet<>();
analysis
.getSchemaPartitionInfo()
@@ -200,10 +203,10 @@ public class DistributionPlanner {
});
schemaRegions.forEach(
region -> {
- SchemaScanNode schemaScanNode = (SchemaScanNode) seed.clone();
- schemaScanNode.setPlanNodeId(context.queryContext.getQueryId().genPlanNodeId());
- schemaScanNode.setRegionReplicaSet(region);
- root.addChild(schemaScanNode);
+ SchemaQueryScanNode schemaQueryScanNode = (SchemaQueryScanNode) seed.clone();
+ schemaQueryScanNode.setPlanNodeId(context.queryContext.getQueryId().genPlanNodeId());
+ schemaQueryScanNode.setRegionReplicaSet(region);
+ root.addChild(schemaQueryScanNode);
});
return root;
}
@@ -228,6 +231,35 @@ public class DistributionPlanner {
return timeJoinNode;
}
+ @Override
+ public PlanNode visitSchemaFetchMerge(
+ SchemaFetchMergeNode node, DistributionPlanContext context) {
+ SchemaFetchMergeNode root = (SchemaFetchMergeNode) node.clone();
+ Map<String, Set<TRegionReplicaSet>> storageGroupSchemaRegionMap = new HashMap<>();
+ analysis
+ .getSchemaPartitionInfo()
+ .getSchemaPartitionMap()
+ .forEach(
+ (storageGroup, deviceGroup) -> {
+ storageGroupSchemaRegionMap.put(storageGroup, new HashSet<>());
+ deviceGroup.forEach(
+ (deviceGroupId, schemaRegionReplicaSet) ->
+ storageGroupSchemaRegionMap.get(storageGroup).add(schemaRegionReplicaSet));
+ });
+
+ for (PlanNode child : node.getChildren()) {
+ for (TRegionReplicaSet schemaRegion :
+ storageGroupSchemaRegionMap.get(
+ ((SchemaFetchScanNode) child).getStorageGroup().getFullPath())) {
+ SchemaFetchScanNode schemaFetchScanNode = (SchemaFetchScanNode) child.clone();
+ schemaFetchScanNode.setPlanNodeId(context.queryContext.getQueryId().genPlanNodeId());
+ schemaFetchScanNode.setRegionReplicaSet(schemaRegion);
+ root.addChild(schemaFetchScanNode);
+ }
+ }
+ return root;
+ }
+
@Override
public PlanNode visitTimeJoin(TimeJoinNode node, DistributionPlanContext context) {
TimeJoinNode root = (TimeJoinNode) node.clone();
@@ -333,7 +365,7 @@ public class DistributionPlanner {
}
@Override
- public PlanNode visitSchemaMerge(SeriesSchemaMergeNode node, NodeGroupContext context) {
+ public PlanNode visitSchemaQueryMerge(SchemaQueryMergeNode node, NodeGroupContext context) {
return internalVisitSchemaMerge(node, context);
}
@@ -372,7 +404,7 @@ public class DistributionPlanner {
}
@Override
- public PlanNode visitSchemaScan(SchemaScanNode node, NodeGroupContext context) {
+ public PlanNode visitSchemaQueryScan(SchemaQueryScanNode node, NodeGroupContext context) {
NodeDistribution nodeDistribution = new NodeDistribution(NodeDistributionType.NO_CHILD);
nodeDistribution.region = node.getRegionReplicaSet();
context.putNodeDistribution(node.getPlanNodeId(), nodeDistribution);
@@ -380,8 +412,16 @@ public class DistributionPlanner {
}
@Override
- public PlanNode visitSchemaFetch(SchemaFetchNode node, NodeGroupContext context) {
- return visitSchemaScan(node, context);
+ public PlanNode visitSchemaFetchMerge(SchemaFetchMergeNode node, NodeGroupContext context) {
+ return internalVisitSchemaMerge(node, context);
+ }
+
+ @Override
+ public PlanNode visitSchemaFetchScan(SchemaFetchScanNode node, NodeGroupContext context) {
+ NodeDistribution nodeDistribution = new NodeDistribution(NodeDistributionType.NO_CHILD);
+ nodeDistribution.region = node.getRegionReplicaSet();
+ context.putNodeDistribution(node.getPlanNodeId(), nodeDistribution);
+ return node;
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
index a86dfb6363..fbcdf7deaf 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
@@ -48,8 +48,9 @@ import org.apache.iotdb.db.mpp.execution.operator.schema.CountMergeOperator;
import org.apache.iotdb.db.mpp.execution.operator.schema.DevicesCountOperator;
import org.apache.iotdb.db.mpp.execution.operator.schema.DevicesSchemaScanOperator;
import org.apache.iotdb.db.mpp.execution.operator.schema.LevelTimeSeriesCountOperator;
-import org.apache.iotdb.db.mpp.execution.operator.schema.SchemaFetchOperator;
-import org.apache.iotdb.db.mpp.execution.operator.schema.SchemaMergeOperator;
+import org.apache.iotdb.db.mpp.execution.operator.schema.SchemaFetchMergeOperator;
+import org.apache.iotdb.db.mpp.execution.operator.schema.SchemaFetchScanOperator;
+import org.apache.iotdb.db.mpp.execution.operator.schema.SchemaQueryMergeOperator;
import org.apache.iotdb.db.mpp.execution.operator.schema.TimeSeriesCountOperator;
import org.apache.iotdb.db.mpp.execution.operator.schema.TimeSeriesSchemaScanOperator;
import org.apache.iotdb.db.mpp.execution.operator.source.AlignedSeriesScanOperator;
@@ -64,9 +65,10 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.CountSchemaM
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.LevelTimeSeriesCountNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaScanNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchScanNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.AggregationNode;
@@ -216,7 +218,8 @@ public class LocalExecutionPlanner {
}
@Override
- public Operator visitSchemaScan(SchemaScanNode node, LocalExecutionPlanContext context) {
+ public Operator visitSchemaQueryScan(
+ SchemaQueryScanNode node, LocalExecutionPlanContext context) {
if (node instanceof TimeSeriesSchemaScanNode) {
return visitTimeSeriesSchemaScan((TimeSeriesSchemaScanNode) node, context);
} else if (node instanceof DevicesSchemaScanNode) {
@@ -271,8 +274,8 @@ public class LocalExecutionPlanner {
}
@Override
- public Operator visitSchemaMerge(
- SeriesSchemaMergeNode node, LocalExecutionPlanContext context) {
+ public Operator visitSchemaQueryMerge(
+ SchemaQueryMergeNode node, LocalExecutionPlanContext context) {
List<Operator> children =
node.getChildren().stream()
.map(n -> n.accept(this, context))
@@ -281,8 +284,8 @@ public class LocalExecutionPlanner {
context.instanceContext.addOperatorContext(
context.getNextOperatorId(),
node.getPlanNodeId(),
- SchemaMergeOperator.class.getSimpleName());
- return new SchemaMergeOperator(node.getPlanNodeId(), operatorContext, children);
+ SchemaQueryMergeOperator.class.getSimpleName());
+ return new SchemaQueryMergeOperator(node.getPlanNodeId(), operatorContext, children);
}
@Override
@@ -558,13 +561,29 @@ public class LocalExecutionPlanner {
}
@Override
- public Operator visitSchemaFetch(SchemaFetchNode node, LocalExecutionPlanContext context) {
+ public Operator visitSchemaFetchMerge(
+ SchemaFetchMergeNode node, LocalExecutionPlanContext context) {
+ List<Operator> children =
+ node.getChildren().stream()
+ .map(n -> n.accept(this, context))
+ .collect(Collectors.toList());
+ OperatorContext operatorContext =
+ context.instanceContext.addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ SchemaFetchMergeOperator.class.getSimpleName());
+ return new SchemaFetchMergeOperator(node.getPlanNodeId(), operatorContext, children);
+ }
+
+ @Override
+ public Operator visitSchemaFetchScan(
+ SchemaFetchScanNode node, LocalExecutionPlanContext context) {
OperatorContext operatorContext =
context.instanceContext.addOperatorContext(
context.getNextOperatorId(),
node.getPlanNodeId(),
- SchemaFetchOperator.class.getSimpleName());
- return new SchemaFetchOperator(
+ SchemaFetchScanOperator.class.getSimpleName());
+ return new SchemaFetchScanOperator(
node.getPlanNodeId(),
operatorContext,
node.getPatternTree(),
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanBuilder.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanBuilder.java
index f37070d2c2..dba6c1fbe9 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanBuilder.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanBuilder.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.mpp.plan.planner;
+import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.metadata.path.MeasurementPath;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
@@ -28,8 +29,9 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.CountSchemaM
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.LevelTimeSeriesCountNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchScanNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.DeviceViewNode;
@@ -151,7 +153,7 @@ public class LogicalPlanBuilder {
}
/** Meta Query* */
- public LogicalPlanBuilder planTimeSeriesMetaSource(
+ public LogicalPlanBuilder planTimeSeriesSchemaSource(
PartialPath pathPattern,
String key,
String value,
@@ -177,23 +179,40 @@ public class LogicalPlanBuilder {
public LogicalPlanBuilder planDeviceSchemaSource(
PartialPath pathPattern, int limit, int offset, boolean prefixPath, boolean hasSgCol) {
- DevicesSchemaScanNode devicesSchemaScanNode =
+ this.root =
new DevicesSchemaScanNode(
context.getQueryId().genPlanNodeId(), pathPattern, limit, offset, prefixPath, hasSgCol);
- this.root = devicesSchemaScanNode;
return this;
}
- public LogicalPlanBuilder planSchemaMerge(boolean orderByHeat) {
- SeriesSchemaMergeNode schemaMergeNode =
- new SeriesSchemaMergeNode(context.getQueryId().genPlanNodeId(), orderByHeat);
+ public LogicalPlanBuilder planSchemaQueryMerge(boolean orderByHeat) {
+ SchemaQueryMergeNode schemaMergeNode =
+ new SchemaQueryMergeNode(context.getQueryId().genPlanNodeId(), orderByHeat);
schemaMergeNode.addChild(this.getRoot());
this.root = schemaMergeNode;
return this;
}
- public LogicalPlanBuilder planSchemaFetchSource(PathPatternTree patternTree) {
- this.root = new SchemaFetchNode(context.getQueryId().genPlanNodeId(), patternTree);
+ public LogicalPlanBuilder planSchemaFetchMerge() {
+ this.root = new SchemaFetchMergeNode(context.getQueryId().genPlanNodeId());
+ return this;
+ }
+
+ public LogicalPlanBuilder planSchemaFetchSource(
+ List<String> storageGroupList, PathPatternTree patternTree) {
+ PartialPath storageGroupPath;
+ for (String storageGroup : storageGroupList) {
+ try {
+ storageGroupPath = new PartialPath(storageGroup);
+ this.root.addChild(
+ new SchemaFetchScanNode(
+ context.getQueryId().genPlanNodeId(),
+ storageGroupPath,
+ patternTree.extractInvolvedPartByPrefix(storageGroupPath)));
+ } catch (IllegalPathException e) {
+ throw new RuntimeException(e);
+ }
+ }
return this;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
index 9d7561cdc0..6a7041325e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java
@@ -230,7 +230,7 @@ public class LogicalPlanner {
ShowTimeSeriesStatement showTimeSeriesStatement, MPPQueryContext context) {
LogicalPlanBuilder planBuilder = new LogicalPlanBuilder(context);
return planBuilder
- .planTimeSeriesMetaSource(
+ .planTimeSeriesSchemaSource(
showTimeSeriesStatement.getPathPattern(),
showTimeSeriesStatement.getKey(),
showTimeSeriesStatement.getValue(),
@@ -239,7 +239,7 @@ public class LogicalPlanner {
showTimeSeriesStatement.isOrderByHeat(),
showTimeSeriesStatement.isContains(),
showTimeSeriesStatement.isPrefixPath())
- .planSchemaMerge(showTimeSeriesStatement.isOrderByHeat())
+ .planSchemaQueryMerge(showTimeSeriesStatement.isOrderByHeat())
.planOffset(showTimeSeriesStatement.getOffset())
.planLimit(showTimeSeriesStatement.getLimit())
.getRoot();
@@ -256,7 +256,7 @@ public class LogicalPlanner {
showDevicesStatement.getOffset(),
showDevicesStatement.isPrefixPath(),
showDevicesStatement.hasSgCol())
- .planSchemaMerge(false)
+ .planSchemaQueryMerge(false)
.planOffset(showDevicesStatement.getOffset())
.planLimit(showDevicesStatement.getLimit())
.getRoot();
@@ -380,8 +380,11 @@ public class LogicalPlanner {
SchemaFetchStatement schemaFetchStatement, MPPQueryContext context) {
LogicalPlanBuilder planBuilder = new LogicalPlanBuilder(context);
return planBuilder
- .planSchemaFetchSource(schemaFetchStatement.getPatternTree())
- .planSchemaMerge(false)
+ .planSchemaFetchMerge()
+ .planSchemaFetchSource(
+ new ArrayList<>(
+ schemaFetchStatement.getSchemaPartition().getSchemaPartitionMap().keySet()),
+ schemaFetchStatement.getPatternTree())
.getRoot();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNodeType.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNodeType.java
index 2a97d3b1eb..4d3df73e2f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNodeType.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanNodeType.java
@@ -23,8 +23,9 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.CountSchemaM
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.LevelTimeSeriesCountNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchScanNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.AlterTimeSeriesNode;
@@ -83,8 +84,8 @@ public enum PlanNodeType {
ALTER_TIME_SERIES((short) 21),
CREATE_ALIGNED_TIME_SERIES((short) 22),
TIME_SERIES_SCHEMA_SCAN((short) 23),
- SCHEMA_FETCH((short) 24),
- SCHEMA_MERGE((short) 25),
+ SCHEMA_FETCH_SCAN((short) 24),
+ SCHEMA_QUERY_MERGE((short) 25),
STORAGE_GROUP_SCHEMA_SCAN((short) 26),
DEVICES_COUNT((short) 27),
TIME_SERIES_COUNT((short) 28),
@@ -94,7 +95,8 @@ public enum PlanNodeType {
PROJECT((short) 32),
ALIGNED_SERIES_SCAN((short) 33),
ALIGNED_SERIES_AGGREGATE_SCAN((short) 34),
- DEVICE_MERGE((short) 35);
+ DEVICE_MERGE((short) 35),
+ SCHEMA_FETCH_MERGE((short) 36);
private final short nodeType;
@@ -171,9 +173,9 @@ public enum PlanNodeType {
case 23:
return TimeSeriesSchemaScanNode.deserialize(buffer);
case 24:
- return SchemaFetchNode.deserialize(buffer);
+ return SchemaFetchScanNode.deserialize(buffer);
case 25:
- return SeriesSchemaMergeNode.deserialize(buffer);
+ return SchemaQueryMergeNode.deserialize(buffer);
case 27:
return DevicesCountNode.deserialize(buffer);
case 28:
@@ -190,6 +192,8 @@ public enum PlanNodeType {
return AlignedSeriesScanNode.deserialize(buffer);
case 34:
return AlignedSeriesAggregationScanNode.deserialize(buffer);
+ case 36:
+ return SchemaFetchMergeNode.deserialize(buffer);
default:
throw new IllegalArgumentException("Invalid node type: " + nodeType);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanVisitor.java
index f552364132..09b7353065 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/PlanVisitor.java
@@ -22,9 +22,10 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.CountSchemaM
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.LevelTimeSeriesCountNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaScanNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchScanNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesCountNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.AlterTimeSeriesNode;
@@ -130,11 +131,11 @@ public abstract class PlanVisitor<R, C> {
return visitPlan(node, context);
}
- public R visitSchemaMerge(SeriesSchemaMergeNode node, C context) {
+ public R visitSchemaQueryMerge(SchemaQueryMergeNode node, C context) {
return visitPlan(node, context);
- };
+ }
- public R visitSchemaScan(SchemaScanNode node, C context) {
+ public R visitSchemaQueryScan(SchemaQueryScanNode node, C context) {
return visitPlan(node, context);
}
@@ -170,7 +171,11 @@ public abstract class PlanVisitor<R, C> {
return visitPlan(node, context);
}
- public R visitSchemaFetch(SchemaFetchNode node, C context) {
+ public R visitSchemaFetchMerge(SchemaFetchMergeNode node, C context) {
+ return visitPlan(node, context);
+ }
+
+ public R visitSchemaFetchScan(SchemaFetchScanNode node, C context) {
return visitPlan(node, context);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesCountNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesCountNode.java
index a5f6868ba1..93cbba8e93 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesCountNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesCountNode.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.nio.ByteBuffer;
import java.util.List;
-public class DevicesCountNode extends SchemaScanNode {
+public class DevicesCountNode extends SchemaQueryScanNode {
public DevicesCountNode(PlanNodeId id, PartialPath partialPath, boolean isPrefixPath) {
super(id, partialPath, isPrefixPath);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesSchemaScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesSchemaScanNode.java
index 41933e4826..175d142997 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesSchemaScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/DevicesSchemaScanNode.java
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Objects;
-public class DevicesSchemaScanNode extends SchemaScanNode {
+public class DevicesSchemaScanNode extends SchemaQueryScanNode {
private final boolean hasSgCol;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java
index 9f17579f5f..2854f0754f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/LevelTimeSeriesCountNode.java
@@ -31,7 +31,7 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Objects;
-public class LevelTimeSeriesCountNode extends SchemaScanNode {
+public class LevelTimeSeriesCountNode extends SchemaQueryScanNode {
private final int level;
public LevelTimeSeriesCountNode(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
similarity index 56%
copy from server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchNode.java
copy to server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
index a43058adc4..1a054217c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchMergeNode.java
@@ -19,60 +19,37 @@
package org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read;
-import org.apache.iotdb.db.mpp.common.schematree.PathPatternTree;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor;
-import com.google.common.collect.ImmutableList;
-
import java.nio.ByteBuffer;
-import java.util.List;
-
-public class SchemaFetchNode extends SchemaScanNode {
- private final PathPatternTree patternTree;
+/** This class defines the scanned result merge task of schema fetcher. */
+public class SchemaFetchMergeNode extends AbstractSchemaMergeNode {
- public SchemaFetchNode(PlanNodeId id, PathPatternTree patternTree) {
+ public SchemaFetchMergeNode(PlanNodeId id) {
super(id);
- this.patternTree = patternTree;
- }
-
- public PathPatternTree getPatternTree() {
- return patternTree;
}
@Override
public PlanNode clone() {
- return new SchemaFetchNode(getPlanNodeId(), patternTree);
- }
-
- @Override
- public List<String> getOutputColumnNames() {
- return ImmutableList.of();
+ return new SchemaFetchMergeNode(getPlanNodeId());
}
@Override
protected void serializeAttributes(ByteBuffer byteBuffer) {
- PlanNodeType.SCHEMA_FETCH.serialize(byteBuffer);
- patternTree.serialize(byteBuffer);
+ PlanNodeType.SCHEMA_FETCH_MERGE.serialize(byteBuffer);
}
- public static SchemaFetchNode deserialize(ByteBuffer byteBuffer) {
- PathPatternTree patternTree = PathPatternTree.deserialize(byteBuffer);
- PlanNodeId id = PlanNodeId.deserialize(byteBuffer);
- return new SchemaFetchNode(id, patternTree);
+ public static PlanNode deserialize(ByteBuffer byteBuffer) {
+ PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer);
+ return new SchemaFetchMergeNode(planNodeId);
}
- @Override
- public void open() throws Exception {}
-
- @Override
- public void close() throws Exception {}
-
@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
- return visitor.visitSchemaFetch(this, context);
+ return visitor.visitSchemaFetchMerge(this, context);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java
similarity index 54%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchNode.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java
index a43058adc4..3a360954dd 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaFetchScanNode.java
@@ -19,33 +19,60 @@
package org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read;
+import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.db.metadata.path.PathDeserializeUtil;
import org.apache.iotdb.db.mpp.common.schematree.PathPatternTree;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.source.SourceNode;
import com.google.common.collect.ImmutableList;
import java.nio.ByteBuffer;
+import java.util.Collections;
import java.util.List;
-public class SchemaFetchNode extends SchemaScanNode {
+/** This class defines the scan task of schema fetcher. */
+public class SchemaFetchScanNode extends SourceNode {
+ private final PartialPath storageGroup;
private final PathPatternTree patternTree;
- public SchemaFetchNode(PlanNodeId id, PathPatternTree patternTree) {
+ private TRegionReplicaSet schemaRegionReplicaSet;
+
+ public SchemaFetchScanNode(PlanNodeId id, PartialPath storageGroup, PathPatternTree patternTree) {
super(id);
+ this.storageGroup = storageGroup;
this.patternTree = patternTree;
}
+ public PartialPath getStorageGroup() {
+ return storageGroup;
+ }
+
public PathPatternTree getPatternTree() {
return patternTree;
}
+ @Override
+ public List<PlanNode> getChildren() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void addChild(PlanNode child) {}
+
@Override
public PlanNode clone() {
- return new SchemaFetchNode(getPlanNodeId(), patternTree);
+ return new SchemaFetchScanNode(getPlanNodeId(), storageGroup, patternTree);
+ }
+
+ @Override
+ public int allowedChildCount() {
+ return 0;
}
@Override
@@ -55,24 +82,36 @@ public class SchemaFetchNode extends SchemaScanNode {
@Override
protected void serializeAttributes(ByteBuffer byteBuffer) {
- PlanNodeType.SCHEMA_FETCH.serialize(byteBuffer);
+ PlanNodeType.SCHEMA_FETCH_SCAN.serialize(byteBuffer);
+ storageGroup.serialize(byteBuffer);
patternTree.serialize(byteBuffer);
}
- public static SchemaFetchNode deserialize(ByteBuffer byteBuffer) {
+ public static SchemaFetchScanNode deserialize(ByteBuffer byteBuffer) {
+ PartialPath storageGroup = (PartialPath) PathDeserializeUtil.deserialize(byteBuffer);
PathPatternTree patternTree = PathPatternTree.deserialize(byteBuffer);
- PlanNodeId id = PlanNodeId.deserialize(byteBuffer);
- return new SchemaFetchNode(id, patternTree);
+ PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer);
+ return new SchemaFetchScanNode(planNodeId, storageGroup, patternTree);
}
@Override
public void open() throws Exception {}
+ @Override
+ public TRegionReplicaSet getRegionReplicaSet() {
+ return schemaRegionReplicaSet;
+ }
+
+ @Override
+ public void setRegionReplicaSet(TRegionReplicaSet schemaRegionReplicaSet) {
+ this.schemaRegionReplicaSet = schemaRegionReplicaSet;
+ }
+
@Override
public void close() throws Exception {}
@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
- return visitor.visitSchemaFetch(this, context);
+ return visitor.visitSchemaFetchScan(this, context);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SeriesSchemaMergeNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
similarity index 76%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SeriesSchemaMergeNode.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
index a7c4f4052e..51b8f6d280 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SeriesSchemaMergeNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryMergeNode.java
@@ -25,36 +25,36 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor;
import java.nio.ByteBuffer;
-public class SeriesSchemaMergeNode extends AbstractSchemaMergeNode {
+public class SchemaQueryMergeNode extends AbstractSchemaMergeNode {
private boolean orderByHeat;
- public SeriesSchemaMergeNode(PlanNodeId id) {
+ public SchemaQueryMergeNode(PlanNodeId id) {
super(id);
}
- public SeriesSchemaMergeNode(PlanNodeId id, boolean orderByHeat) {
+ public SchemaQueryMergeNode(PlanNodeId id, boolean orderByHeat) {
this(id);
this.orderByHeat = orderByHeat;
}
@Override
public PlanNode clone() {
- return new SeriesSchemaMergeNode(getPlanNodeId(), this.orderByHeat);
+ return new SchemaQueryMergeNode(getPlanNodeId(), this.orderByHeat);
}
@Override
protected void serializeAttributes(ByteBuffer byteBuffer) {
- PlanNodeType.SCHEMA_MERGE.serialize(byteBuffer);
+ PlanNodeType.SCHEMA_QUERY_MERGE.serialize(byteBuffer);
}
- public static SeriesSchemaMergeNode deserialize(ByteBuffer byteBuffer) {
+ public static SchemaQueryMergeNode deserialize(ByteBuffer byteBuffer) {
PlanNodeId id = PlanNodeId.deserialize(byteBuffer);
- return new SeriesSchemaMergeNode(id);
+ return new SchemaQueryMergeNode(id);
}
@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
- return visitor.visitSchemaMerge(this, context);
+ return visitor.visitSchemaQueryMerge(this, context);
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryScanNode.java
similarity index 91%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaScanNode.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryScanNode.java
index 0a2961f8db..626b53a661 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/SchemaQueryScanNode.java
@@ -29,7 +29,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-public abstract class SchemaScanNode extends SourceNode {
+public abstract class SchemaQueryScanNode extends SourceNode {
protected int limit;
protected int offset;
protected PartialPath path;
@@ -38,11 +38,11 @@ public abstract class SchemaScanNode extends SourceNode {
private TRegionReplicaSet schemaRegionReplicaSet;
- protected SchemaScanNode(PlanNodeId id) {
+ protected SchemaQueryScanNode(PlanNodeId id) {
this(id, null, false);
}
- protected SchemaScanNode(
+ protected SchemaQueryScanNode(
PlanNodeId id, PartialPath partialPath, int limit, int offset, boolean isPrefixPath) {
super(id);
this.path = partialPath;
@@ -51,7 +51,7 @@ public abstract class SchemaScanNode extends SourceNode {
this.isPrefixPath = isPrefixPath;
}
- protected SchemaScanNode(PlanNodeId id, PartialPath partialPath, boolean isPrefixPath) {
+ protected SchemaQueryScanNode(PlanNodeId id, PartialPath partialPath, boolean isPrefixPath) {
this(id, partialPath, 0, 0, isPrefixPath);
}
@@ -127,7 +127,7 @@ public abstract class SchemaScanNode extends SourceNode {
@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
- return visitor.visitSchemaScan(this, context);
+ return visitor.visitSchemaQueryScan(this, context);
}
@Override
@@ -141,7 +141,7 @@ public abstract class SchemaScanNode extends SourceNode {
if (!super.equals(o)) {
return false;
}
- SchemaScanNode that = (SchemaScanNode) o;
+ SchemaQueryScanNode that = (SchemaQueryScanNode) o;
return limit == that.limit
&& offset == that.offset
&& isPrefixPath == that.isPrefixPath
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java
index e67ed6ceff..dfe9146834 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesCountNode.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.nio.ByteBuffer;
import java.util.List;
-public class TimeSeriesCountNode extends SchemaScanNode {
+public class TimeSeriesCountNode extends SchemaQueryScanNode {
public TimeSeriesCountNode(PlanNodeId id, PartialPath partialPath, boolean isPrefixPath) {
super(id, partialPath, isPrefixPath);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java
index 050bc9619d..567b86c630 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/read/TimeSeriesSchemaScanNode.java
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Objects;
-public class TimeSeriesSchemaScanNode extends SchemaScanNode {
+public class TimeSeriesSchemaScanNode extends SchemaQueryScanNode {
private final String key;
private final String value;
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchScanOperatorTest.java
similarity index 94%
rename from server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchOperatorTest.java
rename to server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchScanOperatorTest.java
index 955417c263..4b204bdd70 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchOperatorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaFetchScanOperatorTest.java
@@ -49,7 +49,7 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-public class SchemaFetchOperatorTest {
+public class SchemaFetchScanOperatorTest {
@Before
public void setUp() {
@@ -70,14 +70,14 @@ public class SchemaFetchOperatorTest {
patternTree.appendPath(new PartialPath("root.**.s1"));
patternTree.constructTree();
- SchemaFetchOperator schemaFetchOperator =
- new SchemaFetchOperator(null, null, patternTree, schemaRegion);
+ SchemaFetchScanOperator schemaFetchScanOperator =
+ new SchemaFetchScanOperator(null, null, patternTree, schemaRegion);
- Assert.assertTrue(schemaFetchOperator.hasNext());
+ Assert.assertTrue(schemaFetchScanOperator.hasNext());
- TsBlock tsBlock = schemaFetchOperator.next();
+ TsBlock tsBlock = schemaFetchScanOperator.next();
- Assert.assertFalse(schemaFetchOperator.hasNext());
+ Assert.assertFalse(schemaFetchScanOperator.hasNext());
Binary binary = tsBlock.getColumn(0).getBinary(0);
SchemaTree schemaTree = SchemaTree.deserialize(ByteBuffer.wrap(binary.getValues()));
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaScanOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryScanOperatorTest.java
similarity index 98%
rename from server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaScanOperatorTest.java
rename to server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryScanOperatorTest.java
index a738c605ae..64b240efa1 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaScanOperatorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/schema/SchemaQueryScanOperatorTest.java
@@ -70,7 +70,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class SchemaScanOperatorTest {
+public class SchemaQueryScanOperatorTest {
private static final String META_SCAN_OPERATOR_TEST_SG = "root.MetaScanOperatorTest";
private final List<String> deviceIds = new ArrayList<>();
private final List<MeasurementSchema> measurementSchemas = new ArrayList<>();
@@ -104,7 +104,7 @@ public class SchemaScanOperatorTest {
PlanNodeId planNodeId = queryId.genPlanNodeId();
OperatorContext operatorContext =
fragmentInstanceContext.addOperatorContext(
- 1, planNodeId, SchemaScanOperator.class.getSimpleName());
+ 1, planNodeId, SchemaQueryScanOperator.class.getSimpleName());
PartialPath partialPath = new PartialPath(META_SCAN_OPERATOR_TEST_SG + ".device0");
ISchemaRegion schemaRegion =
SchemaEngine.getInstance()
@@ -173,7 +173,7 @@ public class SchemaScanOperatorTest {
PlanNodeId planNodeId = queryId.genPlanNodeId();
OperatorContext operatorContext =
fragmentInstanceContext.addOperatorContext(
- 1, planNodeId, SchemaScanOperator.class.getSimpleName());
+ 1, planNodeId, SchemaQueryScanOperator.class.getSimpleName());
PartialPath partialPath = new PartialPath(META_SCAN_OPERATOR_TEST_SG + ".device0.*");
ISchemaRegion schemaRegion =
SchemaEngine.getInstance()
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/DistributionPlannerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/DistributionPlannerTest.java
index 4ae34eb1b9..83ec2ff10b 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/DistributionPlannerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/DistributionPlannerTest.java
@@ -43,7 +43,7 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.LogicalQueryPlan;
import org.apache.iotdb.db.mpp.plan.planner.plan.SubPlan;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeUtil;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.ExchangeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.LimitNode;
@@ -147,7 +147,7 @@ public class DistributionPlannerTest {
@Test
public void testRewriteMetaSourceNode() throws IllegalPathException {
QueryId queryId = new QueryId("test_query");
- SeriesSchemaMergeNode metaMergeNode = new SeriesSchemaMergeNode(queryId.genPlanNodeId(), false);
+ SchemaQueryMergeNode metaMergeNode = new SchemaQueryMergeNode(queryId.genPlanNodeId(), false);
metaMergeNode.addChild(
new TimeSeriesSchemaScanNode(
queryId.genPlanNodeId(),
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java
index 716b7db728..16cee709a4 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/LogicalPlannerTest.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.db.mpp.plan.planner.LogicalPlanner;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesSchemaScanNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.AlterTimeSeriesNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write.CreateAlignedTimeSeriesNode;
@@ -381,7 +381,7 @@ public class LogicalPlannerTest {
try {
LimitNode limitNode = (LimitNode) parseSQLToPlanNode(sql);
OffsetNode offsetNode = (OffsetNode) limitNode.getChild();
- SeriesSchemaMergeNode metaMergeNode = (SeriesSchemaMergeNode) offsetNode.getChild();
+ SchemaQueryMergeNode metaMergeNode = (SchemaQueryMergeNode) offsetNode.getChild();
metaMergeNode.getChildren().forEach(n -> System.out.println(n.toString()));
TimeSeriesSchemaScanNode showTimeSeriesNode =
(TimeSeriesSchemaScanNode) metaMergeNode.getChildren().get(0);
@@ -426,7 +426,7 @@ public class LogicalPlannerTest {
try {
LimitNode limitNode = (LimitNode) parseSQLToPlanNode(sql);
OffsetNode offsetNode = (OffsetNode) limitNode.getChild();
- SeriesSchemaMergeNode metaMergeNode = (SeriesSchemaMergeNode) offsetNode.getChild();
+ SchemaQueryMergeNode metaMergeNode = (SchemaQueryMergeNode) offsetNode.getChild();
DevicesSchemaScanNode showDevicesNode =
(DevicesSchemaScanNode) metaMergeNode.getChildren().get(0);
Assert.assertNotNull(showDevicesNode);
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java
index f95374abc9..5a98d40f16 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.plan.plan.node.PlanNodeDeserializeHelper;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.DevicesSchemaScanNode;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.ExchangeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.LimitNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.OffsetNode;
@@ -43,8 +43,7 @@ public class DeviceSchemaScanNodeSerdeTest {
public void testSerializeAndDeserialize() throws IllegalPathException {
OffsetNode offsetNode = new OffsetNode(new PlanNodeId("offset"), 10);
LimitNode limitNode = new LimitNode(new PlanNodeId("limit"), 10);
- SeriesSchemaMergeNode schemaMergeNode =
- new SeriesSchemaMergeNode(new PlanNodeId("schemaMerge"));
+ SchemaQueryMergeNode schemaMergeNode = new SchemaQueryMergeNode(new PlanNodeId("schemaMerge"));
ExchangeNode exchangeNode = new ExchangeNode(new PlanNodeId("exchange"));
DevicesSchemaScanNode devicesSchemaScanNode =
new DevicesSchemaScanNode(
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/SchemaFetchScanNodeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/SchemaFetchScanNodeTest.java
new file mode 100644
index 0000000000..0caefd0ad2
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/SchemaFetchScanNodeTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.mpp.plan.plan.node.metadata.read;
+
+import org.apache.iotdb.commons.exception.IllegalPathException;
+import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.db.mpp.common.schematree.PathPatternTree;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaFetchScanNode;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+
+public class SchemaFetchScanNodeTest {
+
+ @Test
+ public void testSerialization() throws IllegalPathException {
+ SchemaFetchScanNode schemaFetchScanNode =
+ new SchemaFetchScanNode(
+ new PlanNodeId("0"),
+ new PartialPath("root.sg"),
+ new PathPatternTree(new PartialPath("root.sg.**.*")));
+ ByteBuffer byteBuffer = ByteBuffer.allocate(1024 * 1024);
+ schemaFetchScanNode.serialize(byteBuffer);
+ byteBuffer.flip();
+ SchemaFetchScanNode recoveredNode = (SchemaFetchScanNode) PlanNodeType.deserialize(byteBuffer);
+ Assert.assertEquals("root.sg", recoveredNode.getStorageGroup().getFullPath());
+ Assert.assertEquals(
+ "root.sg.**.*", recoveredNode.getPatternTree().splitToPathList().get(0).getFullPath());
+ }
+}
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java
index d752948664..d4898d7200 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.plan.plan.node.PlanNodeDeserializeHelper;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SeriesSchemaMergeNode;
+import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.read.TimeSeriesSchemaScanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.ExchangeNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.process.LimitNode;
@@ -43,8 +43,7 @@ public class TimeSeriesSchemaScanNodeSerdeTest {
public void testSerializeAndDeserialize() throws IllegalPathException {
OffsetNode offsetNode = new OffsetNode(new PlanNodeId("offset"), 10);
LimitNode limitNode = new LimitNode(new PlanNodeId("limit"), 10);
- SeriesSchemaMergeNode schemaMergeNode =
- new SeriesSchemaMergeNode(new PlanNodeId("schemaMerge"));
+ SchemaQueryMergeNode schemaMergeNode = new SchemaQueryMergeNode(new PlanNodeId("schemaMerge"));
ExchangeNode exchangeNode = new ExchangeNode(new PlanNodeId("exchange"));
TimeSeriesSchemaScanNode timeSeriesSchemaScanNode =
new TimeSeriesSchemaScanNode(