Use OkHttp for CLI and JDBC driver

pom.xml

@@ -51,6 +51,7 @@
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
         <dep.slice.version>0.29</dep.slice.version>
         <dep.aws-sdk.version>1.11.30</dep.aws-sdk.version>
+        <dep.okhttp.version>3.8.1</dep.okhttp.version>
         <dep.tempto.version>1.31</dep.tempto.version>
         <dep.testng.version>6.10</dep.testng.version>
         <dep.nifty.version>0.15.1</dep.nifty.version>
@@ -631,6 +632,18 @@
                 <version>2.78</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${dep.okhttp.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>mockwebserver</artifactId>
+                <version>${dep.okhttp.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.facebook.swift</groupId>
                 <artifactId>swift-annotations</artifactId>

presto-benchmark-driver/pom.xml

@@ -72,6 +72,11 @@
             <artifactId>commons-math3</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
         <!-- for testing -->
         <dependency>
             <groupId>org.testng</groupId>

presto-benchmark-driver/src/main/java/com/facebook/presto/benchmark/driver/BenchmarkQueryRunner.java

@@ -15,7 +15,6 @@
 
 import com.facebook.presto.client.ClientSession;
 import com.facebook.presto.client.QueryError;
-import com.facebook.presto.client.QueryResults;
 import com.facebook.presto.client.StatementClient;
 import com.facebook.presto.client.StatementStats;
 import com.google.common.base.Throwables;
@@ -28,8 +27,8 @@
 import io.airlift.http.client.JsonResponseHandler;
 import io.airlift.http.client.Request;
 import io.airlift.http.client.jetty.JettyHttpClient;
-import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
+import okhttp3.OkHttpClient;
 
 import java.io.Closeable;
 import java.net.URI;
@@ -39,6 +38,7 @@
 
 import static com.facebook.presto.benchmark.driver.BenchmarkQueryResult.failResult;
 import static com.facebook.presto.benchmark.driver.BenchmarkQueryResult.passResult;
+import static com.facebook.presto.client.OkHttpUtil.setupSocksProxy;
 import static com.google.common.base.Preconditions.checkArgument;
 import static io.airlift.http.client.HttpUriBuilder.uriBuilderFrom;
 import static io.airlift.http.client.JsonResponseHandler.createJsonResponseHandler;
@@ -59,8 +59,8 @@ public class BenchmarkQueryRunner
     private final int maxFailures;
 
     private final HttpClient httpClient;
+    private final OkHttpClient okHttpClient;
     private final List<URI> nodes;
-    private final JsonCodec<QueryResults> queryResultsCodec;
 
     private int failures;
 
@@ -77,8 +77,6 @@ public BenchmarkQueryRunner(int warm, int runs, boolean debug, int maxFailures,
 
         this.debug = debug;
 
-        this.queryResultsCodec = jsonCodec(QueryResults.class);
-
         requireNonNull(socksProxy, "socksProxy is null");
         HttpClientConfig httpClientConfig = new HttpClientConfig();
         if (socksProxy.isPresent()) {
@@ -87,6 +85,10 @@ public BenchmarkQueryRunner(int warm, int runs, boolean debug, int maxFailures,
 
         this.httpClient = new JettyHttpClient(httpClientConfig.setConnectTimeout(new Duration(10, TimeUnit.SECONDS)));
 
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        setupSocksProxy(builder, socksProxy);
+        this.okHttpClient = builder.build();
+
         nodes = getAllNodes(requireNonNull(serverUri, "serverUri is null"));
     }
 
@@ -149,7 +151,7 @@ public List<String> getSchemas(ClientSession session)
         failures = 0;
         while (true) {
             // start query
-            StatementClient client = new StatementClient(httpClient, queryResultsCodec, session, "show schemas");
+            StatementClient client = new StatementClient(okHttpClient, session, "show schemas");
 
             // read query output
             ImmutableList.Builder<String> schemas = ImmutableList.builder();
@@ -190,7 +192,7 @@ public List<String> getSchemas(ClientSession session)
     private StatementStats execute(ClientSession session, String name, String query)
     {
         // start query
-        StatementClient client = new StatementClient(httpClient, queryResultsCodec, session, query);
+        StatementClient client = new StatementClient(okHttpClient, session, query);
 
         // read query output
         while (client.isValid() && client.advance()) {

presto-cli/pom.xml

@@ -37,16 +37,6 @@
             <artifactId>concurrent</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>http-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>log</artifactId>
@@ -87,6 +77,11 @@
             <artifactId>opencsv</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
         <!-- for testing -->
         <dependency>
             <groupId>org.testng</groupId>

presto-cli/src/main/java/com/facebook/presto/cli/ClientOptions.java

@@ -18,10 +18,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.HostAndPort;
 import io.airlift.airline.Option;
-import io.airlift.http.client.spnego.KerberosConfig;
 import io.airlift.units.Duration;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.CharsetEncoder;
@@ -146,22 +144,6 @@ public ClientSession toClientSession()
                 clientRequestTimeout);
     }
 
-    public KerberosConfig toKerberosConfig()
-    {
-        KerberosConfig config = new KerberosConfig();
-        if (krb5ConfigPath != null) {
-            config.setConfig(new File(krb5ConfigPath));
-        }
-        if (krb5KeytabPath != null) {
-            config.setKeytab(new File(krb5KeytabPath));
-        }
-        if (krb5CredentialCachePath != null) {
-            config.setCredentialCache(new File(krb5CredentialCachePath));
-        }
-        config.setUseCanonicalHostname(!krb5DisableRemoteServiceHostnameCanonicalization);
-        return config;
-    }
-
     public static URI parseServer(String server)
     {
         server = server.toLowerCase(ENGLISH);

presto-cli/src/main/java/com/facebook/presto/cli/Console.java

@@ -27,7 +27,6 @@
 import com.google.common.io.Files;
 import io.airlift.airline.Command;
 import io.airlift.airline.HelpOption;
-import io.airlift.http.client.spnego.KerberosConfig;
 import io.airlift.log.Logging;
 import io.airlift.log.LoggingConfiguration;
 import io.airlift.units.Duration;
@@ -94,7 +93,6 @@ public class Console
     public void run()
     {
         ClientSession session = clientOptions.toClientSession();
-        KerberosConfig kerberosConfig = clientOptions.toKerberosConfig();
         boolean hasQuery = !Strings.isNullOrEmpty(clientOptions.execute);
         boolean isFromFile = !Strings.isNullOrEmpty(clientOptions.file);
 
@@ -125,7 +123,7 @@ public void run()
         AtomicBoolean exiting = new AtomicBoolean();
         interruptThreadOnExit(Thread.currentThread(), exiting);
 
-        try (QueryRunner queryRunner = QueryRunner.create(
+        try (QueryRunner queryRunner = new QueryRunner(
                 session,
                 Optional.ofNullable(clientOptions.socksProxy),
                 Optional.ofNullable(clientOptions.keystorePath),
@@ -136,8 +134,11 @@ public void run()
                 clientOptions.password ? Optional.of(getPassword()) : Optional.empty(),
                 Optional.ofNullable(clientOptions.krb5Principal),
                 Optional.ofNullable(clientOptions.krb5RemoteServiceName),
-                clientOptions.authenticationEnabled,
-                kerberosConfig)) {
+                Optional.ofNullable(clientOptions.krb5ConfigPath),
+                Optional.ofNullable(clientOptions.krb5KeytabPath),
+                Optional.ofNullable(clientOptions.krb5CredentialCachePath),
+                !clientOptions.krb5DisableRemoteServiceHostnameCanonicalization,
+                clientOptions.authenticationEnabled)) {
             if (hasQuery) {
                 executeCommand(queryRunner, query, clientOptions.outputFormat);
             }