accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/8] accumulo git commit: ACCUMULO-2589 Drop deprecated code from 1.x
Date Thu, 30 Jun 2016 20:41:44 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 97fdfc591 -> b69291a34


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java b/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
index 1aa27d5..f2011e3 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java
@@ -90,7 +90,6 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterBase {
     return false;
   }
 
-  @SuppressWarnings("deprecation")
   @Test
   public void tableNameOnly() throws Exception {
     log.info("Starting tableNameOnly");
@@ -101,7 +100,7 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterBase {
     connector.tableOperations().create(tableName, new NewTableConfiguration());
 
     String tableNameOrig = "original";
-    connector.tableOperations().create(tableNameOrig, true);
+    connector.tableOperations().create(tableNameOrig);
 
     int countNew = numProperties(connector, tableName);
     int countOrig = compareProperties(connector, tableNameOrig, tableName, null);
@@ -110,50 +109,6 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterBase {
     Assert.assertTrue("Wrong TimeType", checkTimeType(connector, tableName, TimeType.MILLIS));
   }
 
-  @SuppressWarnings("deprecation")
-  @Test
-  public void tableNameAndLimitVersion() throws Exception {
-    log.info("Starting tableNameAndLimitVersion");
-
-    // Create a table with the initial properties
-    Connector connector = getConnector();
-    String tableName = getUniqueNames(2)[0];
-    boolean limitVersion = false;
-    connector.tableOperations().create(tableName, new NewTableConfiguration().withoutDefaultIterators());
-
-    String tableNameOrig = "originalWithLimitVersion";
-    connector.tableOperations().create(tableNameOrig, limitVersion);
-
-    int countNew = numProperties(connector, tableName);
-    int countOrig = compareProperties(connector, tableNameOrig, tableName, null);
-
-    Assert.assertEquals("Extra properties using the new create method", countOrig, countNew);
-    Assert.assertTrue("Wrong TimeType", checkTimeType(connector, tableName, TimeType.MILLIS));
-  }
-
-  @SuppressWarnings("deprecation")
-  @Test
-  public void tableNameLimitVersionAndTimeType() throws Exception {
-    log.info("Starting tableNameLimitVersionAndTimeType");
-
-    // Create a table with the initial properties
-    Connector connector = getConnector();
-    String tableName = getUniqueNames(2)[0];
-    boolean limitVersion = false;
-    TimeType tt = TimeType.LOGICAL;
-    connector.tableOperations().create(tableName, new NewTableConfiguration().withoutDefaultIterators().setTimeType(tt));
-
-    String tableNameOrig = "originalWithLimitVersionAndTimeType";
-    connector.tableOperations().create(tableNameOrig, limitVersion, tt);
-
-    int countNew = numProperties(connector, tableName);
-    int countOrig = compareProperties(connector, tableNameOrig, tableName, null);
-
-    Assert.assertEquals("Extra properties using the new create method", countOrig, countNew);
-    Assert.assertTrue("Wrong TimeType", checkTimeType(connector, tableName, tt));
-  }
-
-  @SuppressWarnings("deprecation")
   @Test
   public void addCustomPropAndChangeExisting() throws Exception {
     log.info("Starting addCustomPropAndChangeExisting");
@@ -174,7 +129,7 @@ public class CreateTableWithNewTableConfigIT extends SharedMiniClusterBase {
     connector.tableOperations().create(tableName, new NewTableConfiguration().setProperties(properties));
 
     String tableNameOrig = "originalWithTableName";
-    connector.tableOperations().create(tableNameOrig, true);
+    connector.tableOperations().create(tableNameOrig);
 
     int countNew = numProperties(connector, tableName);
     int countOrig = compareProperties(connector, tableNameOrig, tableName, propertyName);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
index f11c34f..ace2436 100644
--- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java
@@ -40,6 +40,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.ClientConfiguration;
@@ -149,7 +150,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
     public StringInputStream input;
     public Shell shell;
 
-    TestShell(String user, String rootPass, String instanceName, String zookeepers, File configFile) throws IOException {
+    TestShell(String user, String rootPass, String instanceName, String zookeepers, File configFile, String... extraArgs) throws IOException {
       ClientConfiguration clientConf;
       try {
         clientConf = new ClientConfiguration(configFile);
@@ -161,12 +162,14 @@ public class ShellServerIT extends SharedMiniClusterBase {
       input = new StringInputStream();
       shell = new Shell(new ConsoleReader(input, output));
       shell.setLogErrorsToConsole();
+      String[] shellArgs = null;
       if (clientConf.getBoolean(ClientProperty.INSTANCE_RPC_SASL_ENABLED.getKey(), false)) {
         // Pull the kerberos principal out when we're using SASL
-        shell.config("-u", user, "-z", instanceName, zookeepers, "--config-file", configFile.getAbsolutePath());
+        shellArgs = new String[] {"-u", user, "-z", instanceName, zookeepers, "--config-file", configFile.getAbsolutePath()};
       } else {
-        shell.config("-u", user, "-p", rootPass, "-z", instanceName, zookeepers, "--config-file", configFile.getAbsolutePath());
+        shellArgs = new String[] {"-u", user, "-p", rootPass, "-z", instanceName, zookeepers, "--config-file", configFile.getAbsolutePath()};
       }
+      shell.config(Stream.concat(Arrays.stream(shellArgs), Arrays.stream(extraArgs)).toArray(String[]::new));
       exec("quit", true);
       shell.start();
       shell.setExit(false);
@@ -227,6 +230,10 @@ public class ShellServerIT extends SharedMiniClusterBase {
         assertEquals(s + " present in " + output.get() + " was not " + stringPresent, stringPresent, output.get().contains(s));
     }
 
+    void assertBadExit(String s, boolean stringPresent) {
+      assertBadExit(s, stringPresent, noop);
+    }
+
     void assertBadExit(String s, boolean stringPresent, ErrorMessageCallback callback) {
       shellLog.debug(output.get());
       if (0 == shell.getExitCode()) {
@@ -238,6 +245,19 @@ public class ShellServerIT extends SharedMiniClusterBase {
         assertEquals(s + " present in " + output.get() + " was not " + stringPresent, stringPresent, output.get().contains(s));
       shell.resetExitCode();
     }
+
+    void execExpectList(String cmd, boolean expecteGoodExit, List<String> expectedStrings) throws IOException {
+      exec(cmd);
+      if (expecteGoodExit) {
+        assertGoodExit("", true);
+      } else {
+        assertBadExit("", true);
+      }
+
+      for (String expectedString : expectedStrings) {
+        assertTrue(expectedString + " was not present in " + output.get(), output.get().contains(expectedString));
+      }
+    }
   }
 
   private static final NoOpErrorMessageCallback noop = new NoOpErrorMessageCallback();
@@ -380,24 +400,6 @@ public class ShellServerIT extends SharedMiniClusterBase {
   }
 
   @Test
-  public void setscaniterDeletescaniter() throws Exception {
-    final String table = name.getMethodName();
-
-    // setscaniter, deletescaniter
-    ts.exec("createtable " + table);
-    ts.exec("insert a cf cq 1");
-    ts.exec("insert a cf cq 1");
-    ts.exec("insert a cf cq 1");
-    ts.input.set("true\n\n\n\nSTRING");
-    ts.exec("setscaniter -class org.apache.accumulo.core.iterators.user.SummingCombiner -p 10 -n name", true);
-    ts.exec("scan", true, "3", true);
-    ts.exec("deletescaniter -n name", true);
-    ts.exec("scan", true, "1", true);
-    ts.exec("deletetable -f " + table);
-
-  }
-
-  @Test
   public void execfile() throws Exception {
     // execfile
     File file = File.createTempFile("ShellServerIT.execfile", ".conf", new File(rootPath));
@@ -1301,7 +1303,7 @@ public class ShellServerIT extends SharedMiniClusterBase {
   public void help() throws Exception {
     ts.exec("help -np", true, "Help Commands", true);
     ts.exec("?", true, "Help Commands", true);
-    for (String c : ("bye exit quit " + "about help info ? " + "deleteiter deletescaniter listiter setiter setscaniter "
+    for (String c : ("bye exit quit " + "about help info ? " + "deleteiter listiter setiter "
         + "grant revoke systempermissions tablepermissions userpermissions " + "execfile history " + "authenticate cls clear notable sleep table user whoami "
         + "clonetable config createtable deletetable droptable du exporttable importtable offline online renametable tables "
         + "addsplits compact constraint flush getgropus getsplits merge setgroups " + "addauths createuser deleteuser dropuser getauths passwd setauths users "
@@ -1833,6 +1835,204 @@ public class ShellServerIT extends SharedMiniClusterBase {
     }
   }
 
+  @Test
+  public void aboutTest() throws IOException {
+    ts.exec("about", true, "Shell - Apache Accumulo Interactive Shell");
+    ts.exec("about -v", true, "Current user:");
+    ts.exec("about arg", false, "java.lang.IllegalArgumentException: Expected 0 arguments");
+  }
+
+  @Test
+  public void addGetSplitsTest() throws IOException {
+    ts.exec("addsplits arg", false, "java.lang.IllegalStateException: Not in a table context");
+    ts.exec("createtable test", true);
+    ts.exec("addsplits 1 \\x80", true);
+    ts.exec("getsplits", true, "1\n\\x80");
+    ts.exec("getsplits -m 1", true, "1");
+    ts.exec("getsplits -b64", true, "MQ==\ngA==");
+    ts.exec("deletetable test -f", true, "Table: [test] has been deleted");
+  }
+
+  @Test
+  public void insertDeleteScanTest() throws IOException {
+    ts.exec("insert r f q v", false, "java.lang.IllegalStateException: Not in a table context");
+    ts.exec("delete r f q", false, "java.lang.IllegalStateException: Not in a table context");
+    ts.exec("createtable test", true);
+    ts.exec("insert r f q v", true);
+    ts.exec("scan", true, "r f:q []    v");
+    ts.exec("delete r f q", true);
+    ts.exec("scan", true, "r f:q []    v", false);
+    ts.exec("insert \\x90 \\xa0 \\xb0 \\xc0\\xd0\\xe0\\xf0", true);
+    ts.exec("scan", true, "\\x90 \\xA0:\\xB0 []    \\xC0\\xD0");
+    ts.exec("scan -f 2", true, "\\x90 \\xA0:\\xB0 []    \\xC0\\xD0");
+    ts.exec("scan -f 2", true, "\\x90 \\xA0:\\xB0 []    \\xC0\\xD0\\xE0", false);
+    ts.exec("scan -b \\x90 -e \\x90 -c \\xA0", true, "\\x90 \\xA0:\\xB0 []    \\xC0");
+    ts.exec("scan -b \\x90 -e \\x90 -c \\xA0:\\xB0", true, "\\x90 \\xA0:\\xB0 []    \\xC0");
+    ts.exec("scan -b \\x90 -be", true, "\\x90 \\xA0:\\xB0 []    \\xC0", false);
+    ts.exec("scan -e \\x90 -ee", true, "\\x90 \\xA0:\\xB0 []    \\xC0", false);
+    ts.exec("scan -b \\x90\\x00", true, "\\x90 \\xA0:\\xB0 []    \\xC0", false);
+    ts.exec("scan -e \\x8f", true, "\\x90 \\xA0:\\xB0 []    \\xC0", false);
+    ts.exec("delete \\x90 \\xa0 \\xb0", true);
+    ts.exec("scan", true, "\\x90 \\xA0:\\xB0 []    \\xC0", false);
+    ts.exec("deletetable test -f", true, "Table: [test] has been deleted");
+  }
+
+  @Test
+  public void deleteManyTest() throws IOException {
+    ts.exec("deletemany", false, "java.lang.IllegalStateException: Not in a table context");
+    ts.exec("createtable test", true);
+    ts.exec("deletemany", true, "\n");
+
+    ts.exec("insert 0 0 0 0 -ts 0");
+    ts.exec("insert 0 0 0 0 -l 0 -ts 0");
+    ts.exec("insert 1 1 1 1 -ts 1");
+    ts.exec("insert 2 2 2 2 -ts 2");
+
+    // prompts for delete, and rejects by default
+    ts.exec("deletemany", true, "[SKIPPED] 0 0:0 []");
+    ts.exec("deletemany -r 0", true, "[SKIPPED] 0 0:0 []");
+    ts.exec("deletemany -r 0 -f", true, "[DELETED] 0 0:0 []");
+
+    // with auths, can delete the other record
+    ts.exec("setauths -s 0");
+    ts.exec("deletemany -r 0 -f", true, "[DELETED] 0 0:0 [0]");
+
+    // delete will show the timestamp
+    ts.exec("deletemany -r 1 -f -st", true, "[DELETED] 1 1:1 [] 1");
+
+    // DeleteManyCommand has its own Formatter (DeleterFormatter), so it does not honor the -fm flag
+    ts.exec("deletemany -r 2 -f -st -fm org.apache.accumulo.core.util.format.DateStringFormatter", true, "[DELETED] 2 2:2 [] 2");
+
+    ts.exec("setauths -c ", true);
+    ts.exec("deletetable test -f", true, "Table: [test] has been deleted");
+  }
+
+  @Test
+  public void authsTest() throws Exception {
+    ts.exec("setauths x,y,z", false, "Missing required option");
+    ts.exec("setauths -s x,y,z -u notauser", false, "user does not exist");
+    ts.exec("setauths -s y,z,x", true);
+    ts.exec("getauths -u notauser", false, "user does not exist");
+    ts.execExpectList("getauths", true, Arrays.asList("x", "y", "z"));
+    ts.exec("addauths -u notauser", false, "Missing required option");
+    ts.exec("addauths -u notauser -s foo", false, "user does not exist");
+    ts.exec("addauths -s a", true);
+    ts.execExpectList("getauths", true, Arrays.asList("x", "y", "z", "a"));
+    ts.exec("setauths -c", true);
+  }
+
+  @Test
+  public void duContextTest() throws Exception {
+    ts.exec("createtable t", true);
+    ts.exec("du", true, "0 [t]");
+    ts.exec("deletetable t -f", true, "Table: [t] has been deleted");
+  }
+
+  @Test
+  public void duTest() throws IOException {
+    ts.exec("createtable t", true);
+    ts.exec("du t", true, "0 [t]");
+    ts.exec("deletetable t -f", true, "Table: [t] has been deleted");
+  }
+
+  @Test
+  public void duPatternTest() throws IOException {
+    ts.exec("createnamespace n", true);
+    ts.exec("createtable n.t", true);
+    ts.exec("createtable n.tt", true);
+    ts.exec("du -p n[.]t.*", true, "0 [n.t, n.tt]");
+    ts.exec("deletetable n.t -f", true, "Table: [n.t] has been deleted");
+    ts.exec("deletetable n.tt -f", true, "Table: [n.tt] has been deleted");
+    ts.exec("deletenamespace -f n", true);
+  }
+
+  @Test
+  public void scanTimestampTest() throws IOException {
+    ts.exec("createtable test", true);
+    ts.exec("insert r f q v -ts 0", true);
+    ts.exec("scan -st", true, "r f:q [] 0    v");
+    ts.exec("scan -st -f 0", true, " : [] 0   ");
+    ts.exec("deletemany -f", true);
+    ts.exec("deletetable test -f", true, "Table: [test] has been deleted");
+  }
+
+  @Test
+  public void scanFewTest() throws IOException {
+    ts.exec("createtable test", true);
+    // historically, showing few did not pertain to ColVis or Timestamp
+    ts.exec("insert 1 123 123456 -l '12345678' -ts 123456789 1234567890", true);
+    ts.exec("setauths -s 12345678", true);
+    String expected = "1 123:123456 [12345678] 123456789    1234567890";
+    String expectedFew = "1 123:12345 [12345678] 123456789    12345";
+    ts.exec("scan -st", true, expected);
+    ts.exec("scan -st -f 5", true, expectedFew);
+    // also prove that BinaryFormatter behaves same as the default
+    ts.exec("scan -st -fm org.apache.accumulo.core.util.format.BinaryFormatter", true, expected);
+    ts.exec("scan -st -f 5 -fm org.apache.accumulo.core.util.format.BinaryFormatter", true, expectedFew);
+    ts.exec("setauths -c", true);
+    ts.exec("deletetable test -f", true, "Table: [test] has been deleted");
+  }
+
+  @Test
+  public void grepTest() throws IOException {
+    ts.exec("grep", false, "java.lang.IllegalStateException: Not in a table context");
+    ts.exec("createtable t", true);
+    ts.exec("setauths -s vis", true);
+    ts.exec("insert r f q v -ts 0 -l vis", true);
+
+    String expected = "r f:q [vis]    v";
+    String expectedTimestamp = "r f:q [vis] 0    v";
+    ts.exec("grep", false, "No terms specified");
+    ts.exec("grep non_matching_string", true, "");
+    // historically, showing few did not pertain to ColVis or Timestamp
+    ts.exec("grep r", true, expected);
+    ts.exec("grep r -f 1", true, expected);
+    ts.exec("grep r -st", true, expectedTimestamp);
+    ts.exec("grep r -st -f 1", true, expectedTimestamp);
+    ts.exec("setauths -c", true);
+    ts.exec("deletetable t -f", true, "Table: [t] has been deleted");
+  }
+
+  @Test
+  public void commentTest() throws IOException {
+    ts.exec("#", true, "Unknown command", false);
+    ts.exec("# foo", true, "Unknown command", false);
+    ts.exec("- foo", true, "Unknown command", true);
+  }
+
+  @Test
+  public void execFileTest() throws IOException {
+    TestShell configTestShell = new TestShell(getPrincipal(), getRootPassword(), getCluster().getConfig().getInstanceName(), getCluster().getConfig()
+        .getZooKeepers(), getCluster().getConfig().getClientConfFile(), "-f", "src/test/resources/shelltest.txt");
+    configTestShell.assertGoodExit("Unknown command", false);
+  }
+
+  @Test
+  public void setIterTest() throws IOException {
+    ts.exec("createtable t", true);
+
+    String cmdJustClass = "setiter -class VersioningIterator -p 1";
+    ts.exec(cmdJustClass, false, "java.lang.IllegalArgumentException", false);
+    ts.exec(cmdJustClass, false, "fully qualified package name", true);
+
+    String cmdFullPackage = "setiter -class o.a.a.foo -p 1";
+    ts.exec(cmdFullPackage, false, "java.lang.IllegalArgumentException", false);
+    ts.exec(cmdFullPackage, false, "class not found", true);
+
+    String cmdNoOption = "setiter -class java.lang.String -p 1";
+    ts.exec(cmdNoOption, false, "loaded successfully but does not implement SortedKeyValueIterator", true);
+
+    ts.input.set("\n\n");
+    ts.exec("setiter -scan -class org.apache.accumulo.core.iterators.ColumnFamilyCounter -p 30 -name foo", true);
+
+    ts.input.set("bar\nname value\n");
+    ts.exec("setiter -scan -class org.apache.accumulo.core.iterators.ColumnFamilyCounter -p 31", true);
+
+    // TODO can't verify this as config -t fails, functionality verified in ShellServerIT
+
+    ts.exec("deletetable t -f", true, "Table: [t] has been deleted");
+  }
+
   private void make10() throws IOException {
     for (int i = 0; i < 10; i++) {
       ts.exec(String.format("insert row%d cf col%d value", i, i));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
index 5cacfdd..04d624d 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
@@ -82,6 +82,11 @@ import org.junit.Test;
 
 public class VolumeIT extends ConfigurableMacBase {
 
+  @SuppressWarnings("deprecation")
+  private static final Property INSTANCE_DFS_DIR = Property.INSTANCE_DFS_DIR;
+  @SuppressWarnings("deprecation")
+  private static final Property INSTANCE_DFS_URI = Property.INSTANCE_DFS_URI;
+
   private static final Text EMPTY = new Text();
   private static final Value EMPTY_VALUE = new Value(new byte[] {});
   private File volDirBase;
@@ -92,7 +97,6 @@ public class VolumeIT extends ConfigurableMacBase {
     return 5 * 60;
   }
 
-  @SuppressWarnings("deprecation")
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     File baseDir = cfg.getDir();
@@ -104,8 +108,8 @@ public class VolumeIT extends ConfigurableMacBase {
 
     // Run MAC on two locations in the local file system
     URI v1Uri = v1.toUri();
-    cfg.setProperty(Property.INSTANCE_DFS_DIR, v1Uri.getPath());
-    cfg.setProperty(Property.INSTANCE_DFS_URI, v1Uri.getScheme() + v1Uri.getHost());
+    cfg.setProperty(INSTANCE_DFS_DIR, v1Uri.getPath());
+    cfg.setProperty(INSTANCE_DFS_URI, v1Uri.getScheme() + v1Uri.getHost());
     cfg.setProperty(Property.INSTANCE_VOLUMES, v1.toString() + "," + v2.toString());
     cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "15s");
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java b/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
index 9752916..150eee4 100644
--- a/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/server/security/SystemCredentialsIT.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.test.server.security;
 
 import static org.junit.Assert.assertEquals;
 
-import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -32,7 +31,6 @@ import org.apache.accumulo.core.client.impl.Credentials;
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.metadata.RootTable;
@@ -65,12 +63,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
     if (args[0].equals("bad")) {
       Instance inst = new Instance() {
 
-        @Deprecated
-        @Override
-        public void setConfiguration(AccumuloConfiguration conf) {
-          throw new UnsupportedOperationException();
-        }
-
         @Override
         public int getZooKeepersSessionTimeOut() {
           throw new UnsupportedOperationException();
@@ -106,30 +98,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
           throw new UnsupportedOperationException();
         }
 
-        @Deprecated
-        @Override
-        public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public AccumuloConfiguration getConfiguration() {
-          throw new UnsupportedOperationException();
-        }
-
       };
       creds = SystemCredentials.get(inst);
     } else if (args[0].equals("good")) {
@@ -172,36 +140,6 @@ public class SystemCredentialsIT extends ConfigurableMacBase {
           throw new UnsupportedOperationException();
         }
 
-        @Deprecated
-        @Override
-        public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public AccumuloConfiguration getConfiguration() {
-          throw new UnsupportedOperationException();
-        }
-
-        @Deprecated
-        @Override
-        public void setConfiguration(AccumuloConfiguration conf) {
-          throw new UnsupportedOperationException();
-        }
-
       };
       creds = new SystemCredentials(inst, "!SYSTEM", new PasswordToken("fake"));
     } else {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/test/src/test/java/org/apache/accumulo/test/TraceRepoDeserializationTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/TraceRepoDeserializationTest.java b/test/src/test/java/org/apache/accumulo/test/TraceRepoDeserializationTest.java
deleted file mode 100644
index 4bf983e..0000000
--- a/test/src/test/java/org/apache/accumulo/test/TraceRepoDeserializationTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test;
-
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.InvalidClassException;
-import java.io.ObjectInputStream;
-import java.util.Base64;
-
-import org.junit.Test;
-
-public class TraceRepoDeserializationTest {
-
-  // Zookeeper data for a merge request
-  static private final String oldValue = "rO0ABXNyAC1vcmcuYXBhY2hlLmFjY3VtdWxvLm1hc3Rlci50YWJsZU9wcy5UcmFjZVJlc"
-      + "G8AAAAAAAAAAQIAAkwABHJlcG90AB9Mb3JnL2FwYWNoZS9hY2N1bXVsby9mYXRlL1Jl" + "cG87TAAFdGluZm90AChMb3JnL2FwYWNoZS9hY2N1bXVsby90cmFjZS90aHJpZnQvVEl"
-      + "uZm87eHBzcgAwb3JnLmFwYWNoZS5hY2N1bXVsby5tYXN0ZXIudGFibGVPcHMuVGFibG" + "VSYW5nZU9wAAAAAAAAAAECAAVbAAZlbmRSb3d0AAJbQkwAC25hbWVzcGFjZUlkdAAST"
-      + "GphdmEvbGFuZy9TdHJpbmc7TAACb3B0AD1Mb3JnL2FwYWNoZS9hY2N1bXVsby9zZXJ2" + "ZXIvbWFzdGVyL3N0YXRlL01lcmdlSW5mbyRPcGVyYXRpb247WwAIc3RhcnRSb3dxAH4A"
-      + "BUwAB3RhYmxlSWRxAH4ABnhyAC5vcmcuYXBhY2hlLmFjY3VtdWxvLm1hc3Rlci50YWJs" + "ZU9wcy5NYXN0ZXJSZXBvAAAAAAAAAAECAAB4cHVyAAJbQqzzF/gGCFTgAgAAeHAAAAAA"
-      + "dAAIK2RlZmF1bHR+cgA7b3JnLmFwYWNoZS5hY2N1bXVsby5zZXJ2ZXIubWFzdGVyLnN0" + "YXRlLk1lcmdlSW5mbyRPcGVyYXRpb24AAAAAAAAAABIAAHhyAA5qYXZhLmxhbmcuRW51"
-      + "bQAAAAAAAAAAEgAAeHB0AAVNRVJHRXEAfgALdAABMnNyACZvcmcuYXBhY2hlLmFjY3Vt" + "dWxvLnRyYWNlLnRocmlmdC5USW5mb79UcL31bhZ9AwADQgAQX19pc3NldF9iaXRmaWVs"
-      + "ZEoACHBhcmVudElkSgAHdHJhY2VJZHhwdwUWABYAAHg=";
-
-  @Test(expected = InvalidClassException.class)
-  public void test() throws Exception {
-    byte bytes[] = Base64.getDecoder().decode(oldValue);
-    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-    ObjectInputStream ois = new ObjectInputStream(bais);
-    ois.readObject();
-    fail("did not throw exception");
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/test/src/test/resources/shelltest.txt
----------------------------------------------------------------------
diff --git a/test/src/test/resources/shelltest.txt b/test/src/test/resources/shelltest.txt
new file mode 100644
index 0000000..d2eb955
--- /dev/null
+++ b/test/src/test/resources/shelltest.txt
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+exit
+foo

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/.gitignore
----------------------------------------------------------------------
diff --git a/trace/.gitignore b/trace/.gitignore
deleted file mode 100644
index e77a822..0000000
--- a/trace/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Maven ignores
-/target/
-
-# IDE ignores
-/.settings/
-/.project
-/.classpath
-/.pydevproject
-/.idea
-/*.iml
-/nbproject/
-/nbactions.xml
-/nb-configuration.xml

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
deleted file mode 100644
index 3b1eccc..0000000
--- a/trace/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.accumulo</groupId>
-    <artifactId>accumulo-project</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>accumulo-trace</artifactId>
-  <name>Apache Accumulo Trace</name>
-  <description>A distributed tracing library for Apache Accumulo.</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.htrace</groupId>
-      <artifactId>htrace-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/findbugs/exclude-filter.xml
----------------------------------------------------------------------
diff --git a/trace/src/main/findbugs/exclude-filter.xml b/trace/src/main/findbugs/exclude-filter.xml
deleted file mode 100644
index 6ce4bed..0000000
--- a/trace/src/main/findbugs/exclude-filter.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<FindBugsFilter>
-  <Match>
-    <!-- ignore intentional name shadowing -->
-    <Or>
-      <Package name="org.apache.accumulo.trace.instrument" />
-      <Package name="org.apache.accumulo.trace.thrift" />
-    </Or>
-    <Or>
-      <Bug code="NM" pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
-      <Bug code="NM" pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
-    </Or>
-  </Match>
-</FindBugsFilter>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
deleted file mode 100644
index 7110134..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CloudtraceSpan.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.instrument;
-
-import java.util.Map;
-
-/**
- * @deprecated only used for ensuring backwards compatibility
- */
-@Deprecated
-public interface CloudtraceSpan {
-  static final long ROOT_SPAN_ID = 0;
-
-  /** Begin gathering timing information */
-  void start();
-
-  /** The block has completed, stop the clock */
-  void stop();
-
-  /** Get the start time, in milliseconds */
-  long getStartTimeMillis();
-
-  /** Get the stop time, in milliseconds */
-  long getStopTimeMillis();
-
-  /** Return the total amount of time elapsed since start was called, if running, or difference between stop and start */
-  long accumulatedMillis();
-
-  /** Has the span been started and not yet stopped? */
-  boolean running();
-
-  /** Return a textual description of this span */
-  String description();
-
-  /** A pseudo-unique (random) number assigned to this span instance */
-  long spanId();
-
-  /** The parent span: returns null if this is the root span */
-  Span parent();
-
-  /** A pseudo-unique (random) number assigned to the trace associated with this span */
-  long traceId();
-
-  /** Create a child span of this span with the given description */
-  Span child(String description);
-
-  @Override
-  String toString();
-
-  /** Return the pseudo-unique (random) number of the parent span, returns ROOT_SPAN_ID if this is the root span */
-  long parentId();
-
-  /** Add data associated with this span */
-  void data(String key, String value);
-
-  /** Get data associated with this span (read only) */
-  Map<String,String> getData();
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
deleted file mode 100644
index ad3acfc..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.instrument;
-
-import org.apache.htrace.HTraceConfiguration;
-
-import java.util.Collections;
-
-/**
- * @deprecated since 1.7, use org.apache.htrace.impl.CountSampler instead
- */
-@Deprecated
-public class CountSampler extends org.apache.htrace.impl.CountSampler implements Sampler {
-  public CountSampler(long frequency) {
-    super(HTraceConfiguration.fromMap(Collections.singletonMap(CountSampler.SAMPLER_FREQUENCY_CONF_KEY, Long.toString(frequency))));
-  }
-
-  @Override
-  public boolean next() {
-    return super.next(null);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
deleted file mode 100644
index 11208b2..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.instrument;
-
-/**
- * @deprecated since 1.7, use org.apache.htrace.Sampler instead
- */
-@Deprecated
-public interface Sampler extends org.apache.htrace.Sampler<Object> {
-
-  boolean next();
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
deleted file mode 100644
index 8e70e33..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.instrument;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * @deprecated since 1.7, use {@link org.apache.accumulo.core.trace.Span} instead
- */
-@Deprecated
-public class Span extends org.apache.accumulo.core.trace.Span implements CloudtraceSpan {
-  public static final long ROOT_SPAN_ID = org.apache.htrace.Span.ROOT_SPAN_ID;
-
-  public Span(org.apache.accumulo.core.trace.Span span) {
-    super(span.getScope());
-  }
-
-  public Span(org.apache.htrace.TraceScope scope) {
-    super(scope);
-  }
-
-  public Span(org.apache.htrace.Span span) {
-    super(span);
-  }
-
-  @Override
-  public Span child(String s) {
-    return new Span(span.child(s));
-  }
-
-  @Override
-  public void start() {
-    throw new UnsupportedOperationException("can't start span");
-  }
-
-  @Override
-  public long getStartTimeMillis() {
-    return span.getStartTimeMillis();
-  }
-
-  @Override
-  public long getStopTimeMillis() {
-    return span.getStopTimeMillis();
-  }
-
-  @Override
-  public long accumulatedMillis() {
-    return span.getAccumulatedMillis();
-  }
-
-  @Override
-  public boolean running() {
-    return span.isRunning();
-  }
-
-  @Override
-  public String description() {
-    return span.getDescription();
-  }
-
-  @Override
-  public long spanId() {
-    return span.getSpanId();
-  }
-
-  @Override
-  public Span parent() {
-    throw new UnsupportedOperationException("can't get parent");
-  }
-
-  @Override
-  public long parentId() {
-    return span.getParentId();
-  }
-
-  @Override
-  public Map<String,String> getData() {
-    Map<byte[],byte[]> data = span.getKVAnnotations();
-    HashMap<String,String> stringData = new HashMap<>();
-    for (Entry<byte[],byte[]> d : data.entrySet()) {
-      stringData.put(new String(d.getKey(), UTF_8), new String(d.getValue(), UTF_8));
-    }
-    return stringData;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
deleted file mode 100644
index 027fe8f..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Trace.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.instrument;
-
-/**
- * @deprecated since 1.7, use {@link org.apache.accumulo.core.trace.Trace} instead
- */
-@Deprecated
-public class Trace extends org.apache.accumulo.core.trace.Trace {
-  // Initiate tracing if it isn't already started
-  public static Span on(String description) {
-    return new Span(org.apache.accumulo.core.trace.Trace.on(description));
-  }
-
-  // Turn tracing off:
-  public static void off() {
-    org.apache.accumulo.core.trace.Trace.off();
-  }
-
-  public static void offNoFlush() {
-    org.apache.accumulo.core.trace.Trace.offNoFlush();
-  }
-
-  // Are we presently tracing?
-  public static boolean isTracing() {
-    return org.apache.accumulo.core.trace.Trace.isTracing();
-  }
-
-  // If we are tracing, return the current span, else null
-  public static Span currentTrace() {
-    return new Span(org.apache.htrace.Trace.currentSpan());
-  }
-
-  // Create a new time span, if tracing is on
-  public static Span start(String description) {
-    return new Span(org.apache.accumulo.core.trace.Trace.start(description));
-  }
-
-  // Start a trace in the current thread from information passed via RPC
-  public static Span trace(org.apache.accumulo.trace.thrift.TInfo info, String description) {
-    return new Span(org.apache.accumulo.core.trace.Trace.trace(info, description));
-  }
-
-  // Initiate a trace in this thread, starting now
-  public static Span startThread(Span parent, String description) {
-    return new Span(org.apache.htrace.Trace.startSpan(description, parent.getSpan()));
-  }
-
-  // Stop a trace in this thread, starting now
-  public static void endThread(Span span) {
-    if (span != null) {
-      span.stop();
-      // close() will no-op, but ensure safety if the implementation changes
-      org.apache.htrace.Tracer.getInstance().continueSpan(null).close();
-    }
-  }
-
-  // Wrap the runnable in a new span, if tracing
-  public static Runnable wrap(Runnable runnable) {
-    return org.apache.accumulo.core.trace.Trace.wrap(runnable);
-  }
-
-  // Wrap all calls to the given object with spans
-  public static <T> T wrapAll(T instance) {
-    return org.apache.accumulo.core.trace.Trace.wrapAll(instance);
-  }
-
-  // Sample trace all calls to the given object
-  public static <T> T wrapAll(T instance, Sampler dist) {
-    return org.apache.accumulo.core.trace.Trace.wrapAll(instance, dist);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
deleted file mode 100644
index d57ee81..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Tracer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.instrument;
-
-/**
- * ACCUMULO-3738: Temporary fix to keep Hive working with all versions of Accumulo without extra burden on users. Hive referenced this class in the build-up of
- * the classpath used to compute the answer to a query. Without this class, the accumulo-trace jar would not make it onto the classpath which would break the
- * query. Whenever Hive can get this patch into their build and a sufficient number of releases pass, we can remove this class.
- *
- * Accumulo should not reference this class at all. It is solely here for Hive integration.
- */
-@Deprecated
-public class Tracer {
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b69291a3/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java b/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
deleted file mode 100644
index f6f5756..0000000
--- a/trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.trace.thrift;
-
-/**
- * @deprecated since 1.7, use {@link org.apache.accumulo.core.trace.thrift.TInfo} instead
- */
-@SuppressWarnings("serial")
-@Deprecated
-public class TInfo extends org.apache.accumulo.core.trace.thrift.TInfo {}


Mime
View raw message