Fix configureCompression method for FileSystemFactory

prestodb · Apr 29, 2019 · 785a503 · 785a503
1 parent a62bb04
commit 785a503
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java
@@ -13,6 +13,7 @@
  */
 package com.facebook.presto.hive.util;
 
+import com.facebook.presto.hadoop.FileSystemFactory;
 import com.facebook.presto.hive.HiveCompressionCodec;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.ql.io.orc.OrcFile;
@@ -23,6 +24,7 @@
 import java.util.Map;
 
 import static com.facebook.hive.orc.OrcConf.ConfVars.HIVE_ORC_COMPRESSION;
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.COMPRESSRESULT;
 import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.HIVE_ORC_DEFAULT_COMPRESS;
 import static org.apache.hadoop.io.SequenceFile.CompressionType.BLOCK;
@@ -73,8 +75,19 @@ public static JobConf toJobConf(Configuration conf)
 
     public static JobConf configureCompression(Configuration config, HiveCompressionCodec compression)
     {
-        JobConf result = new JobConf(false);
-        copy(config, result);
+        JobConf result;
+        // FileSystemFactory is used to hack around the abuse of Configuration as a
+        // cache for FileSystem. See FileSystemFactory class for more details.
+        //
+        // It is caller's responsibility to create a copy if FileSystemFactory is used.
+        if (config instanceof FileSystemFactory) {
+            checkArgument(config instanceof JobConf, "config is not an instance of JobConf: %s", config.getClass());
+            result = (JobConf) config;
+        }
+        else {
+            result = new JobConf(false);
+            copy(config, result);
+        }
         setCompressionProperties(result, compression);
         return result;
     }