fix how Filesystem is initialized. It should be based on both path an…

…d conf.
kevinweil · Sep 11, 2012 · 236f0da · 236f0da
1 parent 8dd1811
commit 236f0da
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/core/src/main/java/com/twitter/elephantbird/mapreduce/input/LzoW3CLogRecordReader.java b/core/src/main/java/com/twitter/elephantbird/mapreduce/input/LzoW3CLogRecordReader.java
@@ -8,7 +8,6 @@
 import com.twitter.elephantbird.util.W3CLogParser;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.MapWritable;
@@ -58,8 +57,8 @@ protected void createInputReader(InputStream input, Configuration conf) throws I
     in_ = new LineReader(input, conf);
 
     String fileURI = getFieldDefinitionFile();
-    FileSystem fs = FileSystem.get(URI.create(fileURI), conf);
-    InputStream is = fs.open(new Path(fileURI));
+    Path path = new Path(fileURI);
+    InputStream is = path.getFileSystem(conf).open(path);
     w3cLogParser_ = new W3CLogParser(is);
     is.close();
   }

diff --git a/core/src/main/java/com/twitter/elephantbird/mapreduce/input/RawSequenceFileRecordReader.java b/core/src/main/java/com/twitter/elephantbird/mapreduce/input/RawSequenceFileRecordReader.java
@@ -5,7 +5,6 @@
 import com.google.common.base.Preconditions;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.BytesWritable;
 import org.apache.hadoop.io.DataInputBuffer;
@@ -44,7 +43,7 @@ public void initialize(InputSplit inputSplit, TaskAttemptContext context) throws
     FileSplit fileSplit = (FileSplit) inputSplit;
     Path path = fileSplit.getPath();
     // inhibit class loading during SequenceFile.Reader initialization
-    reader = new SequenceFile.Reader(FileSystem.get(conf), path, conf) {
+    reader = new SequenceFile.Reader(path.getFileSystem(conf), path, conf) {
       @Override
       public synchronized Class<?> getKeyClass() {
         return BytesWritable.class;

diff --git a/core/src/main/java/com/twitter/elephantbird/mapreduce/io/ProtobufBlockWriter.java b/core/src/main/java/com/twitter/elephantbird/mapreduce/io/ProtobufBlockWriter.java
@@ -22,7 +22,7 @@
  * use the following code:
  * <code>
  * Configuration conf = new Configuration();
- * FileSystem fs = FileSystem.get(conf);
+ * FileSystem fs = lzoPath.getFileSystem(conf);
  * FSDataOutputStream outputStream = fs.create(lzoPath, true);
  * LzopCodec codec = new LzopCodec();
  * codec.setConf(conf);

diff --git a/pig/src/test/java/com/twitter/elephantbird/pig/store/TestSequenceFileStorage.java b/pig/src/test/java/com/twitter/elephantbird/pig/store/TestSequenceFileStorage.java
@@ -76,7 +76,7 @@ public void setUp() throws Exception {
     tempFilename = tempFile.getAbsolutePath();
     Path path = new Path("file:///" + tempFilename);
     Configuration conf = new Configuration();
-    FileSystem fs = FileSystem.get(path.toUri(), conf);
+    FileSystem fs = path.getFileSystem(conf);
     IntWritable key = new IntWritable();
     Text value = new Text();
     SequenceFile.Writer writer = null;

diff --git a/pig/src/test/java/com/twitter/elephantbird/pig/util/AbstractTestWritableConverter.java b/pig/src/test/java/com/twitter/elephantbird/pig/util/AbstractTestWritableConverter.java
@@ -107,7 +107,7 @@ public void setup() throws IOException {
     tempFilename = tempFile.getAbsolutePath();
     final Path path = new Path("file:///" + tempFilename);
     final Configuration conf = new Configuration();
-    final FileSystem fs = FileSystem.get(path.toUri(), conf);
+    final FileSystem fs = path.getFileSystem(conf);
     final IntWritable key = new IntWritable();
     SequenceFile.Writer writer = null;
     try {