You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/05/18 09:17:26 UTC
[iotdb] branch iotdb-1022-v2 updated (49d19e7 -> 0ba9a37)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch iotdb-1022-v2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 49d19e7 fix tests for align by device with as clauses
new 84dcfb1 fix index related tests
new 0ba9a37 fix queryNonexistentSeries
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 4 +++-
.../src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java | 3 ++-
.../java/org/apache/iotdb/db/qp/logical/IndexLogicalPlanTest.java | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
[iotdb] 01/02: fix index related tests
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-1022-v2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 84dcfb11de89c66b5bb62feff45a328eea1feb2e
Author: SteveYurongSu <st...@outlook.com>
AuthorDate: Tue May 18 16:20:54 2021 +0800
fix index related tests
---
server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 4 +++-
.../java/org/apache/iotdb/db/qp/logical/IndexLogicalPlanTest.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java b/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
index 3595166..82ef1e0 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
@@ -1268,7 +1268,9 @@ public class IoTDBSqlVisitor extends SqlBaseBaseVisitor<Operator> {
} else {
props = new HashMap<>();
}
- queryOp.getSelectOperator().addResultColumn(new ResultColumn(new TimeSeriesOperand(path)));
+ List<ResultColumn> resultColumns = new ArrayList<>();
+ resultColumns.add(new ResultColumn(new TimeSeriesOperand(path)));
+ queryOp.getSelectOperator().setResultColumns(resultColumns);
props.put(PATTERN, compositePattern);
props.put(THRESHOLD, thresholds);
queryOp.setIndexType(IndexType.ELB_INDEX);
diff --git a/server/src/test/java/org/apache/iotdb/db/qp/logical/IndexLogicalPlanTest.java b/server/src/test/java/org/apache/iotdb/db/qp/logical/IndexLogicalPlanTest.java
index ddba790..38593cb 100644
--- a/server/src/test/java/org/apache/iotdb/db/qp/logical/IndexLogicalPlanTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/qp/logical/IndexLogicalPlanTest.java
@@ -131,7 +131,8 @@ public class IndexLogicalPlanTest {
QueryOperator queryOperator = (QueryOperator) op;
Assert.assertEquals(OperatorType.QUERY, queryOperator.getType());
Assert.assertEquals(
- "Speed", queryOperator.getSelectOperator().getResultColumns().get(0).toString());
+ "Speed",
+ queryOperator.getSelectOperator().getResultColumns().get(0).getExpression().toString());
Assert.assertEquals(
"root.Wind.AZQ02", queryOperator.getFromOperator().getPrefixPaths().get(0).getFullPath());
Assert.assertEquals(IndexType.ELB_INDEX, queryOperator.getIndexType());
[iotdb] 02/02: fix queryNonexistentSeries
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-1022-v2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0ba9a37214f818c8cb3710700b265bb10f819186
Author: SteveYurongSu <st...@outlook.com>
AuthorDate: Tue May 18 17:16:30 2021 +0800
fix queryNonexistentSeries
---
.../src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java b/server/src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java
index 580b3e4..d2e6054 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/utils/WildcardsRemover.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.query.expression.ResultColumn;
import org.apache.iotdb.tsfile.utils.Pair;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
public class WildcardsRemover {
@@ -126,7 +127,7 @@ public class WildcardsRemover {
extendedExpressions.add(actualExpressions);
}
if (atLeastOneSeriesNotExisted) {
- return extendedExpressions;
+ return Collections.emptyList();
}
List<List<Expression>> actualExpressions = new ArrayList<>();