Java-Exec Now Passing. Fixed precision errors in JDBC plugin

Author: cgivre

contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMSSQL.java

@@ -207,14 +207,16 @@ public void testExpressionsWithoutAlias() throws Exception {
 
     DirectRowSet results = queryBuilder().sql(sql).rowSet();
 
+    // Calcite 1.35: COUNT(*) returns BIGINT, integer expressions return INT, SQRT returns DOUBLE
+    // Types are REQUIRED not OPTIONAL for literals and aggregates
     TupleMetadata expectedSchema = new SchemaBuilder()
-      .addNullable("EXPR$0", MinorType.INT, 10)
-      .addNullable("EXPR$1", MinorType.INT, 10)
-      .addNullable("EXPR$2", MinorType.FLOAT8, 15)
+      .add("EXPR$0", MinorType.BIGINT)
+      .add("EXPR$1", MinorType.INT)
+      .add("EXPR$2", MinorType.FLOAT8)
       .build();
 
     RowSet expected = client.rowSetBuilder(expectedSchema)
-      .addRow(4L, 88L, 1.618033988749895)
+      .addRow(4L, 88, 1.618033988749895)
       .build();
 
     RowSetUtilities.verify(expected, results);

contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithMySQLIT.java

@@ -277,7 +277,8 @@ public void testExpressionsWithoutAlias() throws Exception {
         .sqlQuery(query)
         .unOrdered()
         .baselineColumns("EXPR$0", "EXPR$1", "EXPR$2")
-        .baselineValues(4L, 88, BigDecimal.valueOf(1.618033988749895))
+        // Calcite 1.35: SQRT returns DOUBLE, so (1+sqrt(5))/2 returns DOUBLE not DECIMAL
+        .baselineValues(4L, 88, 1.618033988749895)
         .go();
   }
 
@@ -290,7 +291,8 @@ public void testExpressionsWithoutAliasesPermutations() throws Exception {
         .sqlQuery(query)
         .ordered()
         .baselineColumns("EXPR$1", "EXPR$0", "EXPR$2")
-        .baselineValues(BigDecimal.valueOf(1.618033988749895), 88, 4L)
+        // Calcite 1.35: SQRT returns DOUBLE, so (1+sqrt(5))/2 returns DOUBLE not DECIMAL
+        .baselineValues(1.618033988749895, 88, 4L)
         .go();
   }
 

contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestJdbcPluginWithPostgres.java

@@ -190,14 +190,16 @@ public void testExpressionsWithoutAlias() throws Exception {
 
     DirectRowSet results = queryBuilder().sql(sql).rowSet();
 
+    // Calcite 1.35: COUNT(*) returns BIGINT, integer expressions return INT, SQRT returns DOUBLE
+    // Types are REQUIRED not OPTIONAL for literals and aggregates
     TupleMetadata expectedSchema = new SchemaBuilder()
-      .addNullable("EXPR$0", MinorType.BIGINT, 19)
-      .addNullable("EXPR$1", MinorType.INT, 10)
-      .addNullable("EXPR$2", MinorType.FLOAT8, 17, 17)
+      .add("EXPR$0", MinorType.BIGINT)
+      .add("EXPR$1", MinorType.INT)
+      .add("EXPR$2", MinorType.FLOAT8)
       .build();
 
     RowSet expected = client.rowSetBuilder(expectedSchema)
-      .addRow(4L, 88L, 1.618033988749895)
+      .addRow(4L, 88, 1.618033988749895)
       .build();
 
     RowSetUtilities.verify(expected, results);