Fix select-distinct when there is no order by and select items contai…

…ns expression
apache · Jan 9, 2025 · 7dc5179 · 7dc5179
1 parent 5f01571
commit 7dc5179
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...st/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationIT.java b/...st/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBTableAggregationIT.java
@@ -4159,6 +4159,14 @@ public void simpleTest() {
         expectedHeader,
         retArray,
         DATABASE_NAME);
+
+    expectedHeader = new String[] {"_col0"};
+    retArray = new String[] {"false,"};
+    tableResultSetEqualTest(
+        "select distinct s1 < 0 from table1 where s1 is not null",
+        expectedHeader,
+        retArray,
+        DATABASE_NAME);
   }
 
   @Test

diff --git a/...e/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/...e/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java
@@ -256,7 +256,7 @@ public RelationPlan plan(QuerySpecification node) {
     }
 
     List<Expression> orderBy = analysis.getOrderByExpressions(node);
-    if (!orderBy.isEmpty()) {
+    if (!orderBy.isEmpty() || node.getSelect().isDistinct()) {
       builder =
           builder.appendProjections(
               Iterables.concat(orderBy, outputs), symbolAllocator, queryContext);