accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/6] git commit: ACCUMULO-1866 Add missing deprecation annotations
Date Thu, 21 Nov 2013 22:41:26 GMT
ACCUMULO-1866 Add missing deprecation annotations


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

Branch: refs/heads/master
Commit: de8ecd4a71cb7fda3525798c7e658c8f65efe6c2
Parents: 32b5aee
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Nov 21 16:13:19 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Nov 21 16:13:19 2013 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/Instance.java   |  26 +-
 .../accumulo/core/client/mock/MockInstance.java |  37 +-
 .../core/client/impl/TabletLocatorImplTest.java | 755 ++++++++++---------
 .../accumulo/server/client/HdfsZooInstance.java |  67 +-
 4 files changed, 445 insertions(+), 440 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/de8ecd4a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index ab8ca19..2cf2632 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -34,42 +34,42 @@ public interface Instance {
    * @return location in "hostname:port" form
    */
   public abstract String getRootTabletLocation();
-  
+
   /**
    * Returns the location(s) of the accumulo master and any redundant servers.
    * 
    * @return a list of locations in "hostname:port" form
    */
   public abstract List<String> getMasterLocations();
-  
+
   /**
    * Returns a unique string that identifies this instance of accumulo.
    * 
    * @return a UUID
    */
   public abstract String getInstanceID();
-  
+
   /**
    * Returns the instance name given at system initialization time.
    * 
    * @return current instance name
    */
   public abstract String getInstanceName();
-  
+
   /**
    * Returns a comma-separated list of zookeeper servers the instance is using.
    * 
    * @return the zookeeper servers this instance is using in "hostname:port" form
    */
   public abstract String getZooKeepers();
-  
+
   /**
    * Returns the zookeeper connection timeout.
    * 
    * @return the configured timeout to connect to zookeeper
    */
   public abstract int getZooKeepersSessionTimeOut();
-  
+
   /**
    * Returns a connection to accumulo.
    * 
@@ -86,7 +86,7 @@ public interface Instance {
    */
   @Deprecated
   public abstract Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException;
-  
+
   /**
    * Returns a connection to accumulo.
    * 
@@ -103,7 +103,7 @@ public interface Instance {
    */
   @Deprecated
   public abstract Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException;
-  
+
   /**
    * Returns a connection to this instance of accumulo.
    * 
@@ -124,18 +124,20 @@ public interface Instance {
   /**
    * Closes up the instance to free up all associated resources. You should try to reuse an Instance as much as you can because there is some location caching
    * stored which will enhance performance.
-   * @throws AccumuloException 
+   * 
+   * @throws AccumuloException
    */
   public abstract void close() throws AccumuloException;
-  
+
   /**
    * Returns the AccumuloConfiguration to use when interacting with this instance.
    * 
    * @return the AccumuloConfiguration that specifies properties related to interacting with this instance
    * @deprecated since 1.6.0
    */
+  @Deprecated
   public abstract AccumuloConfiguration getConfiguration();
-  
+
   /**
    * Set the AccumuloConfiguration to use when interacting with this instance.
    * 
@@ -145,7 +147,7 @@ public interface Instance {
    */
   @Deprecated
   public abstract void setConfiguration(AccumuloConfiguration conf);
-  
+
   /**
    * Returns a connection to this instance of accumulo.
    * 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/de8ecd4a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
index 5b7dcbf..837cf99 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
@@ -51,17 +51,17 @@ import org.apache.hadoop.io.Text;
  */
 
 public class MockInstance implements Instance {
-  
+
   static final String genericAddress = "localhost:1234";
   static final Map<String,MockAccumulo> instances = new HashMap<String,MockAccumulo>();
   MockAccumulo acu;
   String instanceName;
-  
+
   public MockInstance() {
     acu = new MockAccumulo(getDefaultFileSystem());
     instanceName = "mock-instance";
   }
-  
+
   static FileSystem getDefaultFileSystem() {
     try {
       Configuration conf = CachedConfiguration.getInstance();
@@ -72,11 +72,11 @@ public class MockInstance implements Instance {
       throw new RuntimeException(ex);
     }
   }
-  
+
   public MockInstance(String instanceName) {
     this(instanceName, getDefaultFileSystem());
   }
-  
+
   public MockInstance(String instanceName, FileSystem fs) {
     synchronized (instances) {
       if (instances.containsKey(instanceName))
@@ -86,70 +86,71 @@ public class MockInstance implements Instance {
     }
     this.instanceName = instanceName;
   }
-  
+
   @Override
   public String getRootTabletLocation() {
     return genericAddress;
   }
-  
+
   @Override
   public List<String> getMasterLocations() {
     return Collections.singletonList(genericAddress);
   }
-  
+
   @Override
   public String getInstanceID() {
     return "mock-instance-id";
   }
-  
+
   @Override
   public String getInstanceName() {
     return instanceName;
   }
-  
+
   @Override
   public String getZooKeepers() {
     return "localhost";
   }
-  
+
   @Override
   public int getZooKeepersSessionTimeOut() {
     return 30 * 1000;
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
     return getConnector(user, new PasswordToken(pass));
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
     return getConnector(user, ByteBufferUtil.toBytes(pass));
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
     return getConnector(user, TextUtil.getBytes(new Text(pass.toString())));
   }
-  
+
   AccumuloConfiguration conf = null;
-  
+
+  @Deprecated
   @Override
   public AccumuloConfiguration getConfiguration() {
     if (conf == null)
       conf = AccumuloConfiguration.getDefaultConfiguration();
     return conf;
   }
-  
+
   @Override
   @Deprecated
   public void setConfiguration(AccumuloConfiguration conf) {
     this.conf = conf;
   }
-  
+
   @Override
   public Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException {
     Connector conn = new MockConnector(new Credentials(principal, token), acu, this);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/de8ecd4a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index 7abacb8..bf92c57 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@ -56,103 +56,103 @@ import org.apache.accumulo.core.security.Credentials;
 import org.apache.hadoop.io.Text;
 
 public class TabletLocatorImplTest extends TestCase {
-  
+
   private static final KeyExtent RTE = RootTable.EXTENT;
   private static final KeyExtent MTE = new KeyExtent(new Text(MetadataTable.ID), null, RTE.getEndRow());
   private static Credentials credentials = null;
-  
+
   static KeyExtent nke(String t, String er, String per) {
     return new KeyExtent(new Text(t), er == null ? null : new Text(er), per == null ? null : new Text(per));
   }
-  
+
   static Range nr(String k1, boolean si, String k2, boolean ei) {
     return new Range(k1 == null ? null : new Text(k1), si, k2 == null ? null : new Text(k2), ei);
   }
-  
+
   static Range nr(String k1, String k2) {
     return new Range(k1 == null ? null : new Text(k1), k2 == null ? null : new Text(k2));
   }
-  
+
   static List<Range> nrl(Range... ranges) {
     return Arrays.asList(ranges);
   }
-  
+
   static Object[] nol(Object... objs) {
     return objs;
   }
-  
+
   @SuppressWarnings("unchecked")
   static Map<String,Map<KeyExtent,List<Range>>> createExpectedBinnings(Object... data) {
-    
+
     Map<String,Map<KeyExtent,List<Range>>> expBinnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
-    
+
     for (int i = 0; i < data.length; i += 2) {
       String loc = (String) data[i];
       Object binData[] = (Object[]) data[i + 1];
-      
+
       HashMap<KeyExtent,List<Range>> binnedKE = new HashMap<KeyExtent,List<Range>>();
-      
+
       expBinnedRanges.put(loc, binnedKE);
-      
+
       for (int j = 0; j < binData.length; j += 2) {
         KeyExtent ke = (KeyExtent) binData[j];
         List<Range> ranges = (List<Range>) binData[j + 1];
-        
+
         binnedKE.put(ke, ranges);
       }
     }
-    
+
     return expBinnedRanges;
   }
-  
+
   static TreeMap<KeyExtent,TabletLocation> createMetaCacheKE(Object... data) {
     TreeMap<KeyExtent,TabletLocation> mcke = new TreeMap<KeyExtent,TabletLocation>();
-    
+
     for (int i = 0; i < data.length; i += 2) {
       KeyExtent ke = (KeyExtent) data[i];
       String loc = (String) data[i + 1];
       mcke.put(ke, new TabletLocation(ke, loc, "1"));
     }
-    
+
     return mcke;
   }
-  
+
   static TreeMap<Text,TabletLocation> createMetaCache(Object... data) {
     TreeMap<KeyExtent,TabletLocation> mcke = createMetaCacheKE(data);
-    
+
     TreeMap<Text,TabletLocation> mc = new TreeMap<Text,TabletLocation>(TabletLocatorImpl.endRowComparator);
-    
+
     for (Entry<KeyExtent,TabletLocation> entry : mcke.entrySet()) {
       if (entry.getKey().getEndRow() == null)
         mc.put(TabletLocatorImpl.MAX_TEXT, entry.getValue());
       else
         mc.put(entry.getKey().getEndRow(), entry.getValue());
     }
-    
+
     return mc;
   }
-  
+
   static TabletLocatorImpl createLocators(TServers tservers, String rootTabLoc, String metaTabLoc, String table, TabletServerLockChecker tslc, Object... data) {
-    
+
     TreeMap<KeyExtent,TabletLocation> mcke = createMetaCacheKE(data);
-    
+
     TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
     TestInstance testInstance = new TestInstance("instance1", "tserver1");
-    
+
     RootTabletLocator rtl = new TestRootTabletLocator(testInstance);
     TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
     TabletLocatorImpl tab1TabletCache = new TabletLocatorImpl(new Text(table), rootTabletCache, ttlo, tslc);
-    
+
     setLocation(tservers, rootTabLoc, RTE, MTE, metaTabLoc);
-    
+
     for (Entry<KeyExtent,TabletLocation> entry : mcke.entrySet()) {
       setLocation(tservers, metaTabLoc, MTE, entry.getKey(), entry.getValue().tablet_location);
     }
-    
+
     return tab1TabletCache;
-    
+
   }
-  
+
   static TabletLocatorImpl createLocators(TServers tservers, String rootTabLoc, String metaTabLoc, String table, Object... data) {
     return createLocators(tservers, rootTabLoc, metaTabLoc, table, new YesLockChecker(), data);
   }
@@ -161,376 +161,377 @@ public class TabletLocatorImplTest extends TestCase {
     TServers tservers = new TServers();
     return createLocators(tservers, "tserver1", "tserver2", table, data);
   }
-  
+
   private void runTest(Text tableName, List<Range> ranges, TabletLocatorImpl tab1TabletCache, Map<String,Map<KeyExtent,List<Range>>> expected) throws Exception {
     List<Range> failures = Collections.emptyList();
     runTest(tableName, ranges, tab1TabletCache, expected, failures);
   }
-  
+
   private void runTest(Text tableName, List<Range> ranges, TabletLocatorImpl tab1TabletCache, Map<String,Map<KeyExtent,List<Range>>> expected,
       List<Range> efailures) throws Exception {
-    
+
     Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
     List<Range> f = tab1TabletCache.binRanges(credentials, ranges, binnedRanges);
     assertEquals(expected, binnedRanges);
-    
+
     HashSet<Range> f1 = new HashSet<Range>(f);
     HashSet<Range> f2 = new HashSet<Range>(efailures);
-    
+
     assertEquals(f2, f1);
   }
-  
+
   static Set<KeyExtent> nkes(KeyExtent... extents) {
     HashSet<KeyExtent> kes = new HashSet<KeyExtent>();
-    
+
     for (KeyExtent keyExtent : extents) {
       kes.add(keyExtent);
     }
-    
+
     return kes;
   }
-  
+
   static void runTest(TreeMap<Text,TabletLocation> mc, KeyExtent remove, Set<KeyExtent> expected) {
     // copy so same metaCache can be used for multiple test
-    
+
     mc = new TreeMap<Text,TabletLocation>(mc);
-    
+
     TabletLocatorImpl.removeOverlapping(mc, remove);
-    
+
     HashSet<KeyExtent> eic = new HashSet<KeyExtent>();
     for (TabletLocation tl : mc.values()) {
       eic.add(tl.tablet_extent);
     }
-    
+
     assertEquals(expected, eic);
   }
-  
+
   static Mutation nm(String row, String... data) {
     Mutation mut = new Mutation(new Text(row));
-    
+
     for (int i = 0; i < data.length; i++) {
       String[] cvp = data[i].split("=");
       String[] cols = cvp[0].split(":");
-      
+
       mut.put(new Text(cols[0]), new Text(cols[1]), new Value(cvp[1].getBytes()));
     }
-    
+
     return mut;
   }
-  
+
   static List<Mutation> nml(Mutation... ma) {
     return Arrays.asList(ma);
   }
-  
+
   private void runTest(TabletLocatorImpl metaCache, List<Mutation> ml, Map<String,Map<KeyExtent,List<String>>> emb, String... efailures) throws Exception {
     Map<String,TabletServerMutations<Mutation>> binnedMutations = new HashMap<String,TabletServerMutations<Mutation>>();
     List<Mutation> afailures = new ArrayList<Mutation>();
     metaCache.binMutations(credentials, ml, binnedMutations, afailures);
-    
+
     verify(emb, binnedMutations);
-    
+
     ArrayList<String> afs = new ArrayList<String>();
     ArrayList<String> efs = new ArrayList<String>(Arrays.asList(efailures));
-    
+
     for (Mutation mutation : afailures) {
       afs.add(new String(mutation.getRow()));
     }
-    
+
     Collections.sort(afs);
     Collections.sort(efs);
-    
+
     assertEquals(efs, afs);
-    
+
   }
-  
+
   private void verify(Map<String,Map<KeyExtent,List<String>>> expected, Map<String,TabletServerMutations<Mutation>> actual) {
     assertEquals(expected.keySet(), actual.keySet());
-    
+
     for (String server : actual.keySet()) {
       TabletServerMutations<Mutation> atb = actual.get(server);
       Map<KeyExtent,List<String>> etb = expected.get(server);
-      
+
       assertEquals(etb.keySet(), atb.getMutations().keySet());
-      
+
       for (KeyExtent ke : etb.keySet()) {
         ArrayList<String> eRows = new ArrayList<String>(etb.get(ke));
         ArrayList<String> aRows = new ArrayList<String>();
-        
+
         for (Mutation m : atb.getMutations().get(ke)) {
           aRows.add(new String(m.getRow()));
         }
-        
+
         Collections.sort(eRows);
         Collections.sort(aRows);
-        
+
         assertEquals(eRows, aRows);
       }
     }
-    
+
   }
-  
+
   static Map<String,Map<KeyExtent,List<String>>> cemb(Object[]... ols) {
-    
+
     Map<String,Map<KeyExtent,List<String>>> emb = new HashMap<String,Map<KeyExtent,List<String>>>();
-    
+
     for (Object[] ol : ols) {
       String row = (String) ol[0];
       String server = (String) ol[1];
       KeyExtent ke = (KeyExtent) ol[2];
-      
+
       Map<KeyExtent,List<String>> tb = emb.get(server);
       if (tb == null) {
         tb = new HashMap<KeyExtent,List<String>>();
         emb.put(server, tb);
       }
-      
+
       List<String> rl = tb.get(ke);
       if (rl == null) {
         rl = new ArrayList<String>();
         tb.put(ke, rl);
       }
-      
+
       rl.add(row);
     }
-    
+
     return emb;
   }
-  
+
   public void testRemoveOverlapping1() {
     TreeMap<Text,TabletLocation> mc = createMetaCache(nke("0", null, null), "l1");
-    
+
     runTest(mc, nke("0", "a", null), nkes());
     runTest(mc, nke("0", null, null), nkes());
     runTest(mc, nke("0", null, "a"), nkes());
-    
+
     mc = createMetaCache(nke("0", "g", null), "l1", nke("0", "r", "g"), "l1", nke("0", null, "r"), "l1");
     runTest(mc, nke("0", null, null), nkes());
-    
+
     runTest(mc, nke("0", "a", null), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "g", null), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "h", null), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "r", null), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "s", null), nkes());
-    
+
     runTest(mc, nke("0", "b", "a"), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "g", "a"), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "h", "a"), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "r", "a"), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "s", "a"), nkes());
