accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject git commit: ACCUMULO-1820 Suppress compiler warnings where applicable.
Date Tue, 29 Oct 2013 15:59:00 GMT
Updated Branches:
  refs/heads/master cc7b7ef69 -> 9f0af20ad


ACCUMULO-1820 Suppress compiler warnings where applicable.

Introduces a DistributedCacheHelper to avoid class-wide warning
suppressions. Modify invocations of Path.makeQualified as the
non-deprecated variant also exists in hadoop1


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9f0af20a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9f0af20a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9f0af20a

Branch: refs/heads/master
Commit: 9f0af20ad2a4ddfd25a448b1a75c142ac0ed6c3e
Parents: cc7b7ef
Author: Josh Elser <elserj@apache.org>
Authored: Tue Oct 29 11:58:02 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Oct 29 11:58:02 2013 -0400

----------------------------------------------------------------------
 .../core/client/admin/TableOperationsImpl.java  |  4 +-
 .../lib/partition/RangePartitioner.java         |  6 +--
 .../mapreduce/lib/util/ConfiguratorBase.java    |  5 +--
 .../lib/util/DistributedCacheHelper.java        | 40 ++++++++++++++++++++
 .../accumulo/core/file/map/MapFileUtil.java     |  2 +
 .../mapreduce/AccumuloFileOutputFormatTest.java | 31 ++++++++-------
 .../mapreduce/AccumuloInputFormatTest.java      |  8 +++-
 .../AccumuloMultiTableInputFormatTest.java      |  3 +-
 .../mapreduce/AccumuloOutputFormatTest.java     |  4 +-
 .../mapreduce/AccumuloRowInputFormatTest.java   |  3 +-
 .../core/client/mapreduce/TokenFileTest.java    |  1 +
 .../lib/partition/RangePartitionerTest.java     |  1 +
 .../user/TransformingIteratorTest.java          |  1 -
 .../simple/filedata/CharacterHistogram.java     |  1 +
 .../examples/simple/mapreduce/NGramIngest.java  |  3 +-
 .../examples/simple/mapreduce/RegexExample.java |  3 +-
 .../examples/simple/mapreduce/RowHash.java      |  1 +
 .../examples/simple/mapreduce/TableToFile.java  |  1 +
 .../simple/mapreduce/TeraSortIngest.java        |  1 +
 .../simple/mapreduce/UniqueColumns.java         |  3 +-
 .../examples/simple/mapreduce/WordCount.java    |  3 +-
 .../mapreduce/bulk/BulkIngestExample.java       |  1 +
 .../simple/filedata/ChunkInputFormatTest.java   |  3 +-
 .../minicluster/MiniAccumuloCluster.java        |  1 +
 .../server/gc/GarbageCollectWriteAheadLogs.java |  4 +-
 .../server/master/tableOps/BulkImport.java      |  6 ++-
 .../accumulo/server/metanalysis/FilterMeta.java |  3 +-
 .../accumulo/server/metanalysis/IndexMeta.java  |  3 +-
 .../accumulo/server/tabletserver/Tablet.java    |  6 ++-
 .../server/tabletserver/log/LogSorter.java      |  2 +
 .../server/tabletserver/log/MultiReader.java    |  1 +
 .../apache/accumulo/server/util/Initialize.java |  2 +
 .../accumulo/server/util/MetadataTableUtil.java |  4 +-
 .../accumulo/server/util/TabletOperations.java  | 13 +++++--
 .../tabletserver/log/MultiReaderTest.java       | 16 +++++---
 .../tabletserver/log/SortedLogRecoveryTest.java |  1 +
 .../vfs/providers/HdfsFileObject.java           |  4 +-
 .../apache/accumulo/test/AccumuloDFSBase.java   |  1 +
 .../test/continuous/ContinuousMoru.java         |  3 +-
 .../test/continuous/ContinuousVerify.java       |  3 +-
 .../performance/scan/CollectTabletStats.java    |  4 +-
 .../test/randomwalk/multitable/CopyTool.java    |  1 +
 .../randomwalk/sequential/MapRedVerifyTool.java |  1 +
 .../test/randomwalk/shard/BulkInsert.java       |  1 +
 .../test/randomwalk/shard/SortTool.java         |  1 +
 .../test/functional/AccumuloInputFormatIT.java  |  1 +
 46 files changed, 159 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
