Move hive.metastore-timeout to ThriftHiveMetastoreConfig

presto-hive/src/main/java/io/prestosql/plugin/hive/HiveConfig.java

@@ -80,7 +80,6 @@ public class HiveConfig
 
     private long perTransactionMetastoreCacheMaximumSize = 1000;
     private HostAndPort metastoreSocksProxy;
-    private Duration metastoreTimeout = new Duration(10, TimeUnit.SECONDS);
 
     private Duration ipcPingInterval = new Duration(10, TimeUnit.SECONDS);
     private Duration dfsTimeout = new Duration(60, TimeUnit.SECONDS);
@@ -407,19 +406,6 @@ public HiveConfig setMetastoreSocksProxy(HostAndPort metastoreSocksProxy)
         return this;
     }
 
-    @NotNull
-    public Duration getMetastoreTimeout()
-    {
-        return metastoreTimeout;
-    }
-
-    @Config("hive.metastore-timeout")
-    public HiveConfig setMetastoreTimeout(Duration metastoreTimeout)
-    {
-        this.metastoreTimeout = metastoreTimeout;
-        return this;
-    }
-
     @Min(1)
     public int getMinPartitionBatchSize()
     {

presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftHiveMetastoreConfig.java

@@ -21,14 +21,31 @@
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
+import java.util.concurrent.TimeUnit;
+
 public class ThriftHiveMetastoreConfig
 {
+    private Duration metastoreTimeout = new Duration(10, TimeUnit.SECONDS);
     private int maxRetries = RetryDriver.DEFAULT_MAX_ATTEMPTS - 1;
     private double backoffScaleFactor = RetryDriver.DEFAULT_SCALE_FACTOR;
     private Duration minBackoffDelay = RetryDriver.DEFAULT_SLEEP_TIME;
     private Duration maxBackoffDelay = RetryDriver.DEFAULT_SLEEP_TIME;
     private Duration maxRetryTime = RetryDriver.DEFAULT_MAX_RETRY_TIME;
 
+
+    @NotNull
+    public Duration getMetastoreTimeout()
+    {
+        return metastoreTimeout;
+    }
+
+    @Config("hive.metastore-timeout")
+    public ThriftHiveMetastoreConfig setMetastoreTimeout(Duration metastoreTimeout)
+    {
+        this.metastoreTimeout = metastoreTimeout;
+        return this;
+    }
+
     @Min(0)
     public int getMaxRetries()
     {

presto-hive/src/main/java/io/prestosql/plugin/hive/metastore/thrift/ThriftMetastoreClientFactory.java

@@ -47,9 +47,9 @@ public ThriftMetastoreClientFactory(
     }
 
     @Inject
-    public ThriftMetastoreClientFactory(HiveConfig config, HiveMetastoreAuthentication metastoreAuthentication)
+    public ThriftMetastoreClientFactory(HiveConfig config, ThriftHiveMetastoreConfig thriftConfig, HiveMetastoreAuthentication metastoreAuthentication)
     {
-        this(Optional.empty(), Optional.ofNullable(config.getMetastoreSocksProxy()), config.getMetastoreTimeout(), metastoreAuthentication);
+        this(Optional.empty(), Optional.ofNullable(config.getMetastoreSocksProxy()), thriftConfig.getMetastoreTimeout(), metastoreAuthentication);
     }
 
     public ThriftMetastoreClient create(HostAndPort address)

presto-hive/src/test/java/io/prestosql/plugin/hive/TestHiveConfig.java

@@ -49,7 +49,6 @@ public void testDefaults()
                 .setAllowCorruptWritesForTesting(false)
                 .setPerTransactionMetastoreCacheMaximumSize(1000)
                 .setMetastoreSocksProxy(null)
-                .setMetastoreTimeout(new Duration(10, TimeUnit.SECONDS))
                 .setMinPartitionBatchSize(10)
                 .setMaxPartitionBatchSize(100)
                 .setMaxInitialSplits(200)
@@ -137,7 +136,6 @@ public void testExplicitPropertyMappings()
                 .put("hive.allow-corrupt-writes-for-testing", "true")
                 .put("hive.per-transaction-metastore-cache-maximum-size", "500")
                 .put("hive.metastore.thrift.client.socks-proxy", "localhost:1080")
-                .put("hive.metastore-timeout", "20s")
                 .put("hive.metastore.partition-batch-size.min", "1")
                 .put("hive.metastore.partition-batch-size.max", "1000")
                 .put("hive.dfs.ipc-ping-interval", "34s")
@@ -222,7 +220,6 @@ public void testExplicitPropertyMappings()
                 .setAllowCorruptWritesForTesting(true)
                 .setPerTransactionMetastoreCacheMaximumSize(500)
                 .setMetastoreSocksProxy(HostAndPort.fromParts("localhost", 1080))
-                .setMetastoreTimeout(new Duration(20, TimeUnit.SECONDS))
                 .setMinPartitionBatchSize(1)
                 .setMaxPartitionBatchSize(1000)
                 .setMaxInitialSplits(10)

presto-hive/src/test/java/io/prestosql/plugin/hive/metastore/thrift/TestThriftHiveMetastoreConfig.java

@@ -18,6 +18,7 @@
 import org.testng.annotations.Test;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static io.airlift.configuration.testing.ConfigAssertions.assertFullMapping;
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
@@ -30,6 +31,7 @@ public class TestThriftHiveMetastoreConfig
     public void testDefaults()
     {
         assertRecordedDefaults(recordDefaults(ThriftHiveMetastoreConfig.class)
+                .setMetastoreTimeout(new Duration(10, TimeUnit.SECONDS))
                 .setMaxRetries(9)
                 .setBackoffScaleFactor(2.0)
                 .setMinBackoffDelay(new Duration(1, SECONDS))
@@ -41,6 +43,7 @@ public void testDefaults()
     public void testExplicitPropertyMappings()
     {
         Map<String, String> properties = new ImmutableMap.Builder<String, String>()
+                .put("hive.metastore-timeout", "20s")
                 .put("hive.metastore.thrift.client.max-retries", "15")
                 .put("hive.metastore.thrift.client.backoff-scale-factor", "3.0")
                 .put("hive.metastore.thrift.client.min-backoff-delay", "2s")
@@ -49,6 +52,7 @@ public void testExplicitPropertyMappings()
                 .build();
 
         ThriftHiveMetastoreConfig expected = new ThriftHiveMetastoreConfig()
+                .setMetastoreTimeout(new Duration(20, TimeUnit.SECONDS))
                 .setMaxRetries(15)
                 .setBackoffScaleFactor(3.0)
                 .setMinBackoffDelay(new Duration(2, SECONDS))

presto-hive/src/test/java/io/prestosql/plugin/hive/metastore/thrift/TestingMetastoreLocator.java

@@ -36,6 +36,6 @@ public TestingMetastoreLocator(HiveConfig config, String host, int port)
     public ThriftMetastoreClient createMetastoreClient()
             throws TException
     {
-        return new ThriftMetastoreClientFactory(config, new NoHiveMetastoreAuthentication()).create(address);
+        return new ThriftMetastoreClientFactory(config, new ThriftHiveMetastoreConfig(), new NoHiveMetastoreAuthentication()).create(address);
     }
 }