You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by zy...@apache.org on 2023/03/12 23:57:15 UTC
[iotdb] 03/08: [IOTDB-5644] Fix unexpected result when there are no select expressions after analyzed in query
This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch rc/1.1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 596321301301ce1aa7e939c0861b18d0ad72d0c6
Author: Weihao Li <60...@users.noreply.github.com>
AuthorDate: Fri Mar 10 10:48:59 2023 +0800
[IOTDB-5644] Fix unexpected result when there are no select expressions after analyzed in query
---
.../IoTDBNoSelectExpressionAfterAnalyzedIT.java | 93 ++++++++++++++++++++++
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 38 ++++++---
2 files changed, 122 insertions(+), 9 deletions(-)
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNoSelectExpressionAfterAnalyzedIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNoSelectExpressionAfterAnalyzedIT.java
new file mode 100644
index 0000000000..8989d8a450
--- /dev/null
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBNoSelectExpressionAfterAnalyzedIT.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.it.query;
+
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import static org.apache.iotdb.db.it.utils.TestUtils.prepareData;
+import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualTest;
+import static org.apache.iotdb.itbase.constant.TestConstant.DEVICE;
+import static org.apache.iotdb.itbase.constant.TestConstant.TIMESTAMP_STR;
+import static org.apache.iotdb.itbase.constant.TestConstant.count;
+import static org.apache.iotdb.itbase.constant.TestConstant.s1;
+import static org.apache.iotdb.itbase.constant.TestConstant.s2;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+public class IoTDBNoSelectExpressionAfterAnalyzedIT {
+ private static final String[] SQLs =
+ new String[] {
+ "insert into root.sg.d1(time,s1) values(1,1)",
+ "insert into root.sg.d2(time,s1,s2) values(1,1,1)"
+ };
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ EnvFactory.getEnv().initClusterEnvironment();
+ prepareData(SQLs);
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+
+ @Test
+ public void testAlignByDevice() {
+ String[] expectedHeader = new String[] {TIMESTAMP_STR};
+ String[] retArray = new String[] {};
+ resultSetEqualTest(
+ "select s2 from root.sg.d1 where s1>0 align by device", expectedHeader, retArray);
+
+ resultSetEqualTest(
+ "select count(s2) from root.sg.d1 where s1>0 align by device", expectedHeader, retArray);
+
+ // mix test
+ expectedHeader = new String[] {DEVICE, count(s1), count(s2)};
+ retArray = new String[] {"root.sg.d1,1,null,", "root.sg.d2,1,1,"};
+ resultSetEqualTest(
+ "select count(s1), count(s2) from root.sg.* where s1>0 align by device",
+ expectedHeader,
+ retArray);
+
+ expectedHeader = new String[] {TIMESTAMP_STR, DEVICE, s1, s2};
+ retArray = new String[] {"1,root.sg.d1,1.0,null,", "1,root.sg.d2,1.0,1.0,"};
+ resultSetEqualTest(
+ "select s1, s2 from root.sg.* where s1>0 align by device", expectedHeader, retArray);
+ }
+
+ @Test
+ public void testAlignByTime() {
+ String[] expectedHeader = new String[] {TIMESTAMP_STR};
+ String[] retArray = new String[] {};
+ resultSetEqualTest("select s2 from root.sg.d1 where s1>0", expectedHeader, retArray);
+
+ resultSetEqualTest("select count(s2) from root.sg.d1 where s1>0", expectedHeader, retArray);
+ }
+}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 25953f8460..d46dfc0e9b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -248,15 +248,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
// If there is no leaf node in the schema tree, the query should be completed immediately
if (schemaTree.isEmpty()) {
- if (queryStatement.isSelectInto()) {
- analysis.setRespDatasetHeader(
- DatasetHeaderFactory.getSelectIntoHeader(queryStatement.isAlignByDevice()));
- }
- if (queryStatement.isLastQuery()) {
- analysis.setRespDatasetHeader(DatasetHeaderFactory.getLastQueryHeader());
- }
- analysis.setFinishQueryAfterAnalyze(true);
- return analysis;
+ return finishQuery(queryStatement, analysis);
}
// extract global time filter from query filter and determine if there is a value filter
@@ -285,7 +277,12 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
List<Pair<Expression, String>> outputExpressions;
if (queryStatement.isAlignByDevice()) {
Set<PartialPath> deviceSet = analyzeFrom(queryStatement, schemaTree);
+
outputExpressions = analyzeSelect(analysis, queryStatement, schemaTree, deviceSet);
+ if (deviceSet.isEmpty()) {
+ return finishQuery(queryStatement, analysis);
+ }
+
analyzeDeviceToGroupBy(analysis, queryStatement, schemaTree, deviceSet);
Map<String, Set<Expression>> deviceToAggregationExpressions = new HashMap<>();
analyzeHaving(
@@ -306,6 +303,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
outputExpressions = new ArrayList<>();
outputExpressionMap.values().forEach(outputExpressions::addAll);
+ if (outputExpressions.isEmpty()) {
+ return finishQuery(queryStatement, analysis);
+ }
analyzeGroupBy(analysis, queryStatement, schemaTree);
analyzeHaving(analysis, queryStatement, schemaTree);
@@ -350,6 +350,18 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
return analysis;
}
+ private Analysis finishQuery(QueryStatement queryStatement, Analysis analysis) {
+ if (queryStatement.isSelectInto()) {
+ analysis.setRespDatasetHeader(
+ DatasetHeaderFactory.getSelectIntoHeader(queryStatement.isAlignByDevice()));
+ }
+ if (queryStatement.isLastQuery()) {
+ analysis.setRespDatasetHeader(DatasetHeaderFactory.getLastQueryHeader());
+ }
+ analysis.setFinishQueryAfterAnalyze(true);
+ return analysis;
+ }
+
private void analyzeGlobalTimeFilter(Analysis analysis, QueryStatement queryStatement) {
Filter globalTimeFilter = null;
boolean hasValueFilter = false;
@@ -496,6 +508,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
ColumnPaginationController paginationController =
new ColumnPaginationController(
queryStatement.getSeriesLimit(), queryStatement.getSeriesOffset(), false);
+ Set<PartialPath> noMeasurementDevices = new HashSet<>(deviceSet);
for (ResultColumn resultColumn : queryStatement.getSelectComponent().getResultColumns()) {
Expression selectExpression = resultColumn.getExpression();
@@ -508,6 +521,10 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
for (PartialPath device : deviceSet) {
List<Expression> selectExpressionsOfOneDevice =
ExpressionAnalyzer.concatDeviceAndRemoveWildcard(selectExpression, device, schemaTree);
+ if (selectExpressionsOfOneDevice.isEmpty()) {
+ continue;
+ }
+ noMeasurementDevices.remove(device);
for (Expression expression : selectExpressionsOfOneDevice) {
Expression measurementExpression =
ExpressionAnalyzer.getMeasurementExpression(expression);
@@ -568,6 +585,9 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
}
}
+ // remove devices without measurements to compute
+ deviceSet.removeAll(noMeasurementDevices);
+
analysis.setDeviceToSelectExpressions(deviceToSelectExpressions);
return outputExpressions;
}