DRILL-6862: Update Calcite to 1.18.0

1. Moved Calcite dependency from profile hadoop-default to general dependency managment
2. Updated Calcite version to 1.18.0-drill-r0 and Avatica version to 1.13.0
3. Hook.REL_BUILDER_SIMPLIFY moved to static block, cause now it can't be removed (fixes DRILL-6830)
4. Removed WrappedAccessor, since it was workaround fixed in CALCITE-1408
5. Fixed setting of multiple options in TestBuilder
6. Timstampadd type inference aligned with CALCITE-2699
7. Dependency update caused 417 kB increase of jdb-all jar size, so the maxsize limit was
   increased from 39.5 to 40 MB
8. Added test into TestDrillParquetReader to ensure that DRILL-6856 was
   fixed by Calcite update

close apache/drill#1631

4 files changed, 34 insertions, 18 deletions

diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java b/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java
index 332de099d..bbcd00b0a 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java
@@ -39,13 +39,13 @@ public class TestCTASJson extends PlanTestBase {
           .sqlQuery(query)
           .ordered()
           .jsonBaselineFile("json/" + testName + ".json")
-          .optionSettingQueriesForTestQuery("alter session set store.format = 'json' ")
+          .optionSettingQueriesForTestQuery("alter session set `store.format` = 'json' ")
           .optionSettingQueriesForTestQuery("alter session set store.json.writer.skip_null_fields = true") // DEFAULT
           .build()
           .run();
     } finally {
       test("drop table " + testName + "_json");
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
       test("alter session reset store.json.writer.skip_null_fields ");
     }
   }
@@ -67,13 +67,13 @@ public class TestCTASJson extends PlanTestBase {
           .sqlQuery(query)
           .ordered()
           .jsonBaselineFile("json/" + testName + "_out.json")
-          .optionSettingQueriesForTestQuery("alter session set store.format = 'json' ")
+          .optionSettingQueriesForTestQuery("alter session set `store.format` = 'json' ")
           .optionSettingQueriesForTestQuery("alter session set store.json.writer.skip_null_fields = false") // change from DEFAULT
           .build()
           .run();
     } finally{
       test("drop table " + testName + "_json" );
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
       test("alter session reset store.json.writer.skip_null_fields ");
     }
 
@@ -96,14 +96,14 @@ public class TestCTASJson extends PlanTestBase {
           .sqlQuery(query)
           .ordered()
           .jsonBaselineFile("json/" + testName + ".json")
-          .optionSettingQueriesForTestQuery("alter session set store.format = 'json' ")
+          .optionSettingQueriesForTestQuery("alter session set `store.format` = 'json' ")
           .optionSettingQueriesForTestQuery(
               "alter session set store.json.writer.skip_null_fields = true") // DEFAULT
           .build()
           .run();
     }finally{
       test("drop table " + testName + "_json" );
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
       test("alter session reset store.json.writer.skip_null_fields ");
     }
 