-    
+
     runTest(mc, nke("0", "h", "g"), nkes(nke("0", "g", null), nke("0", null, "r")));
     runTest(mc, nke("0", "r", "g"), nkes(nke("0", "g", null), nke("0", null, "r")));
     runTest(mc, nke("0", "s", "g"), nkes(nke("0", "g", null)));
-    
+
     runTest(mc, nke("0", "i", "h"), nkes(nke("0", "g", null), nke("0", null, "r")));
     runTest(mc, nke("0", "r", "h"), nkes(nke("0", "g", null), nke("0", null, "r")));
     runTest(mc, nke("0", "s", "h"), nkes(nke("0", "g", null)));
-    
+
     runTest(mc, nke("0", "z", "f"), nkes());
     runTest(mc, nke("0", "z", "g"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", "z", "q"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", "z", "r"), nkes(nke("0", "g", null), nke("0", "r", "g")));
     runTest(mc, nke("0", "z", "s"), nkes(nke("0", "g", null), nke("0", "r", "g")));
-    
+
     runTest(mc, nke("0", null, "f"), nkes());
     runTest(mc, nke("0", null, "g"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", null, "q"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", null, "r"), nkes(nke("0", "g", null), nke("0", "r", "g")));
     runTest(mc, nke("0", null, "s"), nkes(nke("0", "g", null), nke("0", "r", "g")));
