Enable resultset validation of Drill tests

sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java

@@ -126,6 +126,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -1056,7 +1057,8 @@ public Map<String, Object> baseQueryContext()
 
   public void assertResultsEquals(String sql, List<Object[]> expectedResults, List<Object[]> results)
   {
-    for (int i = 0; i < results.size(); i++) {
+    int minSize = Math.min(results.size(), expectedResults.size());
+    for (int i = 0; i < minSize; i++) {
       Assert.assertArrayEquals(
           StringUtils.format("result #%d: %s", i + 1, sql),
           expectedResults.get(i),
@@ -1368,7 +1370,7 @@ public void verify(String sql, List<Object[]> results)
         assertResultsEquals(sql, expectedResults, results);
       }
       catch (AssertionError e) {
-        displayResults(results);
+        displayResults("Actual", results);
         throw e;
       }
     }
@@ -1380,10 +1382,10 @@ public void verify(String sql, List<Object[]> results)
    * expected results: let the test fail with empty results. The actual results
    * are printed to the console. Copy them into the test.
    */
-  public static void displayResults(List<Object[]> results)
+  public static void displayResults(String name, List<Object[]> results)
   {
     PrintStream out = System.out;
-    out.println("-- Actual results --");
+    out.printf(Locale.ENGLISH, "-- %s results --", name);
     for (int rowIndex = 0; rowIndex < results.size(); rowIndex++) {
       printArray(results.get(rowIndex), out);
       if (rowIndex < results.size() - 1) {

sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java

@@ -109,7 +109,7 @@
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.column.RowSignature;
 import org.apache.druid.segment.join.JoinType;
-import org.apache.druid.sql.calcite.DecoupledIgnore.Modes;
+import org.apache.druid.sql.calcite.NotYetSupported.Modes;
 import org.apache.druid.sql.calcite.expression.DruidExpression;
 import org.apache.druid.sql.calcite.filtration.Filtration;
 import org.apache.druid.sql.calcite.planner.Calcites;
@@ -2688,7 +2688,7 @@ public void testGroupByWithSelectProjections()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.CANNOT_CONVERT)
+  @NotYetSupported(Modes.CANNOT_CONVERT)
   @Test
   public void testGroupByWithSelectAndOrderByProjections()
   {
@@ -2773,7 +2773,7 @@ public void testTopNWithSelectProjections()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.CANNOT_CONVERT)
+  @NotYetSupported(Modes.CANNOT_CONVERT)
   @Test
   public void testTopNWithSelectAndOrderByProjections()
   {
@@ -2811,7 +2811,7 @@ public void testTopNWithSelectAndOrderByProjections()
     );
   }
 
-  @DecoupledIgnore
+  @NotYetSupported
   @Test
   public void testUnionAllQueries()
   {
@@ -2845,7 +2845,7 @@ public void testUnionAllQueries()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.NOT_ENOUGH_RULES)
+  @NotYetSupported(Modes.NOT_ENOUGH_RULES)
   @Test
   public void testUnionAllQueriesWithLimit()
   {
@@ -3203,7 +3203,7 @@ public void testNullFloatFilter()
    * This test case should be in {@link CalciteUnionQueryTest}. However, there's a bug in the test framework that
    * doesn't reset framework once the merge buffers
    */
-  @DecoupledIgnore
+  @NotYetSupported
   @Test
   public void testUnionAllSameTableThreeTimes()
   {
@@ -3247,7 +3247,7 @@ public void testUnionAllSameTableThreeTimes()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.NOT_ENOUGH_RULES)
+  @NotYetSupported(Modes.NOT_ENOUGH_RULES)
   @Test
   public void testExactCountDistinctUsingSubqueryOnUnionAllTables()
   {
@@ -4653,7 +4653,7 @@ public void testSimpleAggregations()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.CANNOT_CONVERT)
+  @NotYetSupported(Modes.CANNOT_CONVERT)
   @Test
   public void testGroupByWithSortOnPostAggregationDefault()
   {
@@ -4685,7 +4685,7 @@ public void testGroupByWithSortOnPostAggregationDefault()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.CANNOT_CONVERT)
+  @NotYetSupported(Modes.CANNOT_CONVERT)
   @Test
   public void testGroupByWithSortOnPostAggregationNoTopNConfig()
   {
@@ -4729,7 +4729,7 @@ public void testGroupByWithSortOnPostAggregationNoTopNConfig()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.CANNOT_CONVERT)
+  @NotYetSupported(Modes.CANNOT_CONVERT)
   @Test
   public void testGroupByWithSortOnPostAggregationNoTopNContext()
   {
@@ -5317,7 +5317,7 @@ public void testCountStarWithNotOfDegenerateFilter()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.ERROR_HANDLING)
+  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnplannableQueries()
   {
@@ -5389,7 +5389,7 @@ public void testCountStarWithBoundFilterSimplifyOr()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.ERROR_HANDLING)
+  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnplannableExactCountDistinctOnSketch()
   {
@@ -6384,7 +6384,7 @@ public void testApproxCountDistinctBuiltin()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.PLAN_MISMATCH)
+  @NotYetSupported(Modes.PLAN_MISMATCH)
   @Test
   public void testExactCountDistinctWithGroupingAndOtherAggregators()
   {
@@ -6439,7 +6439,7 @@ public void testExactCountDistinctWithGroupingAndOtherAggregators()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.NOT_ENOUGH_RULES)
+  @NotYetSupported(Modes.NOT_ENOUGH_RULES)
   @Test
   public void testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin()
   {
@@ -7082,7 +7082,7 @@ public void testQueryWithMoreThanMaxNumericInFilter()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.PLAN_MISMATCH)
+  @NotYetSupported(Modes.PLAN_MISMATCH)
   @Test
   public void testExactCountDistinctUsingSubqueryWithWherePushDown()
   {
@@ -7813,7 +7813,7 @@ public void testGroupAndFilterOnTimeFloorWithTimeZone()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.PLAN_MISMATCH)
+  @NotYetSupported(Modes.PLAN_MISMATCH)
   @Test
   public void testFilterOnCurrentTimestampWithIntervalArithmetic()
   {
@@ -7861,7 +7861,7 @@ public void testFilterOnCurrentTimestampLosAngeles()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.PLAN_MISMATCH)
+  @NotYetSupported(Modes.PLAN_MISMATCH)
   @Test
   public void testFilterOnCurrentTimestampOnView()
   {
@@ -10112,7 +10112,7 @@ public void testGroupByTimeAndOtherDimension()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.PLAN_MISMATCH)
+  @NotYetSupported(Modes.PLAN_MISMATCH)
   @Test
   public void testGroupByTimeFloorAndDimOnGroupByTimeFloorAndDim()
   {
@@ -11561,7 +11561,7 @@ public void testTextcat()
     );
   }
 
-  @DecoupledIgnore
+  @NotYetSupported
   @Test
   public void testRequireTimeConditionPositive()
   {
@@ -11765,7 +11765,7 @@ public void testRequireTimeConditionSubQueryNegative()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.ERROR_HANDLING)
+  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testRequireTimeConditionSemiJoinNegative()
   {
@@ -13744,7 +13744,7 @@ public void testReturnEmptyRowWhenGroupByIsConvertedToTimeseriesWithMultipleCons
     );
   }
 
-  @DecoupledIgnore(mode = Modes.PLAN_MISMATCH)
+  @NotYetSupported(Modes.PLAN_MISMATCH)
   @Test
   public void testPlanWithInFilterLessThanInSubQueryThreshold()
   {
@@ -14069,7 +14069,7 @@ public void testComplexDecodeAgg()
         )
     );
   }