@@ -126,14 +126,14 @@ public class TestCTASJson extends PlanTestBase {
           .sqlQuery(query)
           .ordered()
           .jsonBaselineFile("json/" + testName + "_out.json")
-          .optionSettingQueriesForTestQuery("alter session set store.format = 'json' ")
+          .optionSettingQueriesForTestQuery("alter session set `store.format` = 'json' ")
           .optionSettingQueriesForTestQuery(
               "alter session set store.json.writer.skip_null_fields = false") // change from DEFAULT
           .build()
           .run();
     } finally {
       test("drop table " + testName + "_json" );
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
       test("alter session reset store.json.writer.skip_null_fields ");
     }
 
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestNestedDateTimeTimestamp.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestNestedDateTimeTimestamp.java
index 6a0aa78fc..321dd538f 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestNestedDateTimeTimestamp.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestNestedDateTimeTimestamp.java
@@ -119,7 +119,7 @@ public class TestNestedDateTimeTimestamp extends BaseTestQuery {
     String query = String.format("select * from %s limit 1", DATAFILE);
     String testName = "ctas_nested_datetime";
     try {
-      test("alter session set store.format = 'json'");
+      test("alter session set `store.format` = 'json'");
       test("alter session set store.json.extended_types = false");
       test("use dfs.tmp");
       test("create table " + testName + "_json as " + query);
@@ -129,7 +129,7 @@ public class TestNestedDateTimeTimestamp extends BaseTestQuery {
       testBuilder().sqlQuery(readQuery).ordered().jsonBaselineFile("baseline_nested_datetime.json").build().run();
     } finally {
       test("drop table " + testName + "_json");
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
       test("alter session reset store.json.extended_types ");
     }
   }
@@ -142,7 +142,7 @@ public class TestNestedDateTimeTimestamp extends BaseTestQuery {
     String query = String.format("select * from %s limit 1", DATAFILE);
     String testName = "ctas_nested_datetime_extended";
     try {
-      test("alter session set store.format = 'json'");
+      test("alter session set `store.format` = 'json'");
       test("alter session set store.json.extended_types = true");
       test("use dfs.tmp");
       test("create table " + testName + "_json as " + query);
@@ -152,7 +152,7 @@ public class TestNestedDateTimeTimestamp extends BaseTestQuery {
       testBuilder().sqlQuery(readQuery).ordered().jsonBaselineFile("datetime.parquet").build().run();
     } finally {
       test("drop table " + testName + "_json");
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
       test("alter session reset store.json.extended_types ");
     }
   }
@@ -165,7 +165,7 @@ public class TestNestedDateTimeTimestamp extends BaseTestQuery {
     String query = String.format("select * from %s limit 1", DATAFILE);
     String testName = "ctas_nested_datetime_extended";
     try {
-      test("alter session set store.format = 'parquet'");
+      test("alter session set `store.format` = 'parquet'");
       test("use dfs.tmp");
       test("create table " + testName + "_parquet as " + query);
 
@@ -174,7 +174,7 @@ public class TestNestedDateTimeTimestamp extends BaseTestQuery {
       testBuilder().sqlQuery(readQuery).ordered().jsonBaselineFile("datetime.parquet").build().run();
     } finally {
       test("drop table " + testName + "_parquet");
-      test("alter session reset store.format ");
+      test("alter session reset `store.format` ");
     }
   }
 
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java
index 80fb495ba..4b5ed7ae0 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java
@@ -434,4 +434,17 @@ public class TestDrillParquetReader extends BaseTestQuery {
         .build().run();
   }
 
+  @Test // DRILL-6856
+  public void testIsTrueOrNullCondition() throws Exception {
+    testBuilder()
+        .sqlQuery("SELECT col_bln " +
+            "FROM cp.`parquetFilterPush/blnTbl/0_0_2.parquet` " +
+            "WHERE col_bln IS true OR col_bln IS null " +
+            "ORDER BY col_bln")
+        .ordered()
+        .baselineColumns("col_bln")
+        .baselineValuesForSingleColumn(true, null)
+        .go();
+  }
+
 }
diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java
index 37e05cd7c..6c4cdadb4 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/test/TestBuilder.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.drill.common.expression.LogicalExpression;
 import org.apache.drill.common.expression.SchemaPath;
@@ -70,7 +71,7 @@ public class TestBuilder {
   protected Map<SchemaPath, TypeProtos.MajorType> baselineTypeMap;
   // queries to run before the baseline or test queries, can be used to set options
   private String baselineOptionSettingQueries;
-  private String testOptionSettingQueries;
+  private String testOptionSettingQueries = "";
   // two different methods are available for comparing ordered results, the default reads all of the records
   // into giant lists of objects, like one giant on-heap batch of 'vectors'
   // this flag enables the other approach which iterates through a hyper batch for the test query results and baseline
@@ -110,7 +111,9 @@ public class TestBuilder {
     this.approximateEquality = approximateEquality;
     this.baselineTypeMap = baselineTypeMap;
     this.baselineOptionSettingQueries = baselineOptionSettingQueries;
-    this.testOptionSettingQueries = testOptionSettingQueries;
+    this.testOptionSettingQueries = StringUtils.isNotEmpty(testOptionSettingQueries)
+        ? testOptionSettingQueries.concat(" ; ")
+        : testOptionSettingQueries;
     this.highPerformanceComparison = highPerformanceComparison;
     this.expectedNumBatches = expectedNumBatches;
   }
@@ -205,12 +208,12 @@ public class TestBuilder {
    */
 
   public TestBuilder optionSettingQueriesForTestQuery(String queries) {
-    testOptionSettingQueries = queries;
+    testOptionSettingQueries += queries.concat(" ; ");
     return this;
   }
 
   public TestBuilder optionSettingQueriesForTestQuery(String query, Object... args) throws Exception {
-    testOptionSettingQueries = String.format(query, args);
+    testOptionSettingQueries += String.format(query, args).concat(" ; ");
     return this;
   }