index d9319ff..1b652f9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
@@ -1101,7 +1101,9 @@ public class TableOperationsImpl extends TableOperationsHelper {
     
     return ranges;
   }
-  
+
+  // TODO Remove deprecation warning surppression when Hadoop1 support is dropped
+  @SuppressWarnings("deprecation")
   private Path checkPath(String dir, String kind, String type) throws IOException, AccumuloException {
     Path ret;
     FileSystem fs;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index 920bd5b..bdea610 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -25,10 +25,10 @@ import java.util.Arrays;
 import java.util.Scanner;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.client.mapreduce.lib.util.DistributedCacheHelper;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
@@ -81,7 +81,7 @@ public class RangePartitioner extends Partitioner<Text,Writable> implements Conf
   private synchronized Text[] getCutPoints() throws IOException {
     if (cutPointArray == null) {
       String cutFileName = conf.get(CUTFILE_KEY);
-      Path[] cf = DistributedCache.getLocalCacheFiles(conf);
+      Path[] cf = DistributedCacheHelper.getLocalCacheFiles(conf);
       
       if (cf != null) {
         for (Path path : cf) {
@@ -120,7 +120,7 @@ public class RangePartitioner extends Partitioner<Text,Writable> implements Conf
    */
   public static void setSplitFile(Job job, String file) {
     URI uri = new Path(file).toUri();
-    DistributedCache.addCacheFile(uri, job.getConfiguration());
+    DistributedCacheHelper.addCacheFile(uri, job.getConfiguration());
     job.getConfiguration().set(CUTFILE_KEY, uri.getPath());
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
index 73405c5..4f8cdb6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -31,7 +31,6 @@ import org.apache.accumulo.core.security.Credentials;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -154,7 +153,7 @@ public class ConfiguratorBase {
     ArgumentChecker.notNull(principal, tokenFile);
 
     try {
-      DistributedCache.addCacheFile(new URI(tokenFile), conf);
+      DistributedCacheHelper.addCacheFile(new URI(tokenFile), conf);
     } catch (URISyntaxException e) {
       throw new IllegalStateException("Unable to add tokenFile \"" + tokenFile + "\" to distributed cache.");
     }
@@ -234,7 +233,7 @@ public class ConfiguratorBase {
   private static AuthenticationToken getTokenFromFile(Configuration conf, String principal, String tokenFile) {
     FSDataInputStream in = null;
     try {
-      URI[] uris = DistributedCache.getCacheFiles(conf);
+      URI[] uris = DistributedCacheHelper.getCacheFiles(conf);
       Path path = null;
       for (URI u : uris) {
         if (u.toString().equals(tokenFile)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/DistributedCacheHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/DistributedCacheHelper.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/DistributedCacheHelper.java
new file mode 100644
index 0000000..20f8719
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/DistributedCacheHelper.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.client.mapreduce.lib.util;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.filecache.DistributedCache;
+import org.apache.hadoop.fs.Path;
+
+@SuppressWarnings("deprecation")
+public class DistributedCacheHelper {
+  
+  public static void addCacheFile(URI uri, Configuration conf) {
+    DistributedCache.addCacheFile(uri, conf);
+  }
+  
+  public static URI[] getCacheFiles(Configuration conf) throws IOException {
+    return DistributedCache.getCacheFiles(conf);
+  }
+  
+  public static Path[] getLocalCacheFiles(Configuration conf) throws IOException {
+    return DistributedCache.getLocalCacheFiles(conf);
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java b/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
index d776ebe..41b00d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.io.MapFile;
 import org.apache.hadoop.io.SequenceFile;
 
 public class MapFileUtil {
+  @SuppressWarnings("deprecation")
   public static MapFile.Reader openMapFile(AccumuloConfiguration acuconf, FileSystem fs, String dirName, Configuration conf) throws IOException {
     MapFile.Reader mfr = null;
     try {
@@ -36,6 +37,7 @@ public class MapFileUtil {
     }
   }
   
+  @SuppressWarnings("deprecation")
   public static SequenceFile.Reader openIndex(Configuration conf, FileSystem fs, Path mapFile) throws IOException {
     Path indexPath = new Path(mapFile, MapFile.INDEX_FILE_NAME);
     SequenceFile.Reader index = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
index 3746e5b..2a453e3 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
@@ -131,6 +131,7 @@ public class AccumuloFileOutputFormatTest {
       String pass = args[1];
       String table = args[2];
 
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
 
@@ -196,14 +197,15 @@ public class AccumuloFileOutputFormatTest {
     long d = 10l;
     String e = "snappy";
 
-    Job job = new Job();
-    AccumuloFileOutputFormat.setReplication(job, a);
-    AccumuloFileOutputFormat.setFileBlockSize(job, b);
-    AccumuloFileOutputFormat.setDataBlockSize(job, c);
-    AccumuloFileOutputFormat.setIndexBlockSize(job, d);
-    AccumuloFileOutputFormat.setCompressionType(job, e);
+    @SuppressWarnings("deprecation")
+    Job job1 = new Job();
+    AccumuloFileOutputFormat.setReplication(job1, a);
+    AccumuloFileOutputFormat.setFileBlockSize(job1, b);
+    AccumuloFileOutputFormat.setDataBlockSize(job1, c);
+    AccumuloFileOutputFormat.setIndexBlockSize(job1, d);
+    AccumuloFileOutputFormat.setCompressionType(job1, e);
 
-    AccumuloConfiguration acuconf = AccumuloFileOutputFormat.getAccumuloConfiguration(job);
+    AccumuloConfiguration acuconf = AccumuloFileOutputFormat.getAccumuloConfiguration(job1);
 
     assertEquals(7, acuconf.getCount(Property.TABLE_FILE_REPLICATION));
     assertEquals(300l, acuconf.getMemoryInBytes(Property.TABLE_FILE_BLOCK_SIZE));
@@ -217,14 +219,15 @@ public class AccumuloFileOutputFormatTest {
     d = 110l;
     e = "lzo";
 
-    job = new Job();
-    AccumuloFileOutputFormat.setReplication(job, a);
-    AccumuloFileOutputFormat.setFileBlockSize(job, b);
-    AccumuloFileOutputFormat.setDataBlockSize(job, c);
-    AccumuloFileOutputFormat.setIndexBlockSize(job, d);
-    AccumuloFileOutputFormat.setCompressionType(job, e);
+    @SuppressWarnings("deprecation")
+    Job job2 = new Job();
+    AccumuloFileOutputFormat.setReplication(job2, a);
+    AccumuloFileOutputFormat.setFileBlockSize(job2, b);
+    AccumuloFileOutputFormat.setDataBlockSize(job2, c);
+    AccumuloFileOutputFormat.setIndexBlockSize(job2, d);
+    AccumuloFileOutputFormat.setCompressionType(job2, e);
 
-    acuconf = AccumuloFileOutputFormat.getAccumuloConfiguration(job);
+    acuconf = AccumuloFileOutputFormat.getAccumuloConfiguration(job2);
 
     assertEquals(17, acuconf.getCount(Property.TABLE_FILE_REPLICATION));
     assertEquals(1300l, acuconf.getMemoryInBytes(Property.TABLE_FILE_BLOCK_SIZE));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index c9539c4..e342705 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -61,6 +61,7 @@ public class AccumuloInputFormatTest {
    */
   @Test
   public void testSetIterator() throws IOException {
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     
     IteratorSetting is = new IteratorSetting(1, "WholeRow", "org.apache.accumulo.core.iterators.WholeRowIterator");
@@ -74,6 +75,7 @@ public class AccumuloInputFormatTest {
   
   @Test
   public void testAddIterator() throws IOException {
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     
     AccumuloInputFormat.addIterator(job, new IteratorSetting(1, "WholeRow", WholeRowIterator.class));
@@ -122,6 +124,7 @@ public class AccumuloInputFormatTest {
     String value = "comma,delimited,value";
     IteratorSetting someSetting = new IteratorSetting(1, "iterator", "Iterator.class");
     someSetting.addOption(key, value);
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     AccumuloInputFormat.addIterator(job, someSetting);
     
@@ -150,6 +153,7 @@ public class AccumuloInputFormatTest {
    */
   @Test
   public void testGetIteratorSettings() throws IOException {
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     
     AccumuloInputFormat.addIterator(job, new IteratorSetting(1, "WholeRow", "org.apache.accumulo.core.iterators.WholeRowIterator"));
@@ -181,6 +185,7 @@ public class AccumuloInputFormatTest {
   
   @Test
   public void testSetRegex() throws IOException {
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     
     String regex = ">\"*%<>\'\\";
@@ -234,7 +239,8 @@ public class AccumuloInputFormatTest {
       String user = args[0];
       String pass = args[1];
       String table = args[2];
-      
+
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
index 9951367..a9bff63 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
@@ -98,6 +98,7 @@ public class AccumuloMultiTableInputFormatTest {
       String table1 = args[2];
       String table2 = args[3];
 
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
 
@@ -164,7 +165,7 @@ public class AccumuloMultiTableInputFormatTest {
    */
   @Test
   public void testInputTableConfigSerialization() throws IOException {
-
+    @SuppressWarnings("deprecation")
     Job job = new Job();
 
     InputTableConfig tableConfig = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b")))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
index 129ff0b..a0cb4e3 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
@@ -95,7 +95,8 @@ public class AccumuloOutputFormatTest {
       String pass = args[1];
       String table1 = args[2];
       String table2 = args[3];
-      
+
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
       
@@ -131,6 +132,7 @@ public class AccumuloOutputFormatTest {
   
   @Test
   public void testBWSettings() throws IOException {
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     
     // make sure we aren't testing defaults

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
index c581233..2207437 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
@@ -151,7 +151,8 @@ public class AccumuloRowInputFormatTest {
       String user = args[0];
       String pass = args[1];
       String table = args[2];
-      
+
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java
index 02c0604..fd207a1 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java
@@ -99,6 +99,7 @@ public class TokenFileTest {
       String table1 = args[2];
       String table2 = args[3];
 
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
index 5b27ff3..8fca169 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
@@ -53,6 +53,7 @@ public class RangePartitionerTest {
   }
   
   private RangePartitioner prepPartitioner(int numSubBins) throws IOException {
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     RangePartitioner.setNumSubBins(job, numSubBins);
     RangePartitioner rp = new RangePartitioner();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
index aba8761..7759c1c 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
@@ -122,7 +122,6 @@ public class TransformingIteratorTest {
   
   @Test
   public void testNoRangeScan() throws Exception {
-    @SuppressWarnings("unchecked")
     List<Class<? extends ReversingKeyTransformingIterator>> classes = Arrays.asList(ColFamReversingKeyTransformingIterator.class,
         ColQualReversingKeyTransformingIterator.class, ColVisReversingKeyTransformingIterator.class);
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
index 35c0a5b..c7b9e07 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
@@ -82,6 +82,7 @@ public class CharacterHistogram extends Configured implements Tool {
   
   @Override
   public int run(String[] args) throws Exception {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName());
     job.setJarByClass(this.getClass());
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
index cd6ca40..8c5fd19 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
@@ -71,7 +71,8 @@ public class NGramIngest extends Configured implements Tool  {
   public int run(String[] args) throws Exception {
     Opts opts = new Opts();
     opts.parseArgs(getClass().getName(), args);
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), getClass().getSimpleName());
     job.setJarByClass(getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
index 0c7d294..2980e0a 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
@@ -60,7 +60,8 @@ public class RegexExample extends Configured implements Tool {
   public int run(String[] args) throws Exception {
     Opts opts = new Opts();
     opts.parseArgs(getClass().getName(), args);
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), getClass().getSimpleName());
     job.setJarByClass(getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
index 48294d9..0a9e87e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
@@ -62,6 +62,7 @@ public class RowHash extends Configured implements Tool {
   
   @Override
   public int run(String[] args) throws Exception {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getName());
     job.setJarByClass(this.getClass());
     Opts opts = new Opts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
index 967f9b1..c1f113a 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
@@ -84,6 +84,7 @@ public class TableToFile extends Configured implements Tool {
   
   @Override
   public int run(String[] args) throws IOException, InterruptedException, ClassNotFoundException, AccumuloSecurityException {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     Opts opts = new Opts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index 34ca6f3..7a77096 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -369,6 +369,7 @@ public class TeraSortIngest extends Configured implements Tool {
   
   @Override
   public int run(String[] args) throws Exception {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), "TeraSortCloud");
     job.setJarByClass(this.getClass());
     Opts opts = new Opts();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
index 501b7e6..4b19749 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
@@ -88,7 +88,8 @@ public class UniqueColumns extends Configured implements Tool {
     opts.parseArgs(UniqueColumns.class.getName(), args);
     
     String jobName = this.getClass().getSimpleName() + "_" + System.currentTimeMillis();
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), jobName);
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
index 8242be0..80c0fd5 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
@@ -68,7 +68,8 @@ public class WordCount extends Configured implements Tool {
   public int run(String[] args) throws Exception {
     Opts opts = new Opts();
     opts.parseArgs(WordCount.class.getName(), args);
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), WordCount.class.getName());
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
index f75f11d..11660f3 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
@@ -107,6 +107,7 @@ public class BulkIngestExample extends Configured implements Tool {
     Configuration conf = getConf();
     PrintStream out = null;
     try {
+      @SuppressWarnings("deprecation")
       Job job = new Job(conf, "bulk ingest example");
       job.setJarByClass(this.getClass());
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
index e4556be..3274189 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
@@ -192,7 +192,8 @@ public class ChunkInputFormatTest extends TestCase {
       String user = args[1];
       String pass = args[2];
       String table = args[3];
-      
+
+      @SuppressWarnings("deprecation")
       Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
       job.setJarByClass(this.getClass());
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index 7deb980..1c7ad74 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -283,6 +283,7 @@ public class MiniAccumuloCluster {
    * @param config
    *          initial configuration
    */
+  @SuppressWarnings("deprecation")
   public MiniAccumuloCluster(MiniAccumuloConfig config) throws IOException {
 
     this.config = config.initialize();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
index 2aa5034..c6cb772 100644
--- a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
@@ -247,7 +247,9 @@ public class GarbageCollectWriteAheadLogs {
     }
     return count;
   }
-  
+
+  //TODO Remove deprecation warning suppression when Hadoop1 support is dropped
+  @SuppressWarnings("deprecation")
   private int scanServers(Map<Path,String> fileToServerMap) throws Exception {
     Set<String> servers = new HashSet<String>();
     for (String walDir : ServerConstants.getWalDirs()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java b/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
index e4d707d..5ef90ab 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
@@ -142,6 +142,8 @@ public class BulkImport extends MasterRepo {
   }
   
   @Override
+  //TODO Remove deprecation warning suppression when Hadoop1 support is dropped
+  @SuppressWarnings("deprecation")
   public Repo<Master> call(long tid, Master master) throws Exception {
     log.debug(" tid " + tid + " sourceDir " + sourceDir);
     
@@ -209,7 +211,9 @@ public class BulkImport extends MasterRepo {
       UtilWaitThread.sleep(3000);
     }
   }
-  
+
+  //TODO Remove deprecation warning suppression when Hadoop1 support is dropped
+  @SuppressWarnings("deprecation")
   private String prepareBulkImport(VolumeManager fs, String dir, String tableId) throws IOException {
     Path bulkDir = createNewBulkDir(fs, tableId);
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java
index 9e55e08..8cdafcd 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java
@@ -62,7 +62,8 @@ public class FilterMeta extends Configured implements Tool {
   public int run(String[] args) throws Exception {
     
     String jobName = this.getClass().getSimpleName() + "_" + System.currentTimeMillis();
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), jobName);
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
index 6f9f96f..3b04367 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
@@ -128,7 +128,8 @@ public class IndexMeta extends Configured implements Tool {
     opts.parseArgs(IndexMeta.class.getName(), args);
     
     String jobName = this.getClass().getSimpleName() + "_" + System.currentTimeMillis();
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), jobName);
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
index ca0df8d..7719bac 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
@@ -1124,7 +1124,8 @@ public class Tablet {
     
     if (extent.isRootTablet()) { // the meta0 tablet
       Path location = new Path(ServerConstants.getRootTabletDir());
-      location = location.makeQualified(fs.getDefaultVolume());
+      FileSystem defaultVolume = fs.getDefaultVolume();
+      location = location.makeQualified(defaultVolume.getUri(), defaultVolume.getWorkingDirectory());
       // cleanUpFiles() has special handling for delete. files
       FileStatus[] files = fs.listStatus(location);
       Collection<String> goodPaths = cleanUpFiles(fs, files, true);
@@ -1257,7 +1258,8 @@ public class Tablet {
     } else {
       locationPath = fs.getFullPath(FileType.TABLE, extent.getTableId().toString() + location.toString());
     }
-    this.location = locationPath.makeQualified(fs.getFileSystemByPath(locationPath));
+    FileSystem fsForPath = fs.getFileSystemByPath(locationPath);
+    this.location = locationPath.makeQualified(fsForPath.getUri(), fsForPath.getWorkingDirectory());
     this.lastLocation = lastLocation;
     this.tabletDirectory = location.toString();
     this.conf = conf;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
index a630e5a..377677e 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
@@ -161,6 +161,8 @@ public class LogSorter {
     private void writeBuffer(String destPath, ArrayList<Pair<LogFileKey,LogFileValue>> buffer, int part) throws IOException {
       Path path = new Path(destPath, String.format("part-r-%05d", part++));
       FileSystem ns = fs.getFileSystemByPath(path);
+      
+      @SuppressWarnings("deprecation")
       MapFile.Writer output = new MapFile.Writer(ns.getConf(), ns, path.toString(), LogFileKey.class, LogFileValue.class);
       try {
         Collections.sort(buffer, new Comparator<Pair<LogFileKey,LogFileValue>>() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
index 77ddc66..2ab894e 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
@@ -87,6 +87,7 @@ public class MultiReader {
   
   private PriorityBuffer heap = new PriorityBuffer();
   
+  @SuppressWarnings("deprecation")
   public MultiReader(VolumeManager fs, Path directory) throws IOException {
     boolean foundFinish = false;
     for (FileStatus child : fs.listStatus(directory)) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
index 6562595..7c93d5c 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
@@ -212,6 +212,8 @@ public class Initialize {
     return result;
   }
   
+  //TODO Remove deprecation warning suppression when Hadoop1 support is dropped
+  @SuppressWarnings("deprecation")
   private static void initFileSystem(Opts opts, VolumeManager fs, UUID uuid) throws IOException {
     FileStatus fstat;
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 43b8e32..a77f1f8 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -87,6 +87,7 @@ import org.apache.accumulo.server.security.SystemCredentials;
 import org.apache.accumulo.server.zookeeper.ZooLock;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.DataInputBuffer;
 import org.apache.hadoop.io.DataOutputBuffer;
@@ -810,7 +811,8 @@ public class MetadataTableUtil {
     if (extent.isRootTablet()) {
       getRootLogEntries(result);
       Path rootDir = new Path(ServerConstants.getRootTabletDir());
-      rootDir = fs.getDefaultVolume().makeQualified(rootDir);
+      FileSystem defaultVolume = fs.getDefaultVolume();
+      rootDir = rootDir.makeQualified(defaultVolume.getUri(), defaultVolume.getWorkingDirectory());
       FileStatus[] files = fs.listStatus(rootDir);
       for (FileStatus fileStatus : files) {
         if (fileStatus.getPath().toString().endsWith("_tmp")) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/main/java/org/apache/accumulo/server/util/TabletOperations.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/TabletOperations.java b/server/src/main/java/org/apache/accumulo/server/util/TabletOperations.java
index 8dac384..58b8a52 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/TabletOperations.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/TabletOperations.java
@@ -24,6 +24,7 @@ import org.apache.accumulo.server.ServerConstants;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
 import org.apache.accumulo.server.tabletserver.UniqueNameAllocator;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
@@ -43,16 +44,20 @@ public class TabletOperations {
         if (endRow == null) {
           lowDirectory = Constants.DEFAULT_TABLET_LOCATION;
           Path lowDirectoryPath = new Path(volume + "/" + tableId + "/" + lowDirectory);
-          if (fs.exists(lowDirectoryPath) || fs.mkdirs(lowDirectoryPath))
-            return lowDirectoryPath.makeQualified(fs.getFileSystemByPath(lowDirectoryPath)).toString();
+          if (fs.exists(lowDirectoryPath) || fs.mkdirs(lowDirectoryPath)) {
+            FileSystem pathFs = fs.getFileSystemByPath(lowDirectoryPath);
+            return lowDirectoryPath.makeQualified(pathFs.getUri(), pathFs.getWorkingDirectory()).toString();
+          }
           log.warn("Failed to create " + lowDirectoryPath + " for unknown reason");
         } else {
           lowDirectory = "/" + Constants.GENERATED_TABLET_DIRECTORY_PREFIX + namer.getNextName();
           Path lowDirectoryPath = new Path(volume + "/" + tableId + "/" +  lowDirectory);
           if (fs.exists(lowDirectoryPath))
             throw new IllegalStateException("Dir exist when it should not " + lowDirectoryPath);
-          if (fs.mkdirs(lowDirectoryPath))
-            return lowDirectoryPath.makeQualified(fs.getFileSystemByPath(lowDirectoryPath)).toString();
+          if (fs.mkdirs(lowDirectoryPath)) {
+            FileSystem lowDirectoryFs = fs.getFileSystemByPath(lowDirectoryPath);
+            return lowDirectoryPath.makeQualified(lowDirectoryFs.getUri(), lowDirectoryFs.getWorkingDirectory()).toString();
+          }
         }
       } catch (IOException e) {
         log.warn(e);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/test/java/org/apache/accumulo/server/tabletserver/log/MultiReaderTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/tabletserver/log/MultiReaderTest.java b/server/src/test/java/org/apache/accumulo/server/tabletserver/log/MultiReaderTest.java
index d35ff35..f358572 100644
--- a/server/src/test/java/org/apache/accumulo/server/tabletserver/log/MultiReaderTest.java
+++ b/server/src/test/java/org/apache/accumulo/server/tabletserver/log/MultiReaderTest.java
@@ -53,19 +53,23 @@ public class MultiReaderTest {
     fs.mkdirs(root);
     fs.create(new Path(root, "finished")).close();
     FileSystem ns = fs.getDefaultVolume();
-    Writer writer = new Writer(ns.getConf(), ns, new Path(root, "odd").toString(), IntWritable.class, BytesWritable.class);
+    
+    @SuppressWarnings("deprecation")
+    Writer oddWriter = new Writer(ns.getConf(), ns, new Path(root, "odd").toString(), IntWritable.class, BytesWritable.class);
     BytesWritable value = new BytesWritable("someValue".getBytes());
     for (int i = 1; i < 1000; i += 2) {
-      writer.append(new IntWritable(i), value);
+      oddWriter.append(new IntWritable(i), value);
     }
-    writer.close();
-    writer = new Writer(ns.getConf(), ns, new Path(root, "even").toString(), IntWritable.class, BytesWritable.class);
+    oddWriter.close();
+    
+    @SuppressWarnings("deprecation")
+    Writer evenWriter = new Writer(ns.getConf(), ns, new Path(root, "even").toString(), IntWritable.class, BytesWritable.class);
     for (int i = 0; i < 1000; i += 2) {
       if (i == 10)
         continue;
-      writer.append(new IntWritable(i), value);
+      evenWriter.append(new IntWritable(i), value);
     }
-    writer.close();
+    evenWriter.close();
   }
 
   @After

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/server/src/test/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecoveryTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecoveryTest.java b/server/src/test/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecoveryTest.java
index 62c9f37..9fafc49 100644
--- a/server/src/test/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecoveryTest.java
+++ b/server/src/test/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecoveryTest.java
@@ -125,6 +125,7 @@ public class SortedLogRecoveryTest {
       for (Entry<String,KeyValue[]> entry : logs.entrySet()) {
         String path = workdir + "/" + entry.getKey();
         FileSystem ns = fs.getFileSystemByPath(new Path(path));
+        @SuppressWarnings("deprecation")
         Writer map = new MapFile.Writer(ns.getConf(), ns, path + "/log1", LogFileKey.class, LogFileValue.class);
         for (KeyValue lfe : entry.getValue()) {
           map.append(lfe.key, lfe.value);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
index dfc8a6b..2cb0d5f 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
@@ -166,7 +166,9 @@ public class HdfsFileObject extends AbstractFileObject
     /**
      * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetType()
      */
-    @Override
+    @Override  
+    //TODO Remove deprecation warning suppression when Hadoop1 support is dropped
+    @SuppressWarnings("deprecation")
     protected FileType doGetType() throws Exception
     {
         try

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
----------------------------------------------------------------------
diff --git a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
index be3f0ac..4548422 100644
--- a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
+++ b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
@@ -35,6 +35,7 @@ import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
+@SuppressWarnings("deprecation")
 public class AccumuloDFSBase {
 
   // Turn off the MiniDFSCluster logging

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
index 585dc90..6ef6c4f 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
@@ -130,7 +130,8 @@ public class ContinuousMoru extends Configured implements Tool {
     Opts opts = new Opts();
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     opts.parseArgs(ContinuousMoru.class.getName(), args, bwOpts);
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 1ace774..51f4478 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -179,7 +179,8 @@ public class ContinuousVerify extends Configured implements Tool {
   public int run(String[] args) throws Exception {
     Opts opts = new Opts();
     opts.parseArgs(this.getClass().getName(), args);
-    
+
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index d40cf73..9a9cad7 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -384,7 +384,9 @@ public class CollectTabletStats {
   private static List<FileRef> getTabletFiles(Credentials credentials, Instance zki, String tableId, KeyExtent ke) throws IOException {
     return new ArrayList<FileRef>(MetadataTableUtil.getDataFileSizes(ke, credentials).keySet());
   }
-  
+
+  //TODO Remove deprecation warning suppression when Hadoop1 support is dropped
+  @SuppressWarnings("deprecation")
   private static void reportHdfsBlockLocations(List<FileRef> files) throws Exception {
     VolumeManager fs = VolumeManagerImpl.get();
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
index c31c02b..e104c99 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
@@ -46,6 +46,7 @@ public class CopyTool extends Configured implements Tool {
   
   @Override
   public int run(String[] args) throws Exception {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName());
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
index eb45966..6c7cc63 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java
@@ -77,6 +77,7 @@ public class MapRedVerifyTool extends Configured implements Tool {
   
   @Override
   public int run(String[] args) throws Exception {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName());
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
index b3bbb15..0331552 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
@@ -51,6 +51,7 @@ public class BulkInsert extends Test {
     
     SequenceFile.Writer writer;
     
+    @SuppressWarnings("deprecation")
     SeqfileBatchWriter(Configuration conf, FileSystem fs, String file) throws IOException {
       writer = new SequenceFile.Writer(fs, conf, new Path(file), Key.class, Value.class);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java
index 48a8142..17af89e 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java
@@ -45,6 +45,7 @@ public class SortTool extends Configured implements Tool {
   }
   
   public int run(String[] args) throws Exception {
+    @SuppressWarnings("deprecation")
     Job job = new Job(getConf(), this.getClass().getSimpleName());
     job.setJarByClass(this.getClass());
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f0af20a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index f2b3527..d38536a 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -61,6 +61,7 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
     getConnector().tableOperations().create(table);
     insertData(table, currentTimeMillis());
 
+    @SuppressWarnings("deprecation")
     Job job = new Job();
     AccumuloInputFormat.setInputTableName(job, table);
     AccumuloInputFormat.setZooKeeperInstance(job, getConnector().getInstance().getInstanceName(), getConnector().getInstance().getZooKeepers());


Mime
View raw message