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 05:53:37 UTC
[iotdb] 05/11: move query distribution folder to cluster
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
commit 12d7af3b88d3e49fe2e2a4c3c872e330ae8f26c5
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Mon Mar 7 13:34:55 2022 +0800
move query distribution folder to cluster
---
.../iotdb/cluster/query/distribution/common/FillPolicy.java | 5 +++++
.../cluster}/query/distribution/common/GroupByTimeParameter.java | 2 +-
.../iotdb/cluster}/query/distribution/common/LevelBucketInfo.java | 2 +-
.../cluster}/query/distribution/common/SeriesBatchAggInfo.java | 2 +-
.../iotdb/cluster}/query/distribution/common/SeriesBatchData.java | 2 +-
.../apache/iotdb/cluster}/query/distribution/common/Tablet.java | 2 +-
.../iotdb/cluster}/query/distribution/common/TabletMetadata.java | 4 +---
.../iotdb/cluster}/query/distribution/common/TraversalOrder.java | 2 +-
.../apache/iotdb/cluster}/query/distribution/common/TreeNode.java | 2 +-
.../iotdb/cluster}/query/distribution/common/WithoutPolicy.java | 2 +-
.../cluster}/query/distribution/operator/DeviceMergeOperator.java | 6 +++---
.../iotdb/cluster}/query/distribution/operator/ExecOperator.java | 4 ++--
.../iotdb/cluster}/query/distribution/operator/FillOperator.java | 7 +++----
.../cluster}/query/distribution/operator/FilterExecOperator.java | 4 ++--
.../query/distribution/operator/GroupByLevelOperator.java | 8 ++++----
.../iotdb/cluster}/query/distribution/operator/LimitOperator.java | 4 ++--
.../cluster}/query/distribution/operator/OffsetOperator.java | 4 ++--
.../query/distribution/operator/SeriesAggregateOperator.java | 6 +++---
.../cluster}/query/distribution/operator/SeriesScanOperator.java | 6 +++---
.../iotdb/cluster}/query/distribution/operator/SortOperator.java | 8 ++++----
.../cluster}/query/distribution/operator/TimeJoinOperator.java | 8 ++++----
.../cluster}/query/distribution/operator/WithoutOperator.java | 6 +++---
.../org/apache/iotdb/db/query/distribution/common/FillPolicy.java | 5 -----
23 files changed, 49 insertions(+), 52 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
new file mode 100644
index 0000000..a81d6fe
--- /dev/null
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/FillPolicy.java
@@ -0,0 +1,5 @@
+package org.apache.iotdb.cluster.query.distribution.common;
+
+public enum FillPolicy {
+ PREVIOUS,
+}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/GroupByTimeParameter.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/GroupByTimeParameter.java
similarity index 83%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/GroupByTimeParameter.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/GroupByTimeParameter.java
index 3f7e1bc..23ad3a9 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/GroupByTimeParameter.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/GroupByTimeParameter.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
import org.apache.iotdb.db.qp.physical.crud.GroupByTimePlan;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/LevelBucketInfo.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/LevelBucketInfo.java
similarity index 90%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/LevelBucketInfo.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/LevelBucketInfo.java
index 6888475..44ee37d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/LevelBucketInfo.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/LevelBucketInfo.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
import java.util.List;
import java.util.Map;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/SeriesBatchAggInfo.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/SeriesBatchAggInfo.java
similarity index 92%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/SeriesBatchAggInfo.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/SeriesBatchAggInfo.java
index 2ea9f9a..c1726d5 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/SeriesBatchAggInfo.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/SeriesBatchAggInfo.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.read.common.Path;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/SeriesBatchData.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/SeriesBatchData.java
similarity index 89%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/SeriesBatchData.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/SeriesBatchData.java
index 7a9ae65..3384d49 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/SeriesBatchData.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/SeriesBatchData.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
import org.apache.iotdb.tsfile.read.common.BatchData;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/Tablet.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/Tablet.java
similarity index 92%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/Tablet.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/Tablet.java
index 956ccb0..dde6fa7 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/Tablet.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/Tablet.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
import org.apache.iotdb.tsfile.read.common.RowRecord;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/TabletMetadata.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TabletMetadata.java
similarity index 89%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/TabletMetadata.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TabletMetadata.java
index 0a01959..cdf827e 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/TabletMetadata.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TabletMetadata.java
@@ -1,6 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
-
-import org.apache.iotdb.tsfile.read.common.Path;
+package org.apache.iotdb.cluster.query.distribution.common;
import java.util.List;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/TraversalOrder.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TraversalOrder.java
similarity index 74%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/TraversalOrder.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TraversalOrder.java
index 3b1bc92..ea88253 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/TraversalOrder.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TraversalOrder.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
/**
* The traversal order for operators by timestamp
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/TreeNode.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TreeNode.java
similarity index 88%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/TreeNode.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TreeNode.java
index 9cf2dd3..a242660 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/TreeNode.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/TreeNode.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
import java.util.List;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/WithoutPolicy.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/WithoutPolicy.java
similarity index 51%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/common/WithoutPolicy.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/WithoutPolicy.java
index 02d1e43..794be12 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/WithoutPolicy.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/common/WithoutPolicy.java
@@ -1,4 +1,4 @@
-package org.apache.iotdb.db.query.distribution.common;
+package org.apache.iotdb.cluster.query.distribution.common;
public enum WithoutPolicy {
CONTAINS_NULL,
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/DeviceMergeOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/DeviceMergeOperator.java
similarity index 86%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/DeviceMergeOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/DeviceMergeOperator.java
index 45e52e4..1800179 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/DeviceMergeOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/DeviceMergeOperator.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
-import org.apache.iotdb.db.query.distribution.common.TraversalOrder;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.TraversalOrder;
import java.util.List;
import java.util.Map;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/ExecOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/ExecOperator.java
similarity index 79%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/ExecOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/ExecOperator.java
index b9a1691..883589b 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/ExecOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/ExecOperator.java
@@ -1,6 +1,6 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.TreeNode;
+import org.apache.iotdb.cluster.query.distribution.common.TreeNode;
/**
* @author xingtanzjr
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/FillOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/FillOperator.java
similarity index 64%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/FillOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/FillOperator.java
index 306c2b9..9390e59 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/FillOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/FillOperator.java
@@ -1,8 +1,7 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.FillPolicy;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
-import org.apache.iotdb.db.query.distribution.common.WithoutPolicy;
+import org.apache.iotdb.cluster.query.distribution.common.FillPolicy;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
/**
* FillOperator is used to fill the empty field in one row.
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/FilterExecOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/FilterExecOperator.java
similarity index 82%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/FilterExecOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/FilterExecOperator.java
index 65d2b8e..efe4609 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/FilterExecOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/FilterExecOperator.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
import org.apache.iotdb.db.qp.logical.crud.FilterOperator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
/**
* (We use FilterExecOperator to distinguish itself from the FilterOperator used in single-node IoTDB)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/GroupByLevelOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/GroupByLevelOperator.java
similarity index 78%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/GroupByLevelOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/GroupByLevelOperator.java
index f5fe41d..729c84f 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/GroupByLevelOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/GroupByLevelOperator.java
@@ -1,8 +1,8 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.GroupByTimeParameter;
-import org.apache.iotdb.db.query.distribution.common.LevelBucketInfo;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.GroupByTimeParameter;
+import org.apache.iotdb.cluster.query.distribution.common.LevelBucketInfo;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
/**
* This operator is responsible for the final aggregation merge operation.
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/LimitOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/LimitOperator.java
similarity index 77%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/LimitOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/LimitOperator.java
index 332c878..a48e664 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/LimitOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/LimitOperator.java
@@ -1,6 +1,6 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
/**
* LimitOperator is used to select top n result. It uses the default order of upstream operators
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/OffsetOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/OffsetOperator.java
similarity index 78%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/OffsetOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/OffsetOperator.java
index c8c0ec4..11cd7de 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/OffsetOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/OffsetOperator.java
@@ -1,6 +1,6 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
/**
* OffsetOperator is used to skip top n result from upstream operators. It uses the default order of upstream operators
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SeriesAggregateOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SeriesAggregateOperator.java
similarity index 82%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SeriesAggregateOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SeriesAggregateOperator.java
index e5d02f8..e566f49 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SeriesAggregateOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SeriesAggregateOperator.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.GroupByTimeParameter;
-import org.apache.iotdb.db.query.distribution.common.SeriesBatchAggInfo;
+import org.apache.iotdb.cluster.query.distribution.common.GroupByTimeParameter;
+import org.apache.iotdb.cluster.query.distribution.common.SeriesBatchAggInfo;
/**
* SeriesAggregateOperator is responsible to do the aggregation calculation for one series.
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SeriesScanOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SeriesScanOperator.java
similarity index 91%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SeriesScanOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SeriesScanOperator.java
index 94bc7da..46077bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SeriesScanOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SeriesScanOperator.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.SeriesBatchData;
-import org.apache.iotdb.db.query.distribution.common.TraversalOrder;
+import org.apache.iotdb.cluster.query.distribution.common.SeriesBatchData;
+import org.apache.iotdb.cluster.query.distribution.common.TraversalOrder;
import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.common.TimeRange;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SortOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SortOperator.java
similarity index 58%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SortOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SortOperator.java
index c1e2b0a..ab3f01d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/SortOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/SortOperator.java
@@ -1,13 +1,13 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
-import org.apache.iotdb.db.query.distribution.common.TraversalOrder;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.TraversalOrder;
/**
* In general, the parameter in sortOperator should be pushed down to the upstream operators.
* In our optimized logical query plan, the sortOperator should not appear.
*/
-public class SortOperator extends ExecOperator<Tablet>{
+public class SortOperator extends ExecOperator<Tablet> {
private TraversalOrder sortOrder;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/TimeJoinOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/TimeJoinOperator.java
similarity index 76%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/TimeJoinOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/TimeJoinOperator.java
index dbf1deb..c573495 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/TimeJoinOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/TimeJoinOperator.java
@@ -1,8 +1,8 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
-import org.apache.iotdb.db.query.distribution.common.TraversalOrder;
-import org.apache.iotdb.db.query.distribution.common.WithoutPolicy;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.TraversalOrder;
+import org.apache.iotdb.cluster.query.distribution.common.WithoutPolicy;
/**
* TimeJoinOperator is responsible for join two or more series.
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/WithoutOperator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/WithoutOperator.java
similarity index 70%
rename from server/src/main/java/org/apache/iotdb/db/query/distribution/operator/WithoutOperator.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/WithoutOperator.java
index 75250b9..f25d435 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/operator/WithoutOperator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/distribution/operator/WithoutOperator.java
@@ -1,7 +1,7 @@
-package org.apache.iotdb.db.query.distribution.operator;
+package org.apache.iotdb.cluster.query.distribution.operator;
-import org.apache.iotdb.db.query.distribution.common.Tablet;
-import org.apache.iotdb.db.query.distribution.common.WithoutPolicy;
+import org.apache.iotdb.cluster.query.distribution.common.Tablet;
+import org.apache.iotdb.cluster.query.distribution.common.WithoutPolicy;
/**
* WithoutOperator is used to discard specific result from upstream operators.
diff --git a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/FillPolicy.java b/server/src/main/java/org/apache/iotdb/db/query/distribution/common/FillPolicy.java
deleted file mode 100644
index ba59bad..0000000
--- a/server/src/main/java/org/apache/iotdb/db/query/distribution/common/FillPolicy.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.iotdb.db.query.distribution.common;
-
-public enum FillPolicy {
- PREVIOUS,
-}