-    
+
   }
-  
+
   public void testRemoveOverlapping2() {
-    
+
     // test removes when cache does not contain all tablets in a table
     TreeMap<Text,TabletLocation> mc = createMetaCache(nke("0", "r", "g"), "l1", nke("0", null, "r"), "l1");
-    
+
     runTest(mc, nke("0", "a", null), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "g", null), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "h", null), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "r", null), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "s", null), nkes());
-    
+
     runTest(mc, nke("0", "b", "a"), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "g", "a"), nkes(nke("0", "r", "g"), nke("0", null, "r")));
     runTest(mc, nke("0", "h", "a"), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "r", "a"), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "s", "a"), nkes());
-    
+
     runTest(mc, nke("0", "h", "g"), nkes(nke("0", null, "r")));
-    
+
     mc = createMetaCache(nke("0", "g", null), "l1", nke("0", null, "r"), "l1");
-    
+
     runTest(mc, nke("0", "h", "g"), nkes(nke("0", "g", null), nke("0", null, "r")));
     runTest(mc, nke("0", "h", "a"), nkes(nke("0", null, "r")));
     runTest(mc, nke("0", "s", "g"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", "s", "a"), nkes());
-    
+
     mc = createMetaCache(nke("0", "g", null), "l1", nke("0", "r", "g"), "l1");
-    
+
     runTest(mc, nke("0", "z", "f"), nkes());
     runTest(mc, nke("0", "z", "g"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", "z", "q"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", "z", "r"), nkes(nke("0", "g", null), nke("0", "r", "g")));
     runTest(mc, nke("0", "z", "s"), nkes(nke("0", "g", null), nke("0", "r", "g")));
-    
+
     runTest(mc, nke("0", null, "f"), nkes());
     runTest(mc, nke("0", null, "g"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", null, "q"), nkes(nke("0", "g", null)));
     runTest(mc, nke("0", null, "r"), nkes(nke("0", "g", null), nke("0", "r", "g")));
     runTest(mc, nke("0", null, "s"), nkes(nke("0", "g", null), nke("0", "r", "g")));
   }
-  
+
   static class TestInstance implements Instance {
-    
+
     private final String iid;
     private String rtl;
-    
+
     public TestInstance(String iid, String rtl) {
       this.iid = iid;
       this.rtl = rtl;
     }
-    
+
     @Override
     public String getInstanceID() {
       return iid;
     }
-    
+
     @Override
     public String getInstanceName() {
       throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public List<String> getMasterLocations() {
       throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public String getRootTabletLocation() {
       return rtl;
     }
-    
+
     @Override
     public String getZooKeepers() {
       throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public int getZooKeepersSessionTimeOut() {
       throw new UnsupportedOperationException();
     }
-    
+
     public void setRootTabletLocation(String rtl) {
       this.rtl = rtl;
     }
-    
+
     @Override
     @Deprecated
     public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
       throw new UnsupportedOperationException();
     }
-    
+
     @Override
     @Deprecated
     public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
       throw new UnsupportedOperationException();
     }
-    
+
     AccumuloConfiguration conf = AccumuloConfiguration.getDefaultConfiguration();
-    
+
+    @Deprecated
     @Override
     public AccumuloConfiguration getConfiguration() {
       return conf;
     }
-    
+
     @Override
     @Deprecated
     public void setConfiguration(AccumuloConfiguration conf) {
       this.conf = conf;
     }
-    
+
     @Override
     @Deprecated
     public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
       throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException {
       throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public void close() throws AccumuloException {
       // NOOP
     }
   }
-  
+
   static class TServers {
     private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers = new HashMap<String,Map<KeyExtent,SortedMap<Key,Value>>>();
   }
-  
+
   static class TestTabletLocationObtainer implements TabletLocationObtainer {
-    
+
     private final Map<String,Map<KeyExtent,SortedMap<Key,Value>>> tservers;
-    
+
     TestTabletLocationObtainer(TServers tservers) {
       this.tservers = tservers.tservers;
     }
-    
+
     @Override
     public TabletLocations lookupTablet(Credentials credentials, TabletLocation src, Text row, Text stopRow, TabletLocator parent)
         throws AccumuloSecurityException {
-      
+
       // System.out.println("lookupTablet("+src+","+row+","+stopRow+","+ parent+")");
       // System.out.println(tservers);
 
       Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.get(src.tablet_location);
-      
+
       if (tablets == null) {
         parent.invalidateCache(src.tablet_location);
         return null;
       }
-      
+
       SortedMap<Key,Value> tabletData = tablets.get(src.tablet_extent);
-      
+
       if (tabletData == null) {
         parent.invalidateCache(src.tablet_extent);
         return null;
       }
-      
+
       // the following clip is done on a tablet, do it here to see if it throws exceptions
       src.tablet_extent.toDataRange().clip(new Range(row, true, stopRow, true));
-      
+
       Key startKey = new Key(row);
       Key stopKey = new Key(stopRow).followingKey(PartialKey.ROW);
-      
+
       SortedMap<Key,Value> results = tabletData.tailMap(startKey).headMap(stopKey);
-      
+
       return MetadataLocationObtainer.getMetadataLocationEntries(results);
     }
-    
+
     @Override
     public List<TabletLocation> lookupTablets(Credentials credentials, String tserver, Map<KeyExtent,List<Range>> map, TabletLocator parent)
         throws AccumuloSecurityException {
-      
+
       ArrayList<TabletLocation> list = new ArrayList<TabletLocation>();
-      
+
       Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.get(tserver);
-      
+
       if (tablets == null) {
         parent.invalidateCache(tserver);
         return list;
       }
-      
+
       TreeMap<Key,Value> results = new TreeMap<Key,Value>();
-      
+
       Set<Entry<KeyExtent,List<Range>>> es = map.entrySet();
       List<KeyExtent> failures = new ArrayList<KeyExtent>();
       for (Entry<KeyExtent,List<Range>> entry : es) {
         SortedMap<Key,Value> tabletData = tablets.get(entry.getKey());
-        
+
         if (tabletData == null) {
           failures.add(entry.getKey());
           continue;
@@ -542,55 +543,55 @@ public class TabletLocatorImplTest extends TestCase {
             tm = tabletData;
           else
             tm = tabletData.tailMap(range.getStartKey());
-          
+
           for (Entry<Key,Value> de : tm.entrySet()) {
             if (range.afterEndKey(de.getKey())) {
               break;
             }
-            
+
             if (range.contains(de.getKey())) {
               results.put(de.getKey(), de.getValue());
             }
           }
         }
       }
-      
+
       if (failures.size() > 0)
         parent.invalidateCache(failures);
-      
+
       return MetadataLocationObtainer.getMetadataLocationEntries(results).getLocations();
-      
+
     }
-    
+
   }
-  
+
   static class YesLockChecker implements TabletServerLockChecker {
     @Override
     public boolean isLockHeld(String tserver, String session) {
       return true;
     }
-    
+
     @Override
     public void invalidateCache(String server) {}
   }
 
   static class TestRootTabletLocator extends RootTabletLocator {
-    
+
     private Instance instance;
-    
+
     TestRootTabletLocator(Instance instance) {
       super(instance, new YesLockChecker());
       this.instance = instance;
     }
-    
+
     @Override
     protected TabletLocation getRootTabletLocation() {
       return new TabletLocation(RootTable.EXTENT, instance.getRootTabletLocation(), "1");
     }
-    
+
     @Override
     public void invalidateCache(String server) {}
-    
+
   }
 
   static void createEmptyTablet(TServers tservers, String server, KeyExtent tablet) {
@@ -599,7 +600,7 @@ public class TabletLocatorImplTest extends TestCase {
       tablets = new HashMap<KeyExtent,SortedMap<Key,Value>>();
       tservers.tservers.put(server, tablets);
     }
-    
+
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
       tabletData = new TreeMap<Key,Value>();
@@ -608,22 +609,22 @@ public class TabletLocatorImplTest extends TestCase {
       throw new RuntimeException("Asked for empty tablet, but non empty tablet exists");
     }
   }
-  
+
   static void clearLocation(TServers tservers, String server, KeyExtent tablet, KeyExtent ke, String instance) {
     Map<KeyExtent,SortedMap<Key,Value>> tablets = tservers.tservers.get(server);
     if (tablets == null) {
       return;
     }
-    
+
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
       return;
     }
-    
+
     Text mr = ke.getMetadataEntry();
     Key lk = new Key(mr, TabletsSection.CurrentLocationColumnFamily.NAME, new Text(instance));
     tabletData.remove(lk);
-    
+
   }
 
   static void setLocation(TServers tservers, String server, KeyExtent tablet, KeyExtent ke, String location, String instance) {
@@ -632,41 +633,41 @@ public class TabletLocatorImplTest extends TestCase {
       tablets = new HashMap<KeyExtent,SortedMap<Key,Value>>();
       tservers.tservers.put(server, tablets);
     }
-    
+
     SortedMap<Key,Value> tabletData = tablets.get(tablet);
     if (tabletData == null) {
       tabletData = new TreeMap<Key,Value>();
       tablets.put(tablet, tabletData);
     }
-    
+
     Text mr = ke.getMetadataEntry();
     Value per = KeyExtent.encodePrevEndRow(ke.getPrevEndRow());
-    
+
     if (location != null) {
       if (instance == null)
         instance = "";
       Key lk = new Key(mr, TabletsSection.CurrentLocationColumnFamily.NAME, new Text(instance));
       tabletData.put(lk, new Value(location.getBytes()));
     }
-    
+
     Key pk = new Key(mr, TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnFamily(),
         TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnQualifier());
     tabletData.put(pk, per);
   }
-  
+
   static void setLocation(TServers tservers, String server, KeyExtent tablet, KeyExtent ke, String location) {
     setLocation(tservers, server, tablet, ke, location, "");
   }
-  
+
   static void deleteServer(TServers tservers, String server) {
     tservers.tservers.remove(server);
-    
+
   }
-  
+
   private void locateTabletTest(TabletLocatorImpl cache, String row, boolean skipRow, KeyExtent expected, String server, Credentials credentials)
       throws Exception {
     TabletLocation tl = cache.locateTablet(credentials, new Text(row), skipRow, false);
-    
+
     if (expected == null) {
       if (tl != null)
         System.out.println("tl = " + tl);
@@ -677,37 +678,37 @@ public class TabletLocatorImplTest extends TestCase {
       assertEquals(expected, tl.tablet_extent);
     }
   }
-  
+
   private void locateTabletTest(TabletLocatorImpl cache, String row, KeyExtent expected, String server, Credentials credentials) throws Exception {
     locateTabletTest(cache, row, false, expected, server, credentials);
   }
-  
+
   public void test1() throws Exception {
     TServers tservers = new TServers();
     TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
     TestInstance testInstance = new TestInstance("instance1", "tserver1");
-    
+
     RootTabletLocator rtl = new TestRootTabletLocator(testInstance);
     TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
     TabletLocatorImpl tab1TabletCache = new TabletLocatorImpl(new Text("tab1"), rootTabletCache, ttlo, new YesLockChecker());
-    
+
     locateTabletTest(tab1TabletCache, "r1", null, null, credentials);
-    
+
     KeyExtent tab1e = nke("tab1", null, null);
-    
+
     setLocation(tservers, "tserver1", RTE, MTE, "tserver2");
     setLocation(tservers, "tserver2", MTE, tab1e, "tserver3");
-    
+
     locateTabletTest(tab1TabletCache, "r1", tab1e, "tserver3", credentials);
     locateTabletTest(tab1TabletCache, "r2", tab1e, "tserver3", credentials);
-    
+
     // simulate a split
     KeyExtent tab1e1 = nke("tab1", "g", null);
     KeyExtent tab1e2 = nke("tab1", null, "g");
-    
+
     setLocation(tservers, "tserver2", MTE, tab1e1, "tserver4");
     setLocation(tservers, "tserver2", MTE, tab1e2, "tserver5");
-    
+
     locateTabletTest(tab1TabletCache, "r1", tab1e, "tserver3", credentials);
     tab1TabletCache.invalidateCache(tab1e);
     locateTabletTest(tab1TabletCache, "r1", tab1e2, "tserver5", credentials);
@@ -715,7 +716,7 @@ public class TabletLocatorImplTest extends TestCase {
     locateTabletTest(tab1TabletCache, "a", true, tab1e1, "tserver4", credentials);
     locateTabletTest(tab1TabletCache, "g", tab1e1, "tserver4", credentials);
     locateTabletTest(tab1TabletCache, "g", true, tab1e2, "tserver5", credentials);
-    
+
     // simulate a partial split
     KeyExtent tab1e22 = nke("tab1", null, "m");
     setLocation(tservers, "tserver2", MTE, tab1e22, "tserver6");
@@ -729,72 +730,72 @@ public class TabletLocatorImplTest extends TestCase {
     locateTabletTest(tab1TabletCache, "r1", tab1e22, "tserver6", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver7", credentials);
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver4", credentials);
-    
+
     // simulate a migration
     setLocation(tservers, "tserver2", MTE, tab1e21, "tserver8");
     tab1TabletCache.invalidateCache(tab1e21);
     locateTabletTest(tab1TabletCache, "r1", tab1e22, "tserver6", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver8", credentials);
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver4", credentials);
-    
+
     // simulate a server failure
     setLocation(tservers, "tserver2", MTE, tab1e21, "tserver9");
     tab1TabletCache.invalidateCache("tserver8");
     locateTabletTest(tab1TabletCache, "r1", tab1e22, "tserver6", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver9", credentials);
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver4", credentials);
-    
+
     // simulate all servers failing
     deleteServer(tservers, "tserver1");
     deleteServer(tservers, "tserver2");
     tab1TabletCache.invalidateCache("tserver4");
     tab1TabletCache.invalidateCache("tserver6");
     tab1TabletCache.invalidateCache("tserver9");
-    
+
     locateTabletTest(tab1TabletCache, "r1", null, null, credentials);
     locateTabletTest(tab1TabletCache, "h", null, null, credentials);
     locateTabletTest(tab1TabletCache, "a", null, null, credentials);
-    
+
     testInstance.setRootTabletLocation("tserver4");
     setLocation(tservers, "tserver4", RTE, MTE, "tserver5");
     setLocation(tservers, "tserver5", MTE, tab1e1, "tserver1");
     setLocation(tservers, "tserver5", MTE, tab1e21, "tserver2");
     setLocation(tservers, "tserver5", MTE, tab1e22, "tserver3");
-    
+
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver1", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver2", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver3", credentials);
-    
+
     // simulate the !METADATA table splitting
     KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), tab1e21.getMetadataEntry(), RTE.getEndRow());
     KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), null, tab1e21.getMetadataEntry());
-    
+
     setLocation(tservers, "tserver4", RTE, mte1, "tserver5");
     setLocation(tservers, "tserver4", RTE, mte2, "tserver6");
     deleteServer(tservers, "tserver5");
     setLocation(tservers, "tserver5", mte1, tab1e1, "tserver7");
     setLocation(tservers, "tserver5", mte1, tab1e21, "tserver8");
     setLocation(tservers, "tserver6", mte2, tab1e22, "tserver9");
-    
+
     tab1TabletCache.invalidateCache(tab1e1);
     tab1TabletCache.invalidateCache(tab1e21);
     tab1TabletCache.invalidateCache(tab1e22);
-    
+
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver7", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver8", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9", credentials);
-    
+
     // simulate metadata and regular server down and the reassigned
     deleteServer(tservers, "tserver5");
     tab1TabletCache.invalidateCache("tserver7");
     locateTabletTest(tab1TabletCache, "a", null, null, credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver8", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9", credentials);
-    
+
     setLocation(tservers, "tserver4", RTE, mte1, "tserver10");
     setLocation(tservers, "tserver10", mte1, tab1e1, "tserver7");
     setLocation(tservers, "tserver10", mte1, tab1e21, "tserver8");
-    
+
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver7", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver8", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9", credentials);
@@ -803,465 +804,465 @@ public class TabletLocatorImplTest extends TestCase {
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver2", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver8", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9", credentials);
-    
+
     // simulate a hole in the !METADATA table, caused by a partial split
     KeyExtent mte11 = new KeyExtent(new Text(MetadataTable.ID), tab1e1.getMetadataEntry(), RTE.getEndRow());
     KeyExtent mte12 = new KeyExtent(new Text(MetadataTable.ID), tab1e21.getMetadataEntry(), tab1e1.getMetadataEntry());
     deleteServer(tservers, "tserver10");
     setLocation(tservers, "tserver4", RTE, mte12, "tserver10");
     setLocation(tservers, "tserver10", mte12, tab1e21, "tserver12");
-    
+
     // at this point should be no info in !METADATA about tab1e1
     tab1TabletCache.invalidateCache(tab1e1);
     tab1TabletCache.invalidateCache(tab1e21);
     locateTabletTest(tab1TabletCache, "a", null, null, credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver12", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9", credentials);
-    
+
     setLocation(tservers, "tserver4", RTE, mte11, "tserver5");
     setLocation(tservers, "tserver5", mte11, tab1e1, "tserver13");
-    
+
     locateTabletTest(tab1TabletCache, "a", tab1e1, "tserver13", credentials);
     locateTabletTest(tab1TabletCache, "h", tab1e21, "tserver12", credentials);
     locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9", credentials);
   }
-  
+
   public void test2() throws Exception {
     TServers tservers = new TServers();
     TabletLocatorImpl metaCache = createLocators(tservers, "tserver1", "tserver2", "foo");
-    
+
     KeyExtent ke1 = nke("foo", "m", null);
     KeyExtent ke2 = nke("foo", null, "m");
-    
+
     setLocation(tservers, "tserver2", MTE, ke1, null);
     setLocation(tservers, "tserver2", MTE, ke2, "L1");
-    
+
     locateTabletTest(metaCache, "a", null, null, credentials);
     locateTabletTest(metaCache, "r", ke2, "L1", credentials);
-    
+
     setLocation(tservers, "tserver2", MTE, ke1, "L2");
-    
+
     locateTabletTest(metaCache, "a", ke1, "L2", credentials);
     locateTabletTest(metaCache, "r", ke2, "L1", credentials);
   }
-  
+
   public void testBinRanges1() throws Exception {
     Text tableName = new Text("foo");
-    
+
     TabletLocatorImpl metaCache = createLocators("foo", nke("foo", null, null), "l1");
-    
+
     List<Range> ranges = nrl(nr(null, null));
     Map<String,Map<KeyExtent,List<Range>>> expected = createExpectedBinnings("l1", nol(nke("foo", null, null), nrl(nr(null, null)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     ranges = nrl(nr("a", null));
     expected = createExpectedBinnings("l1", nol(nke("foo", null, null), nrl(nr("a", null)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     ranges = nrl(nr(null, "b"));
     expected = createExpectedBinnings("l1", nol(nke("foo", null, null), nrl(nr(null, "b")))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
   }
-  
+
   public void testBinRanges2() throws Exception {
-    
+
     Text tableName = new Text("foo");
-    
+
     List<Range> ranges = nrl(nr(null, null));
     TabletLocatorImpl metaCache = createLocators("foo", nke("foo", "g", null), "l1", nke("foo", null, "g"), "l2");
-    
+
     Map<String,Map<KeyExtent,List<Range>>> expected = createExpectedBinnings("l1", nol(nke("foo", "g", null), nrl(nr(null, null))), "l2",
         nol(nke("foo", null, "g"), nrl(nr(null, null)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
   }
-  
+
   public void testBinRanges3() throws Exception {
-    
+
     Text tableName = new Text("foo");
-    
+
     // test with three tablets and a range that covers the whole table
     List<Range> ranges = nrl(nr(null, null));
     TabletLocatorImpl metaCache = createLocators("foo", nke("foo", "g", null), "l1", nke("foo", "m", "g"), "l2", nke("foo", null, "m"), "l2");
-    
+
     Map<String,Map<KeyExtent,List<Range>>> expected = createExpectedBinnings("l1", nol(nke("foo", "g", null), nrl(nr(null, null))), "l2",
         nol(nke("foo", "m", "g"), nrl(nr(null, null)), nke("foo", null, "m"), nrl(nr(null, null)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     // test with three tablets where one range falls within the first tablet and last two ranges fall within the last tablet
     ranges = nrl(nr(null, "c"), nr("s", "y"), nr("z", null));
     expected = createExpectedBinnings("l1", nol(nke("foo", "g", null), nrl(nr(null, "c"))), "l2", nol(nke("foo", null, "m"), nrl(nr("s", "y"), nr("z", null)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     // test is same as above, but has an additional range that spans the first two tablets
     ranges = nrl(nr(null, "c"), nr("f", "i"), nr("s", "y"), nr("z", null));
     expected = createExpectedBinnings("l1", nol(nke("foo", "g", null), nrl(nr(null, "c"), nr("f", "i"))), "l2",
         nol(nke("foo", "m", "g"), nrl(nr("f", "i")), nke("foo", null, "m"), nrl(nr("s", "y"), nr("z", null)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     // test where start of range is not inclusive and same as tablet endrow
     ranges = nrl(nr("g", false, "m", true));
     expected = createExpectedBinnings("l2", nol(nke("foo", "m", "g"), nrl(nr("g", false, "m", true)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     // test where start of range is inclusive and same as tablet endrow
     ranges = nrl(nr("g", true, "m", true));
     expected = createExpectedBinnings("l1", nol(nke("foo", "g", null), nrl(nr("g", true, "m", true))), "l2",
         nol(nke("foo", "m", "g"), nrl(nr("g", true, "m", true)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     ranges = nrl(nr("g", true, "m", false));
     expected = createExpectedBinnings("l1", nol(nke("foo", "g", null), nrl(nr("g", true, "m", false))), "l2",
         nol(nke("foo", "m", "g"), nrl(nr("g", true, "m", false)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     ranges = nrl(nr("g", false, "m", false));
     expected = createExpectedBinnings("l2", nol(nke("foo", "m", "g"), nrl(nr("g", false, "m", false)))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
   }
-  
+
   public void testBinRanges4() throws Exception {
     Text tableName = new Text("foo");
-    
+
     List<Range> ranges = nrl(new Range(new Text("1")));
     TabletLocatorImpl metaCache = createLocators("foo", nke("foo", "0", null), "l1", nke("foo", "1", "0"), "l2", nke("foo", "2", "1"), "l3",
         nke("foo", "3", "2"), "l4", nke("foo", null, "3"), "l5");
-    
+
     Map<String,Map<KeyExtent,List<Range>>> expected = createExpectedBinnings("l2", nol(nke("foo", "1", "0"), nrl(new Range(new Text("1"))))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected);
-    
+
     Key rowColKey = new Key(new Text("3"), new Text("cf1"), new Text("cq1"));
     Range range = new Range(rowColKey, true, new Key(new Text("3")).followingKey(PartialKey.ROW), false);
-    
+
     ranges = nrl(range);
     Map<String,Map<KeyExtent,List<Range>>> expected4 = createExpectedBinnings("l4", nol(nke("foo", "3", "2"), nrl(range))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected4, nrl());
-    
+
     range = new Range(rowColKey, true, new Key(new Text("3")).followingKey(PartialKey.ROW), true);
-    
+
     ranges = nrl(range);
     Map<String,Map<KeyExtent,List<Range>>> expected5 = createExpectedBinnings("l4", nol(nke("foo", "3", "2"), nrl(range)), "l5",
         nol(nke("foo", null, "3"), nrl(range))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected5, nrl());
-    
+
     range = new Range(new Text("2"), false, new Text("3"), false);
     ranges = nrl(range);
     Map<String,Map<KeyExtent,List<Range>>> expected6 = createExpectedBinnings("l4", nol(nke("foo", "3", "2"), nrl(range))
-    
+
     );
     runTest(tableName, ranges, metaCache, expected6, nrl());
-    
+
     range = new Range(new Text("2"), true, new Text("3"), false);
     ranges = nrl(range);
     Map<String,Map<KeyExtent,List<Range>>> expected7 = createExpectedBinnings("l3", nol(nke("foo", "2", "1"), nrl(range)), "l4",
         nol(nke("foo", "3", "2"), nrl(range))
-    
+
     );
     runTest(tableName, ranges, metaCache, expected7, nrl());
-    
+
     range = new Range(new Text("2"), false, new Text("3"), true);
     ranges = nrl(range);
     Map<String,Map<KeyExtent,List<Range>>> expected8 = createExpectedBinnings("l4", nol(nke("foo", "3", "2"), nrl(range))
-    
+
     );
     runTest(tableName, ranges, metaCache, expected8, nrl());
-    
+
     range = new Range(new Text("2"), true, new Text("3"), true);
     ranges = nrl(range);
     Map<String,Map<KeyExtent,List<Range>>> expected9 = createExpectedBinnings("l3", nol(nke("foo", "2", "1"), nrl(range)), "l4",
         nol(nke("foo", "3", "2"), nrl(range))
-    
+
     );
     runTest(tableName, ranges, metaCache, expected9, nrl());
-    
+
   }
-  
+
   public void testBinRanges5() throws Exception {
     // Test binning when there is a hole in the !METADATA information
     Text tableName = new Text("foo");
-    
+
     List<Range> ranges = nrl(new Range(new Text("1")));
     TabletLocatorImpl metaCache = createLocators("foo", nke("foo", "0", null), "l1", nke("foo", "1", "0"), "l2", nke("foo", "3", "2"), "l4",
         nke("foo", null, "3"), "l5");
-    
+
     Map<String,Map<KeyExtent,List<Range>>> expected1 = createExpectedBinnings("l2", nol(nke("foo", "1", "0"), nrl(new Range(new Text("1"))))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected1);
-    
+
     ranges = nrl(new Range(new Text("2")), new Range(new Text("11")));
     Map<String,Map<KeyExtent,List<Range>>> expected2 = createExpectedBinnings();
-    
+
     runTest(tableName, ranges, metaCache, expected2, ranges);
-    
+
     ranges = nrl(new Range(new Text("1")), new Range(new Text("2")));
-    
+
     runTest(tableName, ranges, metaCache, expected1, nrl(new Range(new Text("2"))));
-    
+
     ranges = nrl(nr("0", "2"), nr("3", "4"));
     Map<String,Map<KeyExtent,List<Range>>> expected3 = createExpectedBinnings("l4", nol(nke("foo", "3", "2"), nrl(nr("3", "4"))), "l5",
         nol(nke("foo", null, "3"), nrl(nr("3", "4")))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected3, nrl(nr("0", "2")));
-    
+
     ranges = nrl(nr("0", "1"), nr("0", "11"), nr("1", "2"), nr("0", "4"), nr("2", "4"), nr("21", "4"));
     Map<String,Map<KeyExtent,List<Range>>> expected4 = createExpectedBinnings("l1", nol(nke("foo", "0", null), nrl(nr("0", "1"))), "l2",
         nol(nke("foo", "1", "0"), nrl(nr("0", "1"))), "l4", nol(nke("foo", "3", "2"), nrl(nr("21", "4"))), "l5", nol(nke("foo", null, "3"), nrl(nr("21", "4")))
-    
+
     );
-    
+
     runTest(tableName, ranges, metaCache, expected4, nrl(nr("0", "11"), nr("1", "2"), nr("0", "4"), nr("2", "4")));
   }
-  
+
   public void testBinMutations1() throws Exception {
     // one tablet table
     KeyExtent ke1 = nke("foo", null, null);
     TabletLocatorImpl metaCache = createLocators("foo", ke1, "l1");
-    
+
     List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("c", "cf1:cq1=v3", "cf1:cq2=v4"));
     Map<String,Map<KeyExtent,List<String>>> emb = cemb(nol("a", "l1", ke1), nol("c", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"));
     emb = cemb(nol("a", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("a", "cf1:cq3=v3"));
     emb = cemb(nol("a", "l1", ke1), nol("a", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
   }
-  
+
   public void testBinMutations2() throws Exception {
     // no tablets for table
     TabletLocatorImpl metaCache = createLocators("foo");
-    
+
     List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("c", "cf1:cq1=v3", "cf1:cq2=v4"));
     Map<String,Map<KeyExtent,List<String>>> emb = cemb();
     runTest(metaCache, ml, emb, "a", "c");
   }
-  
+
   public void testBinMutations3() throws Exception {
     // three tablet table
     KeyExtent ke1 = nke("foo", "h", null);
     KeyExtent ke2 = nke("foo", "t", "h");
     KeyExtent ke3 = nke("foo", null, "t");
-    
+
     TabletLocatorImpl metaCache = createLocators("foo", ke1, "l1", ke2, "l2", ke3, "l3");
-    
+
     List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("i", "cf1:cq1=v3", "cf1:cq2=v4"));
     Map<String,Map<KeyExtent,List<String>>> emb = cemb(nol("a", "l1", ke1), nol("i", "l2", ke2));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"));
     emb = cemb(nol("a", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("a", "cf1:cq3=v3"));
     emb = cemb(nol("a", "l1", ke1), nol("a", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("w", "cf1:cq3=v3"));
     emb = cemb(nol("a", "l1", ke1), nol("w", "l3", ke3));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("w", "cf1:cq3=v3"), nm("z", "cf1:cq4=v4"));
     emb = cemb(nol("a", "l1", ke1), nol("w", "l3", ke3), nol("z", "l3", ke3));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("h", "cf1:cq1=v1", "cf1:cq2=v2"), nm("t", "cf1:cq1=v1", "cf1:cq2=v2"));
     emb = cemb(nol("h", "l1", ke1), nol("t", "l2", ke2));
     runTest(metaCache, ml, emb);
   }
-  
+
   public void testBinMutations4() throws Exception {
     // three table with hole
     KeyExtent ke1 = nke("foo", "h", null);
-    
+
     KeyExtent ke3 = nke("foo", null, "t");
-    
+
     TabletLocatorImpl metaCache = createLocators("foo", ke1, "l1", ke3, "l3");
-    
+
     List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("i", "cf1:cq1=v3", "cf1:cq2=v4"));
     Map<String,Map<KeyExtent,List<String>>> emb = cemb(nol("a", "l1", ke1));
     runTest(metaCache, ml, emb, "i");
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"));
     emb = cemb(nol("a", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("a", "cf1:cq3=v3"));
     emb = cemb(nol("a", "l1", ke1), nol("a", "l1", ke1));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("w", "cf1:cq3=v3"));
     emb = cemb(nol("a", "l1", ke1), nol("w", "l3", ke3));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("w", "cf1:cq3=v3"), nm("z", "cf1:cq4=v4"));
     emb = cemb(nol("a", "l1", ke1), nol("w", "l3", ke3), nol("z", "l3", ke3));
     runTest(metaCache, ml, emb);
-    
+
     ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("w", "cf1:cq3=v3"), nm("z", "cf1:cq4=v4"), nm("t", "cf1:cq5=v5"));
     emb = cemb(nol("a", "l1", ke1), nol("w", "l3", ke3), nol("z", "l3", ke3));
     runTest(metaCache, ml, emb, "t");
   }
-  
+
   public void testBinSplit() throws Exception {
     // try binning mutations and ranges when a tablet splits
-    
+
     for (int i = 0; i < 3; i++) {
       // when i == 0 only test binning mutations
       // when i == 1 only test binning ranges
       // when i == 2 test both
-      
+
       KeyExtent ke1 = nke("foo", null, null);
       TServers tservers = new TServers();
       TabletLocatorImpl metaCache = createLocators(tservers, "tserver1", "tserver2", "foo", ke1, "l1");
-      
+
       List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("m", "cf1:cq1=v3", "cf1:cq2=v4"), nm("z", "cf1:cq1=v5"));
       Map<String,Map<KeyExtent,List<String>>> emb = cemb(nol("a", "l1", ke1), nol("m", "l1", ke1), nol("z", "l1", ke1));
       if (i == 0 || i == 2)
         runTest(metaCache, ml, emb);
-      
+
       List<Range> ranges = nrl(new Range(new Text("a")), new Range(new Text("m")), new Range(new Text("z")));
-      
+
       Map<String,Map<KeyExtent,List<Range>>> expected1 = createExpectedBinnings("l1", nol(nke("foo", null, null), ranges)
-      
+
       );
-      
+
       if (i == 1 || i == 2)
         runTest(new Text("foo"), ranges, metaCache, expected1);
-      
+
       KeyExtent ke11 = nke("foo", "n", null);
       KeyExtent ke12 = nke("foo", null, "n");
-      
+
       setLocation(tservers, "tserver2", MTE, ke12, "l2");
-      
+
       metaCache.invalidateCache(ke1);
-      
+
       emb = cemb(nol("z", "l2", ke12));
       if (i == 0 || i == 2)
         runTest(metaCache, ml, emb, "a", "m");
-      
+
       Map<String,Map<KeyExtent,List<Range>>> expected2 = createExpectedBinnings("l2", nol(nke("foo", null, "n"), nrl(new Range(new Text("z"))))
-      
+
       );
-      
+
       if (i == 1 || i == 2)
         runTest(new Text("foo"), ranges, metaCache, expected2, nrl(new Range(new Text("a")), new Range(new Text("m"))));
-      
+
       setLocation(tservers, "tserver2", MTE, ke11, "l3");
       emb = cemb(nol("a", "l3", ke11), nol("m", "l3", ke11), nol("z", "l2", ke12));
       if (i == 0 || i == 2)
         runTest(metaCache, ml, emb);
-      
+
       Map<String,Map<KeyExtent,List<Range>>> expected3 = createExpectedBinnings("l2", nol(nke("foo", null, "n"), nrl(new Range(new Text("z")))), "l3",
           nol(nke("foo", "n", null), nrl(new Range(new Text("a")), new Range(new Text("m"))))
-      
+
       );
-      
+
       if (i == 1 || i == 2)
         runTest(new Text("foo"), ranges, metaCache, expected3);
     }
   }
-  
+
   public void testBug1() throws Exception {
     // a bug that occurred while running continuous ingest
     KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), new Text("0;0bc"), RTE.getEndRow());
     KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), null, new Text("0;0bc"));
-    
+
     TServers tservers = new TServers();
     TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
     TestInstance testInstance = new TestInstance("instance1", "tserver1");
-    
+
     RootTabletLocator rtl = new TestRootTabletLocator(testInstance);
     TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
     TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl(new Text("0"), rootTabletCache, ttlo, new YesLockChecker());
-    
+
     setLocation(tservers, "tserver1", RTE, mte1, "tserver2");
     setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
-    
+
     // create two tablets that straddle a !METADATA split point
     KeyExtent ke1 = new KeyExtent(new Text("0"), new Text("0bbf20e"), null);
     KeyExtent ke2 = new KeyExtent(new Text("0"), new Text("0bc0756"), new Text("0bbf20e"));
-    
+
     setLocation(tservers, "tserver2", mte1, ke1, "tserver4");
     setLocation(tservers, "tserver3", mte2, ke2, "tserver5");
-    
+
     // look up something that comes after the last entry in mte1
     locateTabletTest(tab0TabletCache, "0bbff", ke2, "tserver5", credentials);
   }
-  
+
   public void testBug2() throws Exception {
     // a bug that occurred while running a functional test
     KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), new Text("~"), RTE.getEndRow());
     KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), null, new Text("~"));
-    
+
     TServers tservers = new TServers();
     TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
     TestInstance testInstance = new TestInstance("instance1", "tserver1");
-    
+
     RootTabletLocator rtl = new TestRootTabletLocator(testInstance);
     TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
     TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl(new Text("0"), rootTabletCache, ttlo, new YesLockChecker());
-    
+
     setLocation(tservers, "tserver1", RTE, mte1, "tserver2");
     setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
-    
+
     // create the ~ tablet so it exists
     Map<KeyExtent,SortedMap<Key,Value>> ts3 = new HashMap<KeyExtent,SortedMap<Key,Value>>();
     ts3.put(mte2, new TreeMap<Key,Value>());
     tservers.tservers.put("tserver3", ts3);
-    
+
     assertNull(tab0TabletCache.locateTablet(credentials, new Text("row_0000000000"), false, false));
-    
+
   }
-  
+
   // this test reproduces a problem where empty metadata tablets, that were created by user tablets being merged away, caused locating tablets to fail
   public void testBug3() throws Exception {
     KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;c"), RTE.getEndRow());
@@ -1269,172 +1270,172 @@ public class TabletLocatorImplTest extends TestCase {
     KeyExtent mte3 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;j"), new Text("1;f"));
     KeyExtent mte4 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;r"), new Text("1;j"));
     KeyExtent mte5 = new KeyExtent(new Text(MetadataTable.ID), null, new Text("1;r"));
-    
+
     KeyExtent ke1 = new KeyExtent(new Text("1"), null, null);
-    
+
     TServers tservers = new TServers();
     TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
     TestInstance testInstance = new TestInstance("instance1", "tserver1");
-    
+
     RootTabletLocator rtl = new TestRootTabletLocator(testInstance);
-    
+
     TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
     TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl(new Text("1"), rootTabletCache, ttlo, new YesLockChecker());
-    
+
     setLocation(tservers, "tserver1", RTE, mte1, "tserver2");
     setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
     setLocation(tservers, "tserver1", RTE, mte3, "tserver4");
     setLocation(tservers, "tserver1", RTE, mte4, "tserver5");
     setLocation(tservers, "tserver1", RTE, mte5, "tserver6");
-    
+
     createEmptyTablet(tservers, "tserver2", mte1);
     createEmptyTablet(tservers, "tserver3", mte2);
     createEmptyTablet(tservers, "tserver4", mte3);
     createEmptyTablet(tservers, "tserver5", mte4);
     setLocation(tservers, "tserver6", mte5, ke1, "tserver7");
-    
+
     locateTabletTest(tab0TabletCache, "a", ke1, "tserver7", credentials);
-    
+
   }
-  
+
   public void testAccumulo1248() throws Exception {
     TServers tservers = new TServers();
     TabletLocatorImpl metaCache = createLocators(tservers, "tserver1", "tserver2", "foo");
-    
+
     KeyExtent ke1 = nke("foo", null, null);
-    
+
     // set two locations for a tablet, this is not supposed to happen. The metadata cache should throw an exception if it sees this rather than caching one of
     // the locations.
     setLocation(tservers, "tserver2", MTE, ke1, "L1", "I1");
     setLocation(tservers, "tserver2", MTE, ke1, "L2", "I2");
-    
+
     try {
       metaCache.locateTablet(credentials, new Text("a"), false, false);
       assertTrue(false);
     } catch (Exception e) {
-      
+
     }
-    
+
   }
-  
+
   public void testLostLock() throws Exception {
-    
+
     final HashSet<String> activeLocks = new HashSet<String>();
-    
+
     TServers tservers = new TServers();
     TabletLocatorImpl metaCache = createLocators(tservers, "tserver1", "tserver2", "foo", new TabletServerLockChecker() {
       @Override
       public boolean isLockHeld(String tserver, String session) {
         return activeLocks.contains(tserver + ":" + session);
       }
-      
+
       @Override
       public void invalidateCache(String server) {}
     });
-    
+
     KeyExtent ke1 = nke("foo", null, null);
     setLocation(tservers, "tserver2", MTE, ke1, "L1", "5");
-    
+
     activeLocks.add("L1:5");
-    
+
     locateTabletTest(metaCache, "a", ke1, "L1", credentials);
     locateTabletTest(metaCache, "a", ke1, "L1", credentials);
 
     activeLocks.clear();
-    
+
     locateTabletTest(metaCache, "a", null, null, credentials);
     locateTabletTest(metaCache, "a", null, null, credentials);
     locateTabletTest(metaCache, "a", null, null, credentials);
-    
+
     clearLocation(tservers, "tserver2", MTE, ke1, "5");
     setLocation(tservers, "tserver2", MTE, ke1, "L2", "6");
-    
+
     activeLocks.add("L2:6");
-    
+
     locateTabletTest(metaCache, "a", ke1, "L2", credentials);
     locateTabletTest(metaCache, "a", ke1, "L2", credentials);
 
     clearLocation(tservers, "tserver2", MTE, ke1, "6");
-    
+
     locateTabletTest(metaCache, "a", ke1, "L2", credentials);
-    
+
     setLocation(tservers, "tserver2", MTE, ke1, "L3", "7");
 
     locateTabletTest(metaCache, "a", ke1, "L2", credentials);
-    
+
     activeLocks.clear();
-    
+
     locateTabletTest(metaCache, "a", null, null, credentials);
     locateTabletTest(metaCache, "a", null, null, credentials);
 
     activeLocks.add("L3:7");
-    
+
     locateTabletTest(metaCache, "a", ke1, "L3", credentials);
     locateTabletTest(metaCache, "a", ke1, "L3", credentials);
-    
+
     List<Mutation> ml = nml(nm("a", "cf1:cq1=v1", "cf1:cq2=v2"), nm("w", "cf1:cq3=v3"));
     Map<String,Map<KeyExtent,List<String>>> emb = cemb(nol("a", "L3", ke1), nol("w", "L3", ke1));
     runTest(metaCache, ml, emb);
 
     clearLocation(tservers, "tserver2", MTE, ke1, "7");
-    
+
     runTest(metaCache, ml, emb);
-    
+
     activeLocks.clear();
-    
+
     emb.clear();
-    
+
     runTest(metaCache, ml, emb, "a", "w");
     runTest(metaCache, ml, emb, "a", "w");
-    
+
     KeyExtent ke11 = nke("foo", "m", null);
     KeyExtent ke12 = nke("foo", null, "m");
-    
+
     setLocation(tservers, "tserver2", MTE, ke11, "L1", "8");
     setLocation(tservers, "tserver2", MTE, ke12, "L2", "9");
-    
+
     runTest(metaCache, ml, emb, "a", "w");
-    
+
     activeLocks.add("L1:8");
 
     emb = cemb(nol("a", "L1", ke11));
     runTest(metaCache, ml, emb, "w");
-    
+
     activeLocks.add("L2:9");
-    
+
     emb = cemb(nol("a", "L1", ke11), nol("w", "L2", ke12));
     runTest(metaCache, ml, emb);
-    
+
     List<Range> ranges = nrl(new Range("a"), nr("b", "o"), nr("r", "z"));
     Map<String,Map<KeyExtent,List<Range>>> expected = createExpectedBinnings("L1", nol(ke11, nrl(new Range("a"), nr("b", "o"))), "L2",
         nol(ke12, nrl(nr("b", "o"), nr("r", "z"))));
-    
+
     runTest(null, ranges, metaCache, expected);
-    
+
     activeLocks.remove("L2:9");
-    
+
     expected = createExpectedBinnings("L1", nol(ke11, nrl(new Range("a"))));
     runTest(null, ranges, metaCache, expected, nrl(nr("b", "o"), nr("r", "z")));
-    
+
     activeLocks.clear();
-    
+
     expected = createExpectedBinnings();
     runTest(null, ranges, metaCache, expected, nrl(new Range("a"), nr("b", "o"), nr("r", "z")));
-    
+
     clearLocation(tservers, "tserver2", MTE, ke11, "8");
     clearLocation(tservers, "tserver2", MTE, ke12, "9");
     setLocation(tservers, "tserver2", MTE, ke11, "L3", "10");
     setLocation(tservers, "tserver2", MTE, ke12, "L4", "11");
-    
+
     runTest(null, ranges, metaCache, expected, nrl(new Range("a"), nr("b", "o"), nr("r", "z")));
-    
+
     activeLocks.add("L3:10");
 
     expected = createExpectedBinnings("L3", nol(ke11, nrl(new Range("a"))));
     runTest(null, ranges, metaCache, expected, nrl(nr("b", "o"), nr("r", "z")));
-    
+
     activeLocks.add("L4:11");
-    
+
     expected = createExpectedBinnings("L3", nol(ke11, nrl(new Range("a"), nr("b", "o"))), "L4", nol(ke12, nrl(nr("b", "o"), nr("r", "z"))));
     runTest(null, ranges, metaCache, expected);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/de8ecd4a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
index 00714f9..0e54d5e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
@@ -52,134 +52,135 @@ import org.apache.log4j.Logger;
  * 
  */
 public class HdfsZooInstance implements Instance {
-  
+
   public static class AccumuloNotInitializedException extends RuntimeException {
     private static final long serialVersionUID = 1L;
-    
+
     public AccumuloNotInitializedException(String string) {
       super(string);
     }
   }
-  
+
   private HdfsZooInstance() {
     AccumuloConfiguration acuConf = ServerConfiguration.getSiteConfiguration();
     zooCache = new ZooCache(acuConf.get(Property.INSTANCE_ZK_HOST), (int) acuConf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT));
   }
-  
+
   private static HdfsZooInstance cachedHdfsZooInstance = null;
-  
+
   public static synchronized Instance getInstance() {
     if (cachedHdfsZooInstance == null)
       cachedHdfsZooInstance = new HdfsZooInstance();
     return cachedHdfsZooInstance;
   }
-  
+
   private static ZooCache zooCache;
   private static String instanceId = null;
   private static final Logger log = Logger.getLogger(HdfsZooInstance.class);
-  
+
   @Override
   public String getRootTabletLocation() {
     String zRootLocPath = ZooUtil.getRoot(this) + RootTable.ZROOT_TABLET_LOCATION;
-    
+
     OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zoocache.");
-    
+
     byte[] loc = zooCache.get(zRootLocPath);
-    
+
     opTimer.stop("Found root tablet at " + (loc == null ? null : new String(loc)) + " in %DURATION%");
-    
+
     if (loc == null) {
       return null;
     }
-    
+
     return new String(loc).split("\\|")[0];
   }
-  
+
   @Override
   public List<String> getMasterLocations() {
-    
+
     String masterLocPath = ZooUtil.getRoot(this) + Constants.ZMASTER_LOCK;
-    
+
     OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up master location in zoocache.");
-    
+
     byte[] loc = ZooLock.getLockData(zooCache, masterLocPath, null);
-    
+
     opTimer.stop("Found master at " + (loc == null ? null : new String(loc)) + " in %DURATION%");
-    
+
     if (loc == null) {
       return Collections.emptyList();
     }
-    
+
     return Collections.singletonList(new String(loc));
   }
-  
+
   @Override
   public String getInstanceID() {
     if (instanceId == null)
       _getInstanceID();
     return instanceId;
   }
-  
+
   private static synchronized void _getInstanceID() {
     if (instanceId == null) {
       String instanceIdFromFile = ZooUtil.getInstanceIDFromHdfs(ServerConstants.getInstanceIdLocation());
       instanceId = instanceIdFromFile;
     }
   }
-  
+
   @Override
   public String getInstanceName() {
     return ZooKeeperInstance.lookupInstanceName(zooCache, UUID.fromString(getInstanceID()));
   }
-  
+
   @Override
   public String getZooKeepers() {
     return ServerConfiguration.getSiteConfiguration().get(Property.INSTANCE_ZK_HOST);
   }
-  
+
   @Override
   public int getZooKeepersSessionTimeOut() {
     return (int) ServerConfiguration.getSiteConfiguration().getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
   }
-  
+
   @Override
   public Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException {
     return new ConnectorImpl(this, new Credentials(principal, token));
   }
-  
+
   @Deprecated
   @Override
   public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
     return getConnector(user, new PasswordToken(pass));
   }
-  
+
   @Deprecated
   @Override
   public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
     return getConnector(user, ByteBufferUtil.toBytes(pass));
   }
-  
+
   @Deprecated
   @Override
   public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
     return getConnector(user, TextUtil.getBytes(new Text(pass.toString())));
   }
-  
+
   private AccumuloConfiguration conf = null;
-  
+
+  @Deprecated
   @Override
   public AccumuloConfiguration getConfiguration() {
     if (conf == null)
       conf = new ServerConfiguration(this).getConfiguration();
     return conf;
   }
-  
+
   @Override
   @Deprecated
   public void setConfiguration(AccumuloConfiguration conf) {
     this.conf = conf;
   }
-  
+
   public static void main(String[] args) {
     Instance instance = HdfsZooInstance.getInstance();
     System.out.println("Instance Name: " + instance.getInstanceName());
@@ -196,5 +197,5 @@ public class HdfsZooInstance implements Instance {
       throw new AccumuloException("Issues closing ZooKeeper, try again");
     }
   }
-  
+
 }


Mime
View raw message