Adjust testing Arrow connector name to arrow-flight

Author: BryanCutler

presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/ArrowFlightQueryRunner.java

@@ -27,6 +27,7 @@
 
 import java.io.File;
 import java.util.Map;
+import java.util.Optional;
 
 import static com.facebook.presto.testing.TestingSession.testSessionBuilder;
 
@@ -53,11 +54,15 @@ private static DistributedQueryRunner createQueryRunner(
             throws Exception
     {
         Session session = testSessionBuilder()
-                .setCatalog("arrow")
+                .setCatalog("arrowflight")
                 .setSchema("tpch")
                 .build();
 
-        DistributedQueryRunner queryRunner = DistributedQueryRunner.builder(session).setExtraProperties(extraProperties).build();
+        DistributedQueryRunner.Builder queryRunnerBuilder = DistributedQueryRunner.builder(session);
+        Optional<Integer> workerCount = getProperty("WORKER_COUNT").map(Integer::parseInt);
+        workerCount.ifPresent(queryRunnerBuilder::setNodeCount);
+
+        DistributedQueryRunner queryRunner = queryRunnerBuilder.setExtraProperties(extraProperties).build();
 
         try {
             queryRunner.installPlugin(new TestingArrowFlightPlugin());
@@ -69,7 +74,7 @@ private static DistributedQueryRunner createQueryRunner(
                     .put("arrow-flight.server-ssl-certificate", "src/test/resources/server.crt")
                     .put("arrow-flight.server.verify", "true");
 
-            queryRunner.createCatalog("arrow", "arrow", properties.build());
+            queryRunner.createCatalog("arrowflight", "arrow-flight", properties.build());
 
             return queryRunner;
         }
@@ -78,6 +83,19 @@ private static DistributedQueryRunner createQueryRunner(
         }
     }
 
+    private static Optional<String> getProperty(String name)
+    {
+        String systemPropertyValue = System.getProperty(name);
+        if (systemPropertyValue != null) {
+            return Optional.of(systemPropertyValue);
+        }
+        String environmentVariableValue = System.getenv(name);
+        if (environmentVariableValue != null) {
+            return Optional.of(environmentVariableValue);
+        }
+        return Optional.empty();
+    }
+
     public static void main(String[] args)
             throws Exception
     {

presto-base-arrow-flight/src/test/java/com/facebook/plugin/arrow/testingConnector/TestingArrowFlightPlugin.java

@@ -21,6 +21,6 @@ public class TestingArrowFlightPlugin
 {
     public TestingArrowFlightPlugin()
     {
-        super("arrow", new TestingArrowModule(), new JsonModule());
+        super("arrow-flight", new TestingArrowModule(), new JsonModule());
     }
 }