-  @DecoupledIgnore
+  @NotYetSupported
   @Test
   public void testOrderByAlongWithInternalScanQuery()
   {
@@ -14112,7 +14112,7 @@ public void testOrderByAlongWithInternalScanQuery()
     );
   }
 
-  @DecoupledIgnore(mode = Modes.NOT_ENOUGH_RULES)
+  @NotYetSupported(Modes.NOT_ENOUGH_RULES)
   @Test
   public void testOrderByAlongWithInternalScanQueryNoDistinct()
   {

sql/src/test/java/org/apache/druid/sql/calcite/CalciteSysQueryTest.java

@@ -20,15 +20,15 @@
 package org.apache.druid.sql.calcite;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.sql.calcite.DecoupledIgnore.DecoupledIgnoreProcessor;
-import org.apache.druid.sql.calcite.DecoupledIgnore.Modes;
+import org.apache.druid.sql.calcite.NotYetSupported.Modes;
+import org.apache.druid.sql.calcite.NotYetSupported.NotYetSupportedProcessor;
 import org.junit.Rule;
 import org.junit.Test;
 
 public class CalciteSysQueryTest extends BaseCalciteQueryTest
 {
   @Rule(order = 0)
-  public DecoupledIgnoreProcessor decoupledIgnoreProcessor = new DecoupledIgnoreProcessor();
+  public NotYetSupportedProcessor NegativeTestProcessor = new NotYetSupportedProcessor();
 
   @Test
   public void testTasksSum()
@@ -46,7 +46,7 @@ public void testTasksSum()
         .run();
   }
 
-  @DecoupledIgnore(mode = Modes.EXPRESSION_NOT_GROUPED)
+  @NotYetSupported(Modes.EXPRESSION_NOT_GROUPED)
   @Test
   public void testTasksSumOver()
   {

sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteQueryTest.java

@@ -22,7 +22,7 @@
 import com.google.common.collect.ImmutableMap;
 import org.apache.druid.query.QueryContexts;
 import org.apache.druid.server.security.AuthConfig;
-import org.apache.druid.sql.calcite.DecoupledIgnore.DecoupledIgnoreProcessor;
+import org.apache.druid.sql.calcite.NotYetSupported.NotYetSupportedProcessor;
 import org.apache.druid.sql.calcite.planner.PlannerConfig;
 import org.apache.druid.sql.calcite.util.SqlTestFramework;
 import org.junit.Rule;
@@ -31,7 +31,7 @@ public class DecoupledPlanningCalciteQueryTest extends CalciteQueryTest
 {
 
   @Rule(order = 0)
-  public DecoupledIgnoreProcessor decoupledIgnoreProcessor = new DecoupledIgnoreProcessor();
+  public NotYetSupportedProcessor decoupledIgnoreProcessor = new NotYetSupportedProcessor();
 
   private static final ImmutableMap<String, Object> CONTEXT_OVERRIDES = ImmutableMap.of(
       PlannerConfig.CTX_NATIVE_QUERY_SQL_PLANNING_MODE, PlannerConfig.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED,

sql/src/test/java/org/apache/druid/sql/calcite/DisableUnless.java

@@ -0,0 +1,55 @@
+/*
+ * 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.druid.sql.calcite;
+
+import com.google.common.base.Supplier;
+import org.apache.druid.common.config.NullHandling;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Collection of conditional disabler rules.
+ */
+class DisableUnless
+{
+  public static final TestRule SQL_COMPATIBLE = new DisableUnlessRule("NullHandling::sqlCompatible", NullHandling::sqlCompatible);
+
+  public static class DisableUnlessRule implements TestRule
+  {
+    private Supplier<Boolean> predicate;
+    private String message;
+
+    public DisableUnlessRule(String message, Supplier<Boolean> predicate)
+    {
+      this.message = message;
+      this.predicate = predicate;
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description)
+    {
+      assumeTrue("Testcase disabled; because condition not met: " + message, predicate.get());
+      return base;
+    }
+  }
+}