XX

Author: Joe-Abraham

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/ContainerQueryRunner.java

@@ -37,14 +37,14 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.logging.Logger;
@@ -102,6 +102,7 @@ public ContainerQueryRunner(int coordinatorPort, String catalog, String schema,
         try {
             Connection connection = DriverManager.getConnection(url, "test", null);
             statement = connection.createStatement();
+            statement.execute("set session remote_functions_enabled=true");
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -286,9 +287,9 @@ public Session getDefaultSession()
     public MaterializedResult execute(Session session, String sql)
     {
         try {
+            ResultSet resultSet = statement.executeQuery(sql);
             return ContainerQueryRunnerUtils
-                    .toMaterializedResult(
-                            statement.executeQuery(sql));
+                    .toMaterializedResult(resultSet);
         }
         catch (SQLException e) {
             throw new RuntimeException("Error executing query: " + sql, e);

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/ContainerQueryRunnerUtils.java

@@ -359,11 +359,10 @@ private static Type mapSqlTypeToType(int sqlType)
             case java.sql.Types.VARCHAR:
                 return VarcharType.VARCHAR;
             case java.sql.Types.DOUBLE:
+            case java.sql.Types.FLOAT:
                 return DoubleType.DOUBLE;
             case java.sql.Types.BOOLEAN:
                 return BooleanType.BOOLEAN;
-            case java.sql.Types.FLOAT:
-                return DoubleType.DOUBLE;
             case java.sql.Types.TIMESTAMP:
                 return TimestampType.TIMESTAMP;
             case java.sql.Types.DATE:

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/TestPrestoContainerRemoteFunction.java

@@ -17,7 +17,6 @@
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
 public class TestPrestoContainerRemoteFunction
         extends AbstractTestQueryFramework
@@ -35,17 +34,6 @@ protected ContainerQueryRunner createQueryRunner()
     @Test
     public void testPresenceAndBasicFunctionality()
     {
-        assertTrue(
-                computeActual("SHOW catalogs").toString().contains("tpch"),
-                "tpch catalog is not present.");
-        System.out.println(computeActual("set session remote_functions_enabled=true").toString());
-        assertEquals(computeActual("select remote.default.abs(-10)").toString(),"10");
-    }
-
-    @Test
-    public void testPresenceAndBasicFunctionality1()
-    {
-        System.out.println(computeActual("SHOW catalogs").toString());
-        assertEquals(computeActual("select remote.default.abs(-10)").getMaterializedRows().toString(),"10");
+        assertEquals(computeActual("select remote.default.abs(-10)").getMaterializedRows().get(0).getField(0).toString(), "10");
     }
 }