Author: ecn Date: Tue May 7 19:24:58 2013 New Revision: 1480034 URL: http://svn.apache.org/r1480034 Log: ACCUMULO-1381 applying Drew Farris's patch
Modified: accumulo/branches/1.5/ (props changed) accumulo/branches/1.5/assemble/ (props changed) accumulo/branches/1.5/core/ (props changed) accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java accumulo/branches/1.5/examples/ (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/1.5/server/ (props changed) accumulo/branches/1.5/src/ (props changed) Propchange: accumulo/branches/1.5/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1480033 Merged /accumulo/branches/1.4:r1480033 Propchange: accumulo/branches/1.5/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/assemble:r1480033 Merged /accumulo/branches/1.4/assemble:r1480033 Propchange: accumulo/branches/1.5/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/core:r1480033 Merged /accumulo/branches/1.4/src/core:r1480033 Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java?rev=1480034&r1=1480033&r2=1480034&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java Tue May 7 19:24:58 2013 @@ -48,7 +48,8 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") - FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); + FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); + FileSystem localFs = FileSystem.getLocal(conf); Opts opts = new Opts(); opts.parseArgs(PrintInfo.class.getName(), args); if (opts.files.isEmpty()) { @@ -63,6 +64,7 @@ public class PrintInfo { for (String arg : opts.files) { Path path = new Path(arg); + FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local CachableBlockFile.Reader _rdr = new CachableBlockFile.Reader(fs, path, conf, null, null); Reader iter = new RFile.Reader(_rdr); Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java?rev=1480034&r1=1480033&r2=1480034&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Tue May 7 19:24:58 2013 @@ -56,8 +56,10 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") - FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); + FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); + FileSystem localFs = FileSystem.getLocal(conf); Path path = new Path(args[0]); + FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local printMetaBlockInfo(conf, fs, path); } } Propchange: accumulo/branches/1.5/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/examples:r1480033 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480033 Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480033 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1480033 Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1480033 Propchange: accumulo/branches/1.5/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/server:r1480033 Merged /accumulo/branches/1.4/src/server:r1480033 Propchange: accumulo/branches/1.5/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4/src:r1480033 Merged /accumulo/branches/1.4/src/src:r1480033