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

1 files changed, 7 insertions, 4 deletions

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;
   }