This is an automated email from the ASF dual-hosted git repository.
geniuspig pushed a commit to branch optimize_path_v2
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/optimize_path_v2 by this push:
new fb0fc66 fix align by device bug
new f6920a7 Merge pull request #1639 from Alima777/optimize_path_v2
fb0fc66 is described below
commit fb0fc666ae3673b22cc26f5f96750954ce0281be
Author: Xiangwei Wei <[email protected]>
AuthorDate: Thu Aug 20 19:24:59 2020 +0800
fix align by device bug
---
server/src/main/java/org/apache/iotdb/db/metadata/MTree.java | 2 +-
.../main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 7278160..710b45a 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -835,7 +835,7 @@ public class MTree implements Serializable {
if (nodes.length == 0 || !nodes[0].equals(root.getName())) {
throw new IllegalPathException(prefixPath.getFullPath());
}
- Set<PartialPath> devices = new HashSet<>();
+ Set<PartialPath> devices = new TreeSet<>();
findDevices(root, nodes, 1, devices);
return devices;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
index b101516..d1733bb 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
@@ -355,7 +355,6 @@ public class PhysicalGenerator {
.setAggregations(queryOperator.getSelectOperator().getAggregations());
((GroupByTimePlan) queryPlan).setLevel(queryOperator.getLevel());
-
if (queryOperator.getLevel() >= 0) {
for (int i = 0; i <
queryOperator.getSelectOperator().getAggregations().size(); i++) {
if (!SQLConstant.COUNT
