Make windowing off by default

apache · Dec 2, 2022 · 299d735 · 299d735
1 parent 851acb8
commit 299d735
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
@@ -50,6 +50,7 @@
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.Query;
+import org.apache.druid.query.QueryContext;
 import org.apache.druid.query.QueryDataSource;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.LongMaxAggregatorFactory;
@@ -273,14 +274,20 @@ public static DruidQuery fromPartialQuery(
     }
 
     if (partialQuery.getWindow() != null) {
-      windowing = Preconditions.checkNotNull(
-          Windowing.fromCalciteStuff(
-              partialQuery,
-              plannerContext,
-              sourceRowSignature, // TODO(gianm): window can only apply to the source data, because SCAN -> WINDOW
-              rexBuilder
-          )
-      );
+      final QueryContext queryContext = plannerContext.queryContext();
+      if (queryContext.getBoolean("windowsAreForClosers", false)) {
+        windowing = Preconditions.checkNotNull(
+            Windowing.fromCalciteStuff(
+                partialQuery,
+                plannerContext,
+                sourceRowSignature, // TODO(gianm): window can only apply to the source data, because SCAN -> WINDOW
+                rexBuilder
+            )
+        );
+      } else {
+        plannerContext.setPlanningError("Windowing Not Currently Supported");
+        throw new CannotBuildQueryException("Windowing Not Currently Supported");
+      }
     } else {
       windowing = null;
     }

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteWindowQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteWindowQueryTest.java
@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.google.common.collect.ImmutableMap;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 import junitparams.naming.TestCaseName;
@@ -130,6 +131,7 @@ public void windowQueryTest(String filename) throws IOException
       testBuilder()
           .skipVectorize(true)
           .sql(input.sql)
+          .queryContext(ImmutableMap.of("windowsAreForClosers", true))
           .addCustomVerification(QueryVerification.ofResults(results -> {
             if (results.exception != null) {
               throw new RE(results.exception, "Failed to execute because of exception.");