(calcite) branch main updated: [CALCITE-7386] An error occurred while using TopDownGeneralDecorrelator to process the aggregate(col) filter

[silun]

This is an automated email from the ASF dual-hosted git repository.

silun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new 87dcba9f0e [CALCITE-7386] An error occurred while using 
TopDownGeneralDecorrelator to process the aggregate(col) filter
87dcba9f0e is described below

commit 87dcba9f0eebb1820f78ef8655045f89938ebd17
Author: Silun Dong <silund...@outlook.com>
AuthorDate: Wed Feb 25 14:23:41 2026 +0800

    [CALCITE-7386] An error occurred while using TopDownGeneralDecorrelator to 
process the aggregate(col) filter
---
 .../test/java/org/apache/calcite/test/CoreQuidemTest2.java | 14 --------------
 core/src/test/resources/sql/measure.iq                     |  2 ++
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/core/src/test/java/org/apache/calcite/test/CoreQuidemTest2.java 
b/core/src/test/java/org/apache/calcite/test/CoreQuidemTest2.java
index 0a55d7764b..46bb7895da 100644
--- a/core/src/test/java/org/apache/calcite/test/CoreQuidemTest2.java
+++ b/core/src/test/java/org/apache/calcite/test/CoreQuidemTest2.java
@@ -18,10 +18,6 @@
 
 import org.apache.calcite.config.CalciteConnectionProperty;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Test that runs Quidem files with the top-down decorrelator enabled.
  */
@@ -39,16 +35,6 @@ public static void main(String[] args) throws Exception {
     }
   }
 
-  @Override protected Collection<String> data() {
-    final List<String> paths = new ArrayList<>(super.data());
-    // These remove operations are temporary and will be deleted
-    // once the new decorrelator can adapt to all scenarios.
-
-    // TODO: Support measure
-    paths.remove("sql/measure.iq");
-    return paths;
-  }
-
   @Override protected CalciteAssert.AssertThat 
customize(CalciteAssert.AssertThat assertThat) {
     return super.customize(assertThat)
         .with(CalciteConnectionProperty.TOPDOWN_GENERAL_DECORRELATION_ENABLED, 
true);
diff --git a/core/src/test/resources/sql/measure.iq 
b/core/src/test/resources/sql/measure.iq
index aa8ee999fd..624041d090 100644
--- a/core/src/test/resources/sql/measure.iq
+++ b/core/src/test/resources/sql/measure.iq
@@ -667,6 +667,7 @@ group by deptno, deptno2;
 
 !ok
 
+!if (use_old_decorr) {
 # Measure with FILTER
 select job,
     c,
@@ -689,6 +690,7 @@ group by job;
 (3 rows)
 
 !ok
+!}
 
 !if (false) {
 # Null values in GROUP BY