accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-3204 Remove unused code
Date Fri, 17 Apr 2015 22:02:53 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 956a50ecb -> a194c0b00


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index f1ba8dc..9bc37d8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -32,7 +32,6 @@ import java.util.TimerTask;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
 public class FileSystemMonitor {
@@ -109,17 +108,6 @@ public class FileSystemMonitor {
 
   }
 
-  protected void logAsync(final Level level, final String msg, final Exception e) {
-    Runnable r = new Runnable() {
-      @Override
-      public void run() {
-        log.log(level, msg, e);
-      }
-    };
-
-    new Thread(r).start();
-  }
-
   protected void checkMounts(String procFile) throws Exception {
     List<Mount> mounts = parse(procFile);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 0c0ecc0..0e2a2e7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -211,11 +211,6 @@ public class MetadataTableUtil {
     update(context, lock, m, extent);
   }
 
-  public static void updateTabletPrevEndRow(KeyExtent extent, ClientContext context) {
-    Mutation m = extent.getPrevRowUpdateMutation(); //
-    update(context, m, extent);
-  }
-
   public static void updateTabletVolumes(KeyExtent extent, List<LogEntry> logsToRemove, List<LogEntry> logsToAdd, List<FileRef> filesToRemove,
       SortedMap<FileRef,DataFileValue> filesToAdd, String newDir, ZooLock zooLock, AccumuloServerContext context) {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index e5a2add..138d6f7 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -99,8 +99,6 @@ public class RestoreZookeeper {
   }
 
   static class Opts extends Help {
-    @Parameter(names = {"-z", "--keepers"})
-    String keepers = "localhost:2181";
     @Parameter(names = "--overwrite")
     boolean overwrite = false;
     @Parameter(names = "--file")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/base/src/main/java/org/apache/accumulo/server/util/time/RelativeTime.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/RelativeTime.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/RelativeTime.java
index bc48b10..3b4ada9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/RelativeTime.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/RelativeTime.java
@@ -33,10 +33,6 @@ public class RelativeTime extends BaseRelativeTime {
     return instance;
   }
 
-  public static void setInstance(BaseRelativeTime newInstance) {
-    instance = newInstance;
-  }
-
   public static long currentTimeMillis() {
     return getInstance().currentTime();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
index cbe021a..0a40432 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
@@ -51,16 +51,6 @@ public class SimpleTimer {
   private static final int DEFAULT_THREAD_POOL_SIZE = 1;
 
   /**
-   * Gets the timer instance.
-   *
-   * @deprecated Use {@link #getInstance(AccumuloConfiguration)} instead to get the configured number of threads.
-   */
-  @Deprecated
-  public static synchronized SimpleTimer getInstance() {
-    return getInstance(null);
-  }
-
-  /**
    * Gets the timer instance. If an instance has already been created, it will have the number of threads supplied when it was constructed, and the size
    * provided here is ignored.
    *

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java
index aca9c82..9550197 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.server.zookeeper;
 
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
 import org.apache.zookeeper.Watcher;
 
 public class ZooCache extends org.apache.accumulo.fate.zookeeper.ZooCache {
@@ -29,7 +27,4 @@ public class ZooCache extends org.apache.accumulo.fate.zookeeper.ZooCache {
     super(ZooReaderWriter.getInstance(), watcher);
   }
 
-  public ZooCache(AccumuloConfiguration conf, Watcher watcher) {
-    super(conf.get(Property.INSTANCE_ZK_HOST), (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT), watcher);
-  }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index ffa59cd..037023a 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -745,8 +745,6 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa
     return runtime.totalMemory() - runtime.freeMemory() > CANDIDATE_MEMORY_PERCENTAGE * runtime.maxMemory();
   }
 
-  final static String METADATA_TABLE_DIR = "/" + MetadataTable.ID;
-
   private static void putMarkerDeleteMutation(final String delete, final BatchWriter writer) throws MutationsRejectedException {
     Mutation m = new Mutation(MetadataSchema.DeletesSection.getRowPrefix() + delete);
     m.putDelete(EMPTY_TEXT, EMPTY_TEXT);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 49d2780..ba977a7 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -104,13 +104,10 @@ public class Monitor {
   private static final int REFRESH_TIME = 5;
   private static long lastRecalc = 0L;
   private static double totalIngestRate = 0.0;
-  private static double totalIngestByteRate = 0.0;
   private static double totalQueryRate = 0.0;
   private static double totalScanRate = 0.0;
-  private static double totalQueryByteRate = 0.0;
   private static long totalEntries = 0L;
   private static int totalTabletCount = 0;
-  private static int onlineTabletCount = 0;
   private static long totalHoldTime = 0;
   private static long totalLookups = 0;
   private static int totalTables = 0;
@@ -140,7 +137,6 @@ public class Monitor {
   private static final List<Pair<Long,Double>> loadOverTime = Collections.synchronizedList(new MaxList<Double>(MAX_TIME_PERIOD));
   private static final List<Pair<Long,Double>> ingestRateOverTime = Collections.synchronizedList(new MaxList<Double>(MAX_TIME_PERIOD));
   private static final List<Pair<Long,Double>> ingestByteRateOverTime = Collections.synchronizedList(new MaxList<Double>(MAX_TIME_PERIOD));
-  private static final List<Pair<Long,Integer>> recoveriesOverTime = Collections.synchronizedList(new MaxList<Integer>(MAX_TIME_PERIOD));
   private static final List<Pair<Long,Integer>> minorCompactionsOverTime = Collections.synchronizedList(new MaxList<Integer>(MAX_TIME_PERIOD));
   private static final List<Pair<Long,Integer>> majorCompactionsOverTime = Collections.synchronizedList(new MaxList<Integer>(MAX_TIME_PERIOD));
   private static final List<Pair<Long,Double>> lookupsOverTime = Collections.synchronizedList(new MaxList<Double>(MAX_TIME_PERIOD));
@@ -234,7 +230,6 @@ public class Monitor {
     double totalScanRate = 0.;
     long totalEntries = 0;
     int totalTabletCount = 0;
-    int onlineTabletCount = 0;
     long totalHoldTime = 0;
     long totalLookups = 0;
     boolean retry = true;
@@ -311,20 +306,16 @@ public class Monitor {
         int totalTables = 0;
         for (TableInfo tInfo : mmi.tableMap.values()) {
           totalTabletCount += tInfo.tablets;
-          onlineTabletCount += tInfo.onlineTablets;
           totalTables++;
         }
         Monitor.totalIngestRate = totalIngestRate;
         Monitor.totalTables = totalTables;
         totalIngestByteRate = totalIngestByteRate / 1000000.0;
-        Monitor.totalIngestByteRate = totalIngestByteRate;
         Monitor.totalQueryRate = totalQueryRate;
         Monitor.totalScanRate = totalScanRate;
         totalQueryByteRate = totalQueryByteRate / 1000000.0;
-        Monitor.totalQueryByteRate = totalQueryByteRate;
         Monitor.totalEntries = totalEntries;
         Monitor.totalTabletCount = totalTabletCount;
-        Monitor.onlineTabletCount = onlineTabletCount;
         Monitor.totalHoldTime = totalHoldTime;
         Monitor.totalLookups = totalLookups;
 
@@ -696,10 +687,6 @@ public class Monitor {
     return totalTabletCount;
   }
 
-  public static int getOnlineTabletCount() {
-    return onlineTabletCount;
-  }
-
   public static long getTotalEntries() {
     return totalEntries;
   }
@@ -708,10 +695,6 @@ public class Monitor {
     return totalIngestRate;
   }
 
-  public static double getTotalIngestByteRate() {
-    return totalIngestByteRate;
-  }
-
   public static double getTotalQueryRate() {
     return totalQueryRate;
   }
@@ -720,10 +703,6 @@ public class Monitor {
     return totalScanRate;
   }
 
-  public static double getTotalQueryByteRate() {
-    return totalQueryByteRate;
-  }
-
   public static long getTotalHoldTime() {
     return totalHoldTime;
   }
@@ -766,12 +745,6 @@ public class Monitor {
     }
   }
 
-  public static List<Pair<Long,Integer>> getRecoveriesOverTime() {
-    synchronized (recoveriesOverTime) {
-      return new ArrayList<Pair<Long,Integer>>(recoveriesOverTime);
-    }
-  }
-
   public static List<Pair<Long,Integer>> getMinorCompactionsOverTime() {
     synchronized (minorCompactionsOverTime) {
       return new ArrayList<Pair<Long,Integer>>(minorCompactionsOverTime);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 1daf8f6..2e89344 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -87,10 +87,6 @@ public class ZooKeeperStatus implements Runnable {
     return status;
   }
 
-  public void stop() {
-    this.stop = true;
-  }
-
   @Override
   public void run() {
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
index 4ba6309..8011a59 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/ZooTraceClient.java
@@ -37,6 +37,7 @@ import org.apache.zookeeper.Watcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 /**
@@ -69,7 +70,7 @@ public class ZooTraceClient extends SendSpansViaThrift implements Watcher {
     setInitialTraceHosts();
   }
 
-  // Visible for testing
+  @VisibleForTesting
   protected void setRetryPause(long pause) {
     retryPause = pause;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
index c02f7f2..bfc34a6 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
@@ -18,12 +18,12 @@ package org.apache.accumulo.tserver;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.google.common.base.Preconditions;
-
 import org.apache.accumulo.core.data.KeyExtent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Preconditions;
+
 /**
  *
  */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 3ba7a5c..bbb6536 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.tserver;
 
-import org.apache.htrace.wrappers.TraceRunnable;
-
 import java.util.AbstractQueue;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,59 +26,64 @@ import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class CompactionQueue extends AbstractQueue<Runnable> implements BlockingQueue<Runnable> {
+import org.apache.htrace.wrappers.TraceRunnable;
+
+/**
+ * {@link TraceRunnable} objects placed in this queue <b>must</a> wrap a {@link Runnable} which is also {@link Comparable}
+ */
+class CompactionQueue extends AbstractQueue<TraceRunnable> implements BlockingQueue<TraceRunnable> {
 
   private List<TraceRunnable> task = new LinkedList<TraceRunnable>();
 
   private static final Comparator<TraceRunnable> comparator = new Comparator<TraceRunnable>() {
+    @SuppressWarnings("unchecked")
     @Override
     public int compare(TraceRunnable o1, TraceRunnable o2) {
-      return ((Comparable) o1.getRunnable()).compareTo(o2.getRunnable());
+      return ((Comparable<Runnable>) o1.getRunnable()).compareTo(o2.getRunnable());
     }
   };
 
   @Override
-  public synchronized Runnable poll() {
+  public synchronized TraceRunnable poll() {
     if (task.size() == 0)
       return null;
 
     TraceRunnable min = Collections.min(task, comparator);
     task.remove(min);
-    return (Runnable) min;
+    return min;
   }
 
   @Override
-  public synchronized Runnable peek() {
+  public synchronized TraceRunnable peek() {
     if (task.size() == 0)
       return null;
 
     TraceRunnable min = Collections.min(task, comparator);
-    return (Runnable) min;
+    return min;
   }
 
   @Override
-  public synchronized boolean offer(Runnable e) {
-    task.add((TraceRunnable) e);
+  public synchronized boolean offer(TraceRunnable e) {
+    task.add(e);
     notify();
     return true;
   }
 
   @Override
-  public synchronized void put(Runnable e) throws InterruptedException {
-    task.add((TraceRunnable) e);
+  public synchronized void put(TraceRunnable e) throws InterruptedException {
+    task.add(e);
     notify();
   }
 
   @Override
-  public synchronized boolean offer(Runnable e, long timeout, TimeUnit unit) throws InterruptedException {
-    task.add((TraceRunnable) e);
+  public synchronized boolean offer(TraceRunnable e, long timeout, TimeUnit unit) throws InterruptedException {
+    task.add(e);
     notify();
     return true;
   }
 
   @Override
-  public synchronized Runnable take() throws InterruptedException {
+  public synchronized TraceRunnable take() throws InterruptedException {
     while (task.size() == 0) {
       wait();
     }
@@ -89,7 +92,7 @@ public class CompactionQueue extends AbstractQueue<Runnable> implements Blocking
   }
 
   @Override
-  public synchronized Runnable poll(long timeout, TimeUnit unit) throws InterruptedException {
+  public synchronized TraceRunnable poll(long timeout, TimeUnit unit) throws InterruptedException {
     if (task.size() == 0) {
       wait(unit.toMillis(timeout));
     }
@@ -106,19 +109,19 @@ public class CompactionQueue extends AbstractQueue<Runnable> implements Blocking
   }
 
   @Override
-  public synchronized int drainTo(Collection<? super Runnable> c) {
+  public synchronized int drainTo(Collection<? super TraceRunnable> c) {
     return drainTo(c, task.size());
   }
 
   @Override
-  public synchronized int drainTo(Collection<? super Runnable> c, int maxElements) {
+  public synchronized int drainTo(Collection<? super TraceRunnable> c, int maxElements) {
     Collections.sort(task, comparator);
 
     int num = Math.min(task.size(), maxElements);
 
     Iterator<TraceRunnable> iter = task.iterator();
     for (int i = 0; i < num; i++) {
-      c.add((Runnable) iter.next());
+      c.add(iter.next());
       iter.remove();
     }
 
@@ -126,28 +129,10 @@ public class CompactionQueue extends AbstractQueue<Runnable> implements Blocking
   }
 
   @Override
-  public synchronized Iterator<Runnable> iterator() {
+  public synchronized Iterator<TraceRunnable> iterator() {
     Collections.sort(task, comparator);
 
-    final Iterator<TraceRunnable> iter = task.iterator();
-
-    return new Iterator<Runnable>() {
-
-      @Override
-      public boolean hasNext() {
-        return iter.hasNext();
-      }
-
-      @Override
-      public Runnable next() {
-        return (Runnable) iter.next();
-      }
-
-      @Override
-      public void remove() {
-        iter.remove();
-      }
-    };
+    return task.iterator();
   }
 
   @Override
@@ -155,4 +140,9 @@ public class CompactionQueue extends AbstractQueue<Runnable> implements Blocking
     return task.size();
   }
 
+  @SuppressWarnings({"rawtypes", "unchecked"})
+  BlockingQueue<Runnable> asBlockingQueueOfRunnable() {
+    return (BlockingQueue) this;
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 02dacd7..b5f5e16 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@ -60,7 +60,7 @@ public class FileManager {
 
   private static final Logger log = LoggerFactory.getLogger(FileManager.class);
 
-  int maxOpen;
+  private int maxOpen;
 
   private static class OpenReader implements Comparable<OpenReader> {
     long releaseTime;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
index cd96717..80feb47 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java
@@ -96,7 +96,7 @@ class MemKeyComparator implements Comparator<Key>, Serializable {
 
 class PartialMutationSkippingIterator extends SkippingIterator implements InterruptibleIterator {
 
-  int kvCount;
+  private int kvCount;
 
   public PartialMutationSkippingIterator(SortedKeyValueIterator<Key,Value> source, int maxKVCount) {
     setSource(source);
@@ -122,8 +122,8 @@ class PartialMutationSkippingIterator extends SkippingIterator implements Interr
 }
 
 class MemKeyConversionIterator extends WrappingIterator implements InterruptibleIterator {
-  MemKey currKey = null;
-  Value currVal = null;
+  private MemKey currKey = null;
+  private Value currVal = null;
 
   public MemKeyConversionIterator(SortedKeyValueIterator<Key,Value> source) {
     super();
@@ -521,7 +521,7 @@ public class InMemoryMap {
 
   class MemoryDataSource implements DataSource {
 
-    boolean switched = false;
+    private boolean switched = false;
     private InterruptibleIterator iter;
     private FileSKVIterator reader;
     private MemoryDataSource parent;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java
index 0ce3b9e..bc44459 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemValue.java
@@ -28,17 +28,6 @@ public class MemValue extends Value {
   int kvCount;
   boolean merged = false;
 
-  /**
-   * @param value
-   *          Value
-   * @param kv
-   *          kv count
-   */
-  public MemValue(byte[] value, int kv) {
-    super(value);
-    this.kvCount = kv;
-  }
-
   public MemValue() {
     super();
     this.kvCount = Integer.MAX_VALUE;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index 2c47f07..6eb8e4e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -48,6 +48,8 @@ import org.apache.accumulo.core.util.PreAllocatedArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 /**
  * This class stores data in a C++ map. Doing this allows us to store more in memory and avoid pauses caused by Java GC.
  *
@@ -122,7 +124,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
    *
    * @return true if they are loaded; false otherwise
    */
-  public static boolean isLoaded() {
+  static boolean isLoaded() {
     return loadedNativeLibraries.get();
   }
 
@@ -506,6 +508,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
     }
   }
 
+  @VisibleForTesting
   public void mutate(Mutation mutation, int mutationCount) {
     wlock.lock();
     try {
@@ -521,7 +524,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
     }
   }
 
-  public void mutate(List<Mutation> mutations, int mutationCount) {
+  void mutate(List<Mutation> mutations, int mutationCount) {
     Iterator<Mutation> iter = mutations.iterator();
 
     while (iter.hasNext()) {
@@ -547,6 +550,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
     }
   }
 
+  @VisibleForTesting
   public void put(Key key, Value value) {
     wlock.lock();
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/RunnableStartedAt.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/RunnableStartedAt.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/RunnableStartedAt.java
index 6513091..50433d2 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/RunnableStartedAt.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/RunnableStartedAt.java
@@ -17,7 +17,6 @@
 package org.apache.accumulo.tserver;
 
 import java.util.AbstractMap;
-import java.util.Map.Entry;
 
 /**
  * Encapsulation of a task and the time it began execution.
@@ -30,10 +29,6 @@ public class RunnableStartedAt extends AbstractMap.SimpleEntry<ActiveAssignmentR
     super(task, startedAtMillis);
   }
 
-  public RunnableStartedAt(Entry<? extends ActiveAssignmentRunnable,? extends Long> entry) {
-    super(entry);
-  }
-
   /**
    * @return The task being executed
    */

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java
index 5705c9e..b57e2da 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TLevel.java
@@ -27,10 +27,4 @@ public class TLevel extends Level {
     super(Level.DEBUG_INT + 100, "TABLET_HIST", Level.DEBUG_INT + 100);
   }
 
-  static public Level toLevel(int val) {
-    if (val == Level.DEBUG_INT + 100)
-      return Level.DEBUG;
-    return Level.toLevel(val);
-  }
-
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 46b26b5..d9c3775 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -3039,11 +3039,6 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
       }
 
       @Override
-      public Set<TServerInstance> getCurrentTServers() {
-        return null;
-      }
-
-      @Override
       public AccumuloConfiguration getConfiguration() {
         return TabletServer.this.getConfiguration();
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index cd01e60..077fbb8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -63,6 +63,8 @@ import org.apache.htrace.wrappers.TraceExecutorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 /**
  * ResourceManager is responsible for managing the resources of all tablets within a tablet server.
  */
@@ -182,7 +184,7 @@ public class TabletServerResourceManager {
 
     // make this thread pool have a priority queue... and execute tablets with the most
     // files first!
-    majorCompactionThreadPool = createEs(Property.TSERV_MAJC_MAXCONCURRENT, "major compactor", new CompactionQueue());
+    majorCompactionThreadPool = createEs(Property.TSERV_MAJC_MAXCONCURRENT, "major compactor", new CompactionQueue().asBlockingQueueOfRunnable());
     rootMajorCompactionThreadPool = createEs(0, 1, 300, "md root major compactor");
     defaultMajorCompactionThreadPool = createEs(0, 1, 300, "md major compactor");
 
@@ -546,10 +548,12 @@ public class TabletServerResourceManager {
       this.tableConf = tableConf;
     }
 
+    @VisibleForTesting
     KeyExtent getExtent() {
       return extent;
     }
 
+    @VisibleForTesting
     AccumuloConfiguration getTableConfiguration() {
       return tableConf;
     }
@@ -732,52 +736,6 @@ public class TabletServerResourceManager {
     }
   }
 
-  public void stopSplits() {
-    splitThreadPool.shutdown();
-    defaultSplitThreadPool.shutdown();
-    while (true) {
-      try {
-        while (!splitThreadPool.awaitTermination(1, TimeUnit.MINUTES)) {
-          log.info("Waiting for metadata split thread pool to stop");
-        }
-        while (!defaultSplitThreadPool.awaitTermination(1, TimeUnit.MINUTES)) {
-          log.info("Waiting for split thread pool to stop");
-        }
-        break;
-      } catch (InterruptedException ex) {
-        log.info("Interrupted waiting for splits executor to terminate", ex);
-      }
-    }
-  }
-
-  public void stopNormalAssignments() {
-    assignmentPool.shutdown();
-    while (true) {
-      try {
-        while (!assignmentPool.awaitTermination(1, TimeUnit.MINUTES)) {
-          log.info("Waiting for assignment thread pool to stop");
-        }
-        break;
-      } catch (InterruptedException ex) {
-        log.info("Interrupted waiting for assignment executor to terminate", ex);
-      }
-    }
-  }
-
-  public void stopMetadataAssignments() {
-    assignMetaDataPool.shutdown();
-    while (true) {
-      try {
-        while (!assignMetaDataPool.awaitTermination(1, TimeUnit.MINUTES)) {
-          log.info("Waiting for metadata assignment thread pool to stop");
-        }
-        break;
-      } catch (InterruptedException ex) {
-        log.info("Interrupted waiting for metadata assignment executor to terminate", ex);
-      }
-    }
-  }
-
   public LruBlockCache getIndexCache() {
     return _iCache;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
index 1e2cdf4..e8d8aec 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletStatsKeeper.java
@@ -87,15 +87,7 @@ public class TabletStatsKeeper {
     ActionStatsUpdator.update(major, t.majors);
   }
 
-  public void saveMinorTimes(TabletStatsKeeper t) {
-    ActionStatsUpdator.update(minor, t.minor);
-  }
-
-  public void saveMajorTimes(TabletStatsKeeper t) {
-    ActionStatsUpdator.update(major, t.major);
-  }
-
-  public void resetTimes() {
+  private void resetTimes() {
     major = new ActionStats();
     split = new ActionStats();
     minor = new ActionStats();
@@ -109,7 +101,7 @@ public class TabletStatsKeeper {
     major.status++;
   }
 
-  public void incrementStatusSplit() {
+  void incrementStatusSplit() {
     split.status++;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
index 444a97f..03817c1 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
@@ -28,9 +28,7 @@ import org.apache.accumulo.core.file.FileSKVIterator;
 import org.apache.accumulo.core.metadata.schema.DataFileValue;
 import org.apache.accumulo.server.fs.FileRef;
 import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
 
 /**
  * Information that can be used to determine how a tablet is to be major compacted, if needed.
@@ -72,11 +70,6 @@ public class MajorCompactionRequest implements Cloneable {
     this.files = Collections.unmodifiableMap(update);
   }
 
-  public FileStatus[] listStatus(Path path) throws IOException {
-    // @TODO verify the file isn't some random file in HDFS
-    return volumeManager.listStatus(path);
-  }
-
   public FileSKVIterator openReader(FileRef ref) throws IOException {
     // @TODO verify the file isn't some random file in HDFS
     // @TODO ensure these files are always closed?

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index e065617..ed2ce06 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -36,7 +36,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -57,7 +56,6 @@ import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.fate.util.LoggingRunnable;
 import org.apache.accumulo.server.ServerConstants;
 import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.tserver.TabletMutations;
 import org.apache.accumulo.tserver.logger.LogFileKey;
 import org.apache.accumulo.tserver.logger.LogFileValue;
@@ -95,14 +93,6 @@ public class DfsLogger {
   public static class LogHeaderIncompleteException extends IOException {
     private static final long serialVersionUID = 1l;
 
-    public LogHeaderIncompleteException(String msg) {
-      super(msg);
-    }
-
-    public LogHeaderIncompleteException(String msg, Throwable cause) {
-      super(msg, cause);
-    }
-
     public LogHeaderIncompleteException(Throwable cause) {
       super(cause);
     }
@@ -139,8 +129,6 @@ public class DfsLogger {
     AccumuloConfiguration getConfiguration();
 
     VolumeManager getFileSystem();
-
-    Set<TServerInstance> getCurrentTServers();
   }
 
   private final LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<DfsLogger.LogWork>();
@@ -213,7 +201,7 @@ public class DfsLogger {
     }
   }
 
-  static class LogWork {
+  private static class LogWork {
     final CountDownLatch latch;
     final Durability durability;
     volatile Exception exception;
@@ -224,7 +212,7 @@ public class DfsLogger {
     }
   }
 
-  public static class LoggerOperation {
+  static class LoggerOperation {
     private final LogWork work;
 
     public LoggerOperation(LogWork work) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index 711c497..ec5fa38 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -211,15 +211,6 @@ public class TabletServerLogger {
     }
   }
 
-  public void resetLoggers() throws IOException {
-    logSetLock.writeLock().lock();
-    try {
-      close();
-    } finally {
-      logSetLock.writeLock().unlock();
-    }
-  }
-
   synchronized private void close() throws IOException {
     if (!logSetLock.isWriteLockedByCurrentThread()) {
       throw new IllegalStateException("close should be called with write lock held!");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileKey.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileKey.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileKey.java
index 829cf2f..1959ffb 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileKey.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileKey.java
@@ -168,10 +168,6 @@ public class LogFileKey implements WritableComparable<LogFileKey> {
     return (int) seq;
   }
 
-  public static void printEntry(LogFileKey entry) {
-    System.out.println(entry.toString());
-  }
-
   @Override
   public String toString() {
     switch (event) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
index 9ca0f38..87e17b3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
@@ -55,10 +55,6 @@ public class LogFileValue implements Writable {
     }
   }
 
-  public static void print(LogFileValue value) {
-    System.out.println(value.toString());
-  }
-
   private static String displayLabels(byte[] labels) {
     String s = new String(labels, UTF_8);
     s = s.replace("&", " & ");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
index fa35cd3..cd68e36 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
@@ -31,17 +31,12 @@ import org.apache.hadoop.io.Text;
 import org.apache.thrift.TException;
 
 public class SplitReportMessage implements MasterMessage {
-  Map<KeyExtent,Text> extents;
-  KeyExtent old_extent;
-
-  public SplitReportMessage(KeyExtent old_extent, Map<KeyExtent,Text> newExtents) {
-    this.old_extent = old_extent;
-    extents = new TreeMap<KeyExtent,Text>(newExtents);
-  }
+  private Map<KeyExtent,Text> extents;
+  private KeyExtent old_extent;
 
   public SplitReportMessage(KeyExtent old_extent, KeyExtent ne1, Text np1, KeyExtent ne2, Text np2) {
     this.old_extent = old_extent;
-    extents = new TreeMap<KeyExtent,Text>();
+    extents = new TreeMap<>();
     extents.put(ne1, np1);
     extents.put(ne2, np2);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/session/Session.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/Session.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/Session.java
index 9aaa17a..a561166 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/Session.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/Session.java
@@ -21,12 +21,12 @@ import org.apache.accumulo.server.rpc.TServerUtils;
 
 public class Session {
   public final String client;
-  public long lastAccessTime;
+  long lastAccessTime;
   public long startTime;
-  public boolean reserved;
+  boolean reserved;
   private final TCredentials credentials;
 
-  public Session(TCredentials credentials) {
+  Session(TCredentials credentials) {
     this.credentials = credentials;
     this.client = TServerUtils.clientAddress.get();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
index a0ea2d6..fa85f0e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Rate.java
@@ -34,10 +34,6 @@ public class Rate {
     this.ratio = ratio;
   }
 
-  public double update(long counter) {
-    return update(System.currentTimeMillis(), counter);
-  }
-
   synchronized public double update(long when, long counter) {
     if (lastCounter < 0) {
       lastTime = when;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 7c152b0..fd7537d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -1203,10 +1203,6 @@ public class Tablet implements TabletCommitter {
     }
   }
 
-  public synchronized void waitForMinC() {
-    getTabletMemory().waitForMinC();
-  }
-
   private synchronized CommitSession finishPreparingMutations(long time) {
     if (writesInProgress < 0) {
       throw new IllegalStateException("waitingForLogs < 0 " + writesInProgress);
@@ -2317,10 +2313,6 @@ public class Tablet implements TabletCommitter {
     return this.queryCount;
   }
 
-  public long totalIngest() {
-    return this.ingestCount;
-  }
-
   // synchronized?
   public void updateRates(long now) {
     queryRate.update(now, queryCount);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index 8abafdb..2db2e63 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -893,22 +893,6 @@ public class Shell extends ShellOptions implements KeywordExecutable {
       TABLENAMES, USERNAMES, COMMANDS, NAMESPACES
     }
 
-    static Set<String> getCommandNames(Map<CompletionSet,Set<String>> objects) {
-      return objects.get(CompletionSet.COMMANDS);
-    }
-
-    static Set<String> getTableNames(Map<CompletionSet,Set<String>> objects) {
-      return objects.get(CompletionSet.TABLENAMES);
-    }
-
-    static Set<String> getUserNames(Map<CompletionSet,Set<String>> objects) {
-      return objects.get(CompletionSet.USERNAMES);
-    }
-
-    static Set<String> getNamespaces(Map<CompletionSet,Set<String>> objects) {
-      return objects.get(CompletionSet.NAMESPACES);
-    }
-
     public void registerCompletionGeneral(Token root, Set<String> args, boolean caseSens) {
       Token t = new Token(args);
       t.setCaseSensitive(caseSens);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java b/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
index d24c4e0..f88a061 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
@@ -45,10 +45,6 @@ public class ShellCommandException extends Exception {
   private ErrorCode code;
   private String command;
 
-  public ShellCommandException(ErrorCode code) {
-    this(code, null);
-  }
-
   public ShellCommandException(ErrorCode code, String command) {
     this.code = code;
     this.command = command;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/ShellCompletor.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellCompletor.java b/shell/src/main/java/org/apache/accumulo/shell/ShellCompletor.java
index 3ed6a04..8edbc5b 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellCompletor.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellCompletor.java
@@ -36,10 +36,6 @@ public class ShellCompletor implements Completer {
 
   public ShellCompletor() {}
 
-  public ShellCompletor(Token root) {
-    this.root = root;
-  }
-
   public ShellCompletor(Token rootToken, Map<CompletionSet,Set<String>> options) {
     this.root = rootToken;
     this.options = options;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
index 302a8a9..f7f3017 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptions.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.shell;
 
-import org.apache.commons.cli.Option;
 
 /**
  * Abstract class to encompass the Options available on the Accumulo Shell
@@ -28,6 +27,4 @@ public abstract class ShellOptions {
   public static final String namespaceOption = "ns";
   public static final String helpOption = "?";
   public static final String helpLongOption = "help";
-
-  final Option helpOpt = new Option(helpOption, helpLongOption, false, "display this help");
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/Token.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Token.java b/shell/src/main/java/org/apache/accumulo/shell/Token.java
index a533aa1..fe29537 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -46,12 +46,6 @@ public class Token {
     command.addAll(commandNames);
   }
 
-  public Token(Set<String> commandNames, Set<Token> subCommandNames) {
-    this();
-    command.addAll(commandNames);
-    subcommands.addAll(subCommandNames);
-  }
-
   public void setCaseSensitive(boolean cs) {
     caseSensitive = cs;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
index e39d862..33a8d45 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
@@ -42,8 +42,6 @@ public class CompactCommand extends TableOperation {
 
   private CompactionConfig compactionConfig = null;
 
-  boolean override = false;
-
   private boolean cancel = false;
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194c0b0/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java
index 5917b1e..334ca56 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java
@@ -146,11 +146,6 @@ public class ScanCommand extends Command {
     }
   }
 
-  protected void printRecords(final CommandLine cl, final Shell shellState, final Iterable<Entry<Key,Value>> scanner, final Class<? extends Formatter> formatter)
-      throws IOException {
-    printRecords(cl, shellState, scanner, formatter, null);
-  }
-
   protected void printRecords(final CommandLine cl, final Shell shellState, final Iterable<Entry<Key,Value>> scanner,
       final Class<? extends Formatter> formatter, PrintFile outFile) throws IOException {
     if (outFile == null) {
@@ -160,10 +155,6 @@ public class ScanCommand extends Command {
     }
   }
 
-  protected void printBinaryRecords(final CommandLine cl, final Shell shellState, final Iterable<Entry<Key,Value>> scanner) throws IOException {
-    printBinaryRecords(cl, shellState, scanner, null);
-  }
-
   protected void printBinaryRecords(final CommandLine cl, final Shell shellState, final Iterable<Entry<Key,Value>> scanner, PrintFile outFile)
       throws IOException {
     if (outFile == null) {


Mime
View raw message