Convert many 'Not using ok' comments to '!ok'

Author: julianhyde

core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java

@@ -118,6 +118,7 @@
 import org.apache.calcite.sql.fun.SqlLibrary;
 import org.apache.calcite.sql.fun.SqlLibraryOperatorTableFactory;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
+import org.apache.calcite.sql.test.SqlTestFactory;
 import org.apache.calcite.sql.type.OperandTypes;
 import org.apache.calcite.sql.type.ReturnTypes;
 import org.apache.calcite.sql.type.SqlTypeName;
@@ -3834,6 +3835,37 @@ private HepProgram getTransitiveProgram() {
         .check();
   }
 
+  /** Tests that ProjectAggregateMergeRule does nothing with non-numeric literals
+   * and does not throw an exception. */
+  @Test void testProjectAggregateMergeNonNumericLiteral() {
+    // Requires a NULLABLE column to trigger
+    final SqlTestFactory.CatalogReaderFactory catalogReaderFactory = (typeFactory, caseSensitive) ->
+        new MockCatalogReader(typeFactory, caseSensitive) {
+          @Override public MockCatalogReader init() {
+            MockSchema schema = new MockSchema("SALES");
+            registerSchema(schema);
+            final boolean nullable = true;
+            final RelDataType timestampType =
+                typeFactory.createTypeWithNullability(
+                    typeFactory.createSqlType(SqlTypeName.TIMESTAMP),
+                    nullable);
+            String tableName = "NULLABLE";
+            MockTable table = MockTable
+                .create(this, schema, tableName, false, 100);
+            table.addColumn("HIREDATE", timestampType);
+            registerTable(table);
+            return this;
+          }
+        }.init();
+    final String sql = "select hiredate, coalesce(hiredate, {ts '1969-12-31 00:00:00'}) as c1\n"
+        + "from sales.nullable\n"
+        + "group by hiredate";
+    sql(sql)
+        .withCatalogReaderFactory(catalogReaderFactory)
+        .withRule(CoreRules.PROJECT_AGGREGATE_MERGE)
+        .checkUnchanged();
+  }
+
   /**
    * Test case for AggregateMergeRule, should merge 2 aggregates
    * into a single aggregate.

core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml

@@ -4896,6 +4896,20 @@ LogicalProject(EMPNO=[$4])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP_ADDRESS]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectAggregateMergeNonNumericLiteral">
+    <Resource name="sql">
+      <![CDATA[select hiredate, coalesce(hiredate, {ts '1969-12-31 00:00:00'}) as c1
+from sales.nullable
+group by hiredate]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(HIREDATE=[$0], C1=[CASE(IS NOT NULL($0), CAST($0):TIMESTAMP(0) NOT NULL, 1969-12-31 00:00:00)])
+  LogicalAggregate(group=[{0}])
+    LogicalTableScan(table=[[CATALOG, SALES, NULLABLE]])
 ]]>
     </Resource>
   </TestCase>

core/src/test/resources/sql/rule/aggregate-constants.iq

@@ -47,14 +47,14 @@ LogicalProject(C=[$2])
     LogicalProject(DEPTNO=[$7], SAL=[$5])
       LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(C=[$2])
   LogicalProject(DEPTNO=[10], SAL=[$0], C=[$1])
     LogicalAggregate(group=[{0}], C=[COUNT()])
       LogicalProject(SAL=[$5])
         LogicalFilter(condition=[=($7, 10)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
+!sub-plan "AGGREGATE_ANY_PULL_UP_CONSTANTS"
 
 # testAggregateConstantKeyRule2 ------------------------------------------------
 # AGGREGATE_ANY_PULL_UP_CONSTANTS should not fire when the only group key is a
@@ -77,13 +77,13 @@ LogicalProject(C=[$1])
     LogicalProject(DEPTNO=[$7])
       LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(C=[$1])
   LogicalAggregate(group=[{0}], C=[COUNT()])
     LogicalProject(DEPTNO=[$7])
       LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
+!sub-plan "AGGREGATE_ANY_PULL_UP_CONSTANTS"
 
 # testAggregateConstantKeyRule3 ------------------------------------------------
 # AGGREGATE_ANY_PULL_UP_CONSTANTS removes the null key (mgr IS NULL) but keeps
@@ -108,15 +108,15 @@ LogicalProject(JOB=[$1])
       LogicalProject(MGR=[$3], JOB=[$2])
         LogicalFilter(condition=[AND(IS NULL($3), =($2, 'Clerk'))])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(JOB=[$1])
   LogicalFilter(condition=[>($2, 3)])
     LogicalProject(MGR=[$0], JOB=['Clerk':VARCHAR(10)], $f2=[$1])
       LogicalAggregate(group=[{0}], agg#0=[COUNT()])
         LogicalProject(MGR=[$3])
           LogicalFilter(condition=[AND(IS NULL($3), =($2, 'Clerk'))])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
+!sub-plan "AGGREGATE_ANY_PULL_UP_CONSTANTS"
 
 # testAggregateDynamicFunction -------------------------------------------------
 # AGGREGATE_ANY_PULL_UP_CONSTANTS removes the null key (mgr IS NULL) but keeps
@@ -141,15 +141,15 @@ LogicalProject(HIREDATE=[$1])
       LogicalProject(MGR=[$3], HIREDATE=[$4])
         LogicalFilter(condition=[AND(IS NULL($3), =($4, CURRENT_TIMESTAMP))])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(HIREDATE=[$1])
   LogicalFilter(condition=[>($2, 3)])
     LogicalProject(MGR=[$0], HIREDATE=[CURRENT_TIMESTAMP], $f2=[$1])
       LogicalAggregate(group=[{0}], agg#0=[COUNT()])
         LogicalProject(MGR=[$3])
           LogicalFilter(condition=[AND(IS NULL($3), =($4, CURRENT_TIMESTAMP))])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
+!sub-plan "AGGREGATE_ANY_PULL_UP_CONSTANTS"
 
 # testAggregateProjectPullUpConstants ------------------------------------------
 # AGGREGATE_ANY_PULL_UP_CONSTANTS removes the constant group key (empno = 10)
@@ -169,13 +169,13 @@ LogicalAggregate(group=[{0, 1, 2}], S=[SUM($2)])
   LogicalProject(JOB=[$2], EMPNO=[$0], SAL=[$5])
     LogicalFilter(condition=[=($0, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(JOB=[$0], EMPNO=[10], SAL=[$1], S=[$2])
   LogicalAggregate(group=[{0, 1}], S=[SUM($1)])
     LogicalProject(JOB=[$2], SAL=[$5])
       LogicalFilter(condition=[=($0, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
+!sub-plan "AGGREGATE_ANY_PULL_UP_CONSTANTS"
 
 # testAggregateProjectPullUpConstants2 -----------------------------------------
 # After AGGREGATE_PROJECT_MERGE merges the inner project into the aggregate,
@@ -195,16 +195,16 @@ LogicalAggregate(group=[{0, 1}])
   LogicalProject(ENAME=[$1], SAL=[$5])
     LogicalFilter(condition=[=($1, 'John')])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalAggregate(group=[{1, 5}])
   LogicalFilter(condition=[=($1, 'John')])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_PROJECT_MERGE"
+!sub-plan "AGGREGATE_PROJECT_MERGE"
 LogicalProject(ENAME=['John':VARCHAR(20)], SAL=[$0])
   LogicalAggregate(group=[{5}])
     LogicalFilter(condition=[=($1, 'John')])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, AGGREGATE_PROJECT_MERGE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
+!sub-plan "AGGREGATE_PROJECT_MERGE, AGGREGATE_ANY_PULL_UP_CONSTANTS"
 
 # testAggregateValuesRuleWithInRepeatingValues ---------------------------------
 # AGGREGATE_VALUES deduplicates Values tuples when a filter IN clause has
@@ -227,20 +227,20 @@ LogicalProject(DEPTNO=[$7], SAL=[$5])
 LogicalValues(tuples=[[{ 1 }, { 1 }, { 3 }, { 1 }, { 2 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { null }, { null }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }]])
 })])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(DEPTNO=[$7], SAL=[$5])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalAggregate(group=[{0}])
         LogicalValues(tuples=[[{ 1 }, { 1 }, { 3 }, { 1 }, { 2 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { null }, { null }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }, { 1 }]])
-!sub-plan "NONE, FILTER_SUB_QUERY_TO_CORRELATE"
+!sub-plan "FILTER_SUB_QUERY_TO_CORRELATE"
 LogicalProject(DEPTNO=[$7], SAL=[$5])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalValues(tuples=[[{ 1 }, { 3 }, { 2 }, { null }]])
-!sub-plan "NONE, FILTER_SUB_QUERY_TO_CORRELATE, AGGREGATE_VALUES"
+!sub-plan "FILTER_SUB_QUERY_TO_CORRELATE, AGGREGATE_VALUES"
 
 # testEmptyAggregateEmptyKeyWithAggregateValuesRule ----------------------------
 # AGGREGATE_VALUES replaces an empty-key Aggregate over empty Values with a
@@ -264,15 +264,15 @@ LogicalAggregate(group=[{}], EXPR$0=[COUNT()], EXPR$1=[SUM($0)])
   LogicalProject(EMPNO=[$0])
     LogicalFilter(condition=[false])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalAggregate(group=[{}], EXPR$0=[COUNT()], EXPR$1=[SUM($0)])
   LogicalProject(EMPNO=[$0])
     LogicalValues(tuples=[[]])
-!sub-plan "NONE, FILTER_REDUCE_EXPRESSIONS"
+!sub-plan "FILTER_REDUCE_EXPRESSIONS"
 LogicalAggregate(group=[{}], EXPR$0=[COUNT()], EXPR$1=[SUM($0)])
   LogicalProject(EMPNO=[$0])
     LogicalValues(tuples=[[]])
-!sub-plan "NONE, FILTER_REDUCE_EXPRESSIONS, AGGREGATE_VALUES"
+!sub-plan "FILTER_REDUCE_EXPRESSIONS, AGGREGATE_VALUES"
 
 # testReduceInValuesNonOrdered -------------------------------------------------
 # AGGREGATE_VALUES does not fire when the IN list is small enough that the
@@ -292,14 +292,14 @@ WHERE deptno IN (1,1,3,1,2);
 LogicalProject(DEPTNO=[$7], SAL=[$5])
   LogicalFilter(condition=[OR(=($7, 1), =($7, 3), =($7, 2))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE"
+!sub-plan ""
 LogicalProject(DEPTNO=[$7], SAL=[$5])
   LogicalFilter(condition=[OR(=($7, 1), =($7, 3), =($7, 2))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, FILTER_SUB_QUERY_TO_CORRELATE"
+!sub-plan "FILTER_SUB_QUERY_TO_CORRELATE"
 LogicalProject(DEPTNO=[$7], SAL=[$5])
   LogicalFilter(condition=[OR(=($7, 1), =($7, 3), =($7, 2))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-!sub-plan "NONE, FILTER_SUB_QUERY_TO_CORRELATE, AGGREGATE_VALUES"
+!sub-plan "FILTER_SUB_QUERY_TO_CORRELATE, AGGREGATE_VALUES"
 
 # End aggregate-constants.iq