This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch aggregationVector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/aggregationVector by this push:
new c87c6db remove isRawQuery()
c87c6db is described below
commit c87c6dbff68c2853a928836b70f7e529343198cd
Author: Alima777 <[email protected]>
AuthorDate: Tue Sep 14 16:40:52 2021 +0800
remove isRawQuery()
---
.../apache/iotdb/db/qp/physical/crud/AggregationPlan.java | 5 -----
.../org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java | 5 -----
.../org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java | 5 -----
.../org/apache/iotdb/db/qp/physical/crud/QueryIndexPlan.java | 5 -----
.../apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java | 12 +++---------
.../java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 5 -----
6 files changed, 3 insertions(+), 34 deletions(-)
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
index bccd004..ea74ecb 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/AggregationPlan.java
@@ -122,9 +122,4 @@ public class AggregationPlan extends RawDataQueryPlan {
}
return columnForDisplay;
}
-
- @Override
- public boolean isRawQuery() {
- return false;
- }
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
index 300cc85..a952e7b 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/FillQueryPlan.java
@@ -49,9 +49,4 @@ public class FillQueryPlan extends RawDataQueryPlan {
public void setFillType(Map<TSDataType, IFill> fillType) {
this.fillType = fillType;
}
-
- @Override
- public boolean isRawQuery() {
- return false;
- }
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java
index 21c3424..9f4f684 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/LastQueryPlan.java
@@ -75,9 +75,4 @@ public class LastQueryPlan extends RawDataQueryPlan {
}
return false;
}
-
- @Override
- public boolean isRawQuery() {
- return false;
- }
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryIndexPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryIndexPlan.java
index 8a931bf..27d20f1 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryIndexPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryIndexPlan.java
@@ -73,9 +73,4 @@ public class QueryIndexPlan extends RawDataQueryPlan {
public String toString() {
return String.format("Query paths: %s, index type: %s, props: %s", paths,
indexType, props);
}
-
- @Override
- public boolean isRawQuery() {
- return false;
- }
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java
index 460cb53..4e59686 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/RawDataQueryPlan.java
@@ -94,11 +94,9 @@ public class RawDataQueryPlan extends QueryPlan {
}
}
- if (isRawQuery()) {
- // if it is a RawQueryWithoutValueFilter, we also need to group all the
subSensors of one
- // vector into one VectorPartialPath
- groupVectorPaths(physicalGenerator);
- }
+ // if it is a RawQueryWithoutValueFilter, we also need to group all the
subSensors of one
+ // vector into one VectorPartialPath
+ groupVectorPaths(physicalGenerator);
}
public IExpression getExpression() {
@@ -209,8 +207,4 @@ public class RawDataQueryPlan extends QueryPlan {
this.deduplicatedDataTypes = this.deduplicatedVectorDataTypes;
}
}
-
- public boolean isRawQuery() {
- return true;
- }
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java
index 0ae2109..ecc6ac5 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/UDTFPlan.java
@@ -211,9 +211,4 @@ public class UDTFPlan extends RawDataQueryPlan implements
UDFPlan {
public void setPathNameToReaderIndex(Map<String, Integer>
pathNameToReaderIndex) {
this.pathNameToReaderIndex = pathNameToReaderIndex;
}
-
- @Override
- public boolean isRawQuery() {
- return false;
- }
}
