Simplify Hive HDFS configuration

prestodb · Apr 18, 2015 · 635cc60 · 635cc60
1 parent 3527a1c
commit 635cc60
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfiguration.java b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsConfiguration.java
@@ -15,7 +15,9 @@
 
 import org.apache.hadoop.conf.Configuration;
 
+import java.net.URI;
+
 public interface HdfsConfiguration
 {
-    Configuration getConfiguration(String host);
+    Configuration getConfiguration(URI uri);
 }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HdfsEnvironment.java b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsEnvironment.java
@@ -22,9 +22,7 @@
 import javax.inject.Inject;
 
 import java.io.IOException;
-import java.net.URI;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class HdfsEnvironment
@@ -46,14 +44,7 @@ public HdfsEnvironment(HdfsConfiguration hdfsConfiguration, HiveClientConfig con
 
     public Configuration getConfiguration(Path path)
     {
-        URI uri = path.toUri();
-        if (!"hdfs".equals(uri.getScheme())) {
-            return new Configuration();
-        }
-
-        String host = uri.getHost();
-        checkArgument(host != null, "path host is null: %s", path);
-        return hdfsConfiguration.getConfiguration(host);
+        return hdfsConfiguration.getConfiguration(path.toUri());
     }
 
     public FileSystem getFileSystem(Path path)

diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveHdfsConfiguration.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveHdfsConfiguration.java
@@ -17,6 +17,8 @@
 
 import javax.inject.Inject;
 
+import java.net.URI;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class HiveHdfsConfiguration
@@ -43,9 +45,9 @@ public HiveHdfsConfiguration(HdfsConfigurationUpdater updater)
     }
 
     @Override
-    public Configuration getConfiguration(String host)
+    public Configuration getConfiguration(URI uri)
     {
-        // use the same configuration for every host
+        // use the same configuration for everything
         return hadoopConfiguration.get();
     }
 }