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/03/14 06:04:26 UTC
[iotdb] branch xingtanzjr/mpp-query-basis updated: move code to server/query/mpp
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/mpp-query-basis
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/xingtanzjr/mpp-query-basis by this push:
new 3dcd1e8f move code to server/query/mpp
3dcd1e8f is described below
commit 3dcd1e8fb2cacc231c51b373c884ecc785473bf3
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Mon Mar 14 14:03:09 2022 +0800
move code to server/query/mpp
---
.../iotdb/cluster/query/distribution/common/FillPolicy.java | 5 -----
.../query/distribution/plan/process/ProcessNode.java | 11 -----------
.../org/apache/iotdb/db/query/mpp/common/FillPolicy.java | 5 +++++
.../iotdb/db/query/mpp}/common/GroupByTimeParameter.java | 2 +-
.../java/org/apache/iotdb/db/query/mpp}/common/OrderBy.java | 2 +-
.../org/apache/iotdb/db/query/mpp}/common/TreeNode.java | 2 +-
.../java/org/apache/iotdb/db/query/mpp}/common/TsBlock.java | 2 +-
.../apache/iotdb/db/query/mpp}/common/TsBlockMetadata.java | 2 +-
.../apache/iotdb/db/query/mpp}/common/WithoutPolicy.java | 2 +-
.../java/org/apache/iotdb/db/query/mpp}/plan/PlanNode.java | 5 +++--
.../org/apache/iotdb/db/query/mpp}/plan/PlanNodeId.java | 2 +-
.../iotdb/db/query/mpp}/plan/process/DeviceMergeNode.java | 13 ++++++-------
.../apache/iotdb/db/query/mpp}/plan/process/FillNode.java | 8 +++-----
.../apache/iotdb/db/query/mpp}/plan/process/FilterNode.java | 4 ++--
.../iotdb/db/query/mpp}/plan/process/GroupByLevelNode.java | 4 ++--
.../apache/iotdb/db/query/mpp}/plan/process/LimitNode.java | 4 ++--
.../apache/iotdb/db/query/mpp}/plan/process/OffsetNode.java | 4 ++--
.../apache/iotdb/db/query/mpp/plan/process/ProcessNode.java | 11 +++++++++++
.../mpp}/plan/process/RowBasedSeriesAggregateNode.java | 6 +++---
.../apache/iotdb/db/query/mpp}/plan/process/SortNode.java | 6 +++---
.../iotdb/db/query/mpp}/plan/process/TimeJoinNode.java | 12 ++++++------
.../iotdb/db/query/mpp}/plan/process/WithoutNode.java | 6 +++---
.../apache/iotdb/db/query/mpp}/plan/sink/CsvSinkNode.java | 4 ++--
.../iotdb/db/query/mpp}/plan/sink/FragmentSinkNode.java | 5 ++---
.../org/apache/iotdb/db/query/mpp}/plan/sink/SinkNode.java | 8 ++++----
.../iotdb/db/query/mpp}/plan/sink/ThriftSinkNode.java | 4 ++--
.../iotdb/db/query/mpp}/plan/source/CsvSourceNode.java | 4 ++--
.../db/query/mpp}/plan/source/SeriesAggregateNode.java | 6 +++---
.../iotdb/db/query/mpp}/plan/source/SeriesScanNode.java | 6 +++---
.../apache/iotdb/db/query/mpp}/plan/source/SourceNode.java | 8 ++++----
30 files changed, 80 insertions(+), 83 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/FillPolicy.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/FillPolicy.java
deleted file mode 100644
index a81d6fe..0000000
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/FillPolicy.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.iotdb.cluster.query.distribution.common;
-
-public enum FillPolicy {
- PREVIOUS,
-}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/ProcessNode.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/ProcessNode.java
deleted file mode 100644
index d5165b0..0000000
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/ProcessNode.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
-
-import org.apache.iotdb.cluster.query.distribution.common.TsBlock;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNode;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
-
-public class ProcessNode extends PlanNode<TsBlock> {
- public ProcessNode(PlanNodeId id) {
- super(id);
- }
-}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/mpp/common/FillPolicy.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/FillPolicy.java
new file mode 100644
index 0000000..aa272cc
--- /dev/null
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/FillPolicy.java
@@ -0,0 +1,5 @@
+package org.apache.iotdb.db.query.mpp.common;
+
+public enum FillPolicy {
+ PREVIOUS,
+}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/GroupByTimeParameter.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/GroupByTimeParameter.java
similarity index 83%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/GroupByTimeParameter.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/common/GroupByTimeParameter.java
index 23ad3a9..59b255c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/GroupByTimeParameter.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/GroupByTimeParameter.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.cluster.query.distribution.common;
+package org.apache.iotdb.db.query.mpp.common;
import org.apache.iotdb.db.qp.physical.crud.GroupByTimePlan;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/OrderBy.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/OrderBy.java
similarity index 73%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/OrderBy.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/common/OrderBy.java
index 07f005f..22dbd03 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/OrderBy.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/OrderBy.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.cluster.query.distribution.common;
+package org.apache.iotdb.db.query.mpp.common;
/**
* The traversal order for operators by timestamp
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TreeNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/TreeNode.java
similarity index 88%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TreeNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/common/TreeNode.java
index a242660..ec6f664 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TreeNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/TreeNode.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.cluster.query.distribution.common;
+package org.apache.iotdb.db.query.mpp.common;
import java.util.List;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TsBlock.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlock.java
similarity index 93%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TsBlock.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlock.java
index 73fb008..cb8701f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TsBlock.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlock.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.cluster.query.distribution.common;
+package org.apache.iotdb.db.query.mpp.common;
import org.apache.iotdb.tsfile.read.common.RowRecord;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TsBlockMetadata.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlockMetadata.java
similarity index 93%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TsBlockMetadata.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlockMetadata.java
index cd95d82..21ee1c6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TsBlockMetadata.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlockMetadata.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.cluster.query.distribution.common;
+package org.apache.iotdb.db.query.mpp.common;
import java.util.List;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/WithoutPolicy.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/WithoutPolicy.java
similarity index 51%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/WithoutPolicy.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/common/WithoutPolicy.java
index 794be12..c89ac6f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/WithoutPolicy.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/common/WithoutPolicy.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.cluster.query.distribution.common;
+package org.apache.iotdb.db.query.mpp.common;
public enum WithoutPolicy {
CONTAINS_NULL,
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/PlanNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanNode.java
similarity index 74%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/PlanNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanNode.java
index d4b763d..07df26c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/PlanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanNode.java
@@ -1,6 +1,7 @@
-package org.apache.iotdb.cluster.query.distribution.plan;
+package org.apache.iotdb.db.query.mpp.plan;
-import org.apache.iotdb.cluster.query.distribution.common.TreeNode;
+
+import org.apache.iotdb.db.query.mpp.common.TreeNode;
/**
* @author xingtanzjr
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/PlanNodeId.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanNodeId.java
similarity index 94%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/PlanNodeId.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanNodeId.java
index b9d2888..b67344d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/PlanNodeId.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanNodeId.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.iotdb.cluster.query.distribution.plan;
+package org.apache.iotdb.db.query.mpp.plan;
public class PlanNodeId {
private String id;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/DeviceMergeNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/DeviceMergeNode.java
similarity index 78%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/DeviceMergeNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/DeviceMergeNode.java
index 9cd2549..c24d5e8 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/DeviceMergeNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/DeviceMergeNode.java
@@ -1,12 +1,11 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.common.TsBlock;
-import org.apache.iotdb.cluster.query.distribution.common.OrderBy;
-import org.apache.iotdb.cluster.query.distribution.common.WithoutPolicy;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNode;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.OrderBy;
+import org.apache.iotdb.db.query.mpp.common.TsBlock;
+import org.apache.iotdb.db.query.mpp.common.WithoutPolicy;
+import org.apache.iotdb.db.query.mpp.plan.PlanNode;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
-import java.util.List;
import java.util.Map;
/**
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/FillNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/FillNode.java
similarity index 54%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/FillNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/FillNode.java
index 430948d..9ce2ae0 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/FillNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/FillNode.java
@@ -1,9 +1,7 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.common.FillPolicy;
-import org.apache.iotdb.cluster.query.distribution.common.TsBlock;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNode;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.FillPolicy;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* FillNode is used to fill the empty field in one row.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/FilterNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/FilterNode.java
similarity index 76%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/FilterNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/FilterNode.java
index e7a4fce..12e10e3 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/FilterNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/FilterNode.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
import org.apache.iotdb.db.qp.logical.crud.FilterOperator;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* The FilterNode is responsible to filter the RowRecord from TsBlock.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/GroupByLevelNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/GroupByLevelNode.java
similarity index 88%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/GroupByLevelNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/GroupByLevelNode.java
index 54ff8eb..c5341a1 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/GroupByLevelNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/GroupByLevelNode.java
@@ -1,6 +1,6 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* This node is responsible for the final aggregation merge operation.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/LimitNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/LimitNode.java
similarity index 72%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/LimitNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/LimitNode.java
index 63d4370..ff8087b 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/LimitNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/LimitNode.java
@@ -1,6 +1,6 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* LimitNode is used to select top n result. It uses the default order of upstream nodes
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/OffsetNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/OffsetNode.java
similarity index 74%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/OffsetNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/OffsetNode.java
index 3ee19ab..134de78 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/OffsetNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/OffsetNode.java
@@ -1,6 +1,6 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* OffsetNode is used to skip top n result from upstream nodes. It uses the default order of upstream nodes
diff --git a/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/ProcessNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/ProcessNode.java
new file mode 100644
index 0000000..f7bb6ec
--- /dev/null
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/ProcessNode.java
@@ -0,0 +1,11 @@
+package org.apache.iotdb.db.query.mpp.plan.process;
+
+import org.apache.iotdb.db.query.mpp.common.TsBlock;
+import org.apache.iotdb.db.query.mpp.plan.PlanNode;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
+
+public class ProcessNode extends PlanNode<TsBlock> {
+ public ProcessNode(PlanNodeId id) {
+ super(id);
+ }
+}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/RowBasedSeriesAggregateNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/RowBasedSeriesAggregateNode.java
similarity index 87%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/RowBasedSeriesAggregateNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/RowBasedSeriesAggregateNode.java
index 5ed718e..83b9b7f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/RowBasedSeriesAggregateNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/RowBasedSeriesAggregateNode.java
@@ -1,8 +1,8 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.common.GroupByTimeParameter;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
import org.apache.iotdb.db.query.expression.unary.FunctionExpression;
+import org.apache.iotdb.db.query.mpp.common.GroupByTimeParameter;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
import java.util.List;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/SortNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/SortNode.java
similarity index 68%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/SortNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/SortNode.java
index 705a4c1..f144712 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/SortNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/SortNode.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.common.OrderBy;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.OrderBy;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* In general, the parameter in sortNode should be pushed down to the upstream operators.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/TimeJoinNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/TimeJoinNode.java
similarity index 76%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/TimeJoinNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/TimeJoinNode.java
index ffbeb29..cff9f16 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/TimeJoinNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/TimeJoinNode.java
@@ -1,10 +1,10 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.common.TsBlock;
-import org.apache.iotdb.cluster.query.distribution.common.OrderBy;
-import org.apache.iotdb.cluster.query.distribution.common.WithoutPolicy;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNode;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.OrderBy;
+import org.apache.iotdb.db.query.mpp.common.TsBlock;
+import org.apache.iotdb.db.query.mpp.common.WithoutPolicy;
+import org.apache.iotdb.db.query.mpp.plan.PlanNode;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
import java.util.Arrays;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/WithoutNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/WithoutNode.java
similarity index 67%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/WithoutNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/WithoutNode.java
index 6afc25b..7ae1a70 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/process/WithoutNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/process/WithoutNode.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.cluster.query.distribution.plan.process;
+package org.apache.iotdb.db.query.mpp.plan.process;
-import org.apache.iotdb.cluster.query.distribution.common.WithoutPolicy;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.WithoutPolicy;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* WithoutNode is used to discard specific rows from upstream node.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/CsvSinkNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/CsvSinkNode.java
similarity index 88%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/CsvSinkNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/CsvSinkNode.java
index 6bafca7..d46d9a0 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/CsvSinkNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/CsvSinkNode.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.cluster.query.distribution.plan.sink;
+package org.apache.iotdb.db.query.mpp.plan.sink;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
public class CsvSinkNode extends SinkNode {
public CsvSinkNode(PlanNodeId id) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/FragmentSinkNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/FragmentSinkNode.java
similarity index 64%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/FragmentSinkNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/FragmentSinkNode.java
index 348c00d..d35281d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/FragmentSinkNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/FragmentSinkNode.java
@@ -1,7 +1,6 @@
-package org.apache.iotdb.cluster.query.distribution.plan.sink;
+package org.apache.iotdb.db.query.mpp.plan.sink;
-
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
public class FragmentSinkNode extends SinkNode {
public FragmentSinkNode(PlanNodeId id) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/SinkNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/SinkNode.java
similarity index 79%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/SinkNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/SinkNode.java
index de8ab9a..6d757c7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/SinkNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/SinkNode.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.cluster.query.distribution.plan.sink;
+package org.apache.iotdb.db.query.mpp.plan.sink;
-import org.apache.iotdb.cluster.query.distribution.common.TsBlock;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNode;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.TsBlock;
+import org.apache.iotdb.db.query.mpp.plan.PlanNode;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
public abstract class SinkNode extends PlanNode<TsBlock> implements AutoCloseable {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/ThriftSinkNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/ThriftSinkNode.java
similarity index 89%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/ThriftSinkNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/ThriftSinkNode.java
index 17db1f0..6dd1afd 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/sink/ThriftSinkNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/sink/ThriftSinkNode.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.cluster.query.distribution.plan.sink;
+package org.apache.iotdb.db.query.mpp.plan.sink;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* not implemented in current IoTDB yet
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/CsvSourceNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/CsvSourceNode.java
similarity index 89%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/CsvSourceNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/CsvSourceNode.java
index 5ff967e..c2d77f2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/CsvSourceNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/CsvSourceNode.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.cluster.query.distribution.plan.source;
+package org.apache.iotdb.db.query.mpp.plan.source;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
/**
* Not implemented in current version.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SeriesAggregateNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SeriesAggregateNode.java
similarity index 91%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SeriesAggregateNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SeriesAggregateNode.java
index 0a7de03..a773e85 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SeriesAggregateNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SeriesAggregateNode.java
@@ -1,8 +1,8 @@
-package org.apache.iotdb.cluster.query.distribution.plan.source;
+package org.apache.iotdb.db.query.mpp.plan.source;
-import org.apache.iotdb.cluster.query.distribution.common.GroupByTimeParameter;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
import org.apache.iotdb.db.query.expression.unary.FunctionExpression;
+import org.apache.iotdb.db.query.mpp.common.GroupByTimeParameter;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
/**
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SeriesScanNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SeriesScanNode.java
similarity index 88%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SeriesScanNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SeriesScanNode.java
index 738a6ea..7bc4972 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SeriesScanNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SeriesScanNode.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.cluster.query.distribution.plan.source;
+package org.apache.iotdb.db.query.mpp.plan.source;
-import org.apache.iotdb.cluster.query.distribution.common.OrderBy;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.OrderBy;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SourceNode.java b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SourceNode.java
similarity index 79%
rename from cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SourceNode.java
rename to server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SourceNode.java
index b72d0f7..d207d26 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/plan/source/SourceNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/mpp/plan/source/SourceNode.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.cluster.query.distribution.plan.source;
+package org.apache.iotdb.db.query.mpp.plan.source;
-import org.apache.iotdb.cluster.query.distribution.common.TsBlock;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNode;
-import org.apache.iotdb.cluster.query.distribution.plan.PlanNodeId;
+import org.apache.iotdb.db.query.mpp.common.TsBlock;
+import org.apache.iotdb.db.query.mpp.plan.PlanNode;
+import org.apache.iotdb.db.query.mpp.plan.PlanNodeId;
public abstract class SourceNode extends PlanNode<TsBlock> implements AutoCloseable{