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 2021/09/14 08:36:24 UTC
[iotdb] branch aggregationVector updated: remove vectorToPath
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 ecbfe10 remove vectorToPath
ecbfe10 is described below
commit ecbfe106e366ecc3541482f7f2bae08b9aa44ee9
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue Sep 14 16:35:41 2021 +0800
remove vectorToPath
---
.../apache/iotdb/db/qp/physical/crud/QueryPlan.java | 10 ----------
.../iotdb/db/qp/physical/crud/RawDataQueryPlan.java | 19 -------------------
2 files changed, 29 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
index aa63414..52cb0d6 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/QueryPlan.java
@@ -45,8 +45,6 @@ public abstract class QueryPlan extends PhysicalPlan {
private Map<String, Integer> pathToIndex = new HashMap<>();
- private Map<String, Integer> vectorPathToIndex;
-
private boolean enableRedirect = false;
// if true, we don't need the row whose any column is null
@@ -150,14 +148,6 @@ public abstract class QueryPlan extends PhysicalPlan {
this.enableRedirect = enableRedirect;
}
- public Map<String, Integer> getVectorPathToIndex() {
- return vectorPathToIndex;
- }
-
- public void setVectorPathToIndex(Map<String, Integer> vectorPathToIndex) {
- this.vectorPathToIndex = vectorPathToIndex;
- }
-
public List<ResultColumn> getResultColumns() {
return resultColumns;
}
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 12d975a..460cb53 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
@@ -97,7 +97,6 @@ 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
- fillVectorPathToIndex(columnForDisplaySet);
groupVectorPaths(physicalGenerator);
}
}
@@ -169,23 +168,6 @@ public class RawDataQueryPlan extends QueryPlan {
return deviceToMeasurements;
}
- public void fillVectorPathToIndex(Set<String> columnForDisplaySet) {
- Map<String, Integer> columnForDisplayToQueryDataSetIndex = new HashMap<>();
- for (int i = 0; i < deduplicatedPaths.size(); i++) {
- PartialPath path = deduplicatedPaths.get(i);
- columnForDisplayToQueryDataSetIndex.put(path.getExactFullPath(), i);
- if (path.isMeasurementAliasExists()) {
- columnForDisplayToQueryDataSetIndex.put(path.getFullPathWithAlias(), i);
- }
- }
- Map<String, Integer> vectorPathToIndex = new HashMap<>();
- for (String columnForDisplay : columnForDisplaySet) {
- vectorPathToIndex.put(
- columnForDisplay, columnForDisplayToQueryDataSetIndex.get(columnForDisplay));
- }
- this.setVectorPathToIndex(vectorPathToIndex);
- }
-
/**
* Group all the subSensors of one vector into one VectorPartialPath save the grouped
* VectorPartialPath in deduplicatedVectorPaths and deduplicatedVectorDataTypes instead of putting
@@ -225,7 +207,6 @@ public class RawDataQueryPlan extends QueryPlan {
if (!this.deduplicatedVectorPaths.isEmpty()) {
this.deduplicatedPaths = this.deduplicatedVectorPaths;
this.deduplicatedDataTypes = this.deduplicatedVectorDataTypes;
- setPathToIndex(getVectorPathToIndex());
}
}