http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java index 5937a29..d122229 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DeleteTable.java @@ -22,15 +22,15 @@ import java.util.Random; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class DeleteTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand");
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java index 2034d3d..6f1342f 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/DropUser.java @@ -22,14 +22,14 @@ import java.util.Random; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class DropUser extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java index 8a5483e..d7ac842 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/IsolatedScan.java @@ -31,15 +31,15 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.PeekingIterator; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class IsolatedScan extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java index a84c4fd..03e0fcd 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ListSplits.java @@ -24,7 +24,7 @@ import java.util.Random; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -32,8 +32,8 @@ import org.apache.hadoop.io.Text; public class ListSplits extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java index 87a48f9..fa01572 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Merge.java @@ -25,7 +25,7 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.metadata.MetadataTable; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -33,8 +33,8 @@ import org.apache.hadoop.io.Text; public class Merge extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java index f663802..d568cac 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/OfflineTable.java @@ -25,15 +25,15 @@ import java.util.concurrent.TimeUnit; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class OfflineTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java index dab41bf..e0946d8 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameNamespace.java @@ -23,15 +23,15 @@ import java.util.Random; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.NamespaceExistsException; import org.apache.accumulo.core.client.NamespaceNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class RenameNamespace extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java index 4c5a52f..acd9367 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java @@ -25,15 +25,15 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.NamespaceNotFoundException; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class RenameTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java index 713adaf..8033eda 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Replication.java @@ -49,7 +49,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.replication.ReplicationTable; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; @@ -61,8 +61,8 @@ public class Replication extends Test { final int COLS = 50; @Override - public void visit(State state, Environment env, Properties props) throws Exception { - final Connector c = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + final Connector c = env.getAccumuloConnector(); final Instance inst = c.getInstance(); final String instName = inst.getInstanceName(); final InstanceOperations iOps = c.instanceOperations(); @@ -71,8 +71,8 @@ public class Replication extends Test { // Replicate to ourselves iOps.setProperty(REPLICATION_NAME.getKey(), instName); iOps.setProperty(REPLICATION_PEERS.getKey() + instName, getPeerConfigurationValue(AccumuloReplicaSystem.class, instName + "," + inst.getZooKeepers())); - iOps.setProperty(REPLICATION_PEER_USER.getKey() + instName, env.getUserName()); - iOps.setProperty(REPLICATION_PEER_PASSWORD.getKey() + instName, env.getPassword()); + iOps.setProperty(REPLICATION_PEER_USER.getKey() + instName, env.getAccumuloUserName()); + iOps.setProperty(REPLICATION_PEER_PASSWORD.getKey() + instName, env.getAccumuloPassword()); // Tweak some replication parameters to make the replication go faster iOps.setProperty(MASTER_REPLICATION_SCAN_INTERVAL.getKey(), "1s"); iOps.setProperty(REPLICATION_WORK_ASSIGNMENT_SLEEP.getKey(), "1s"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java index ab89bea..f22d406 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/ScanTable.java @@ -31,15 +31,15 @@ import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class ScanTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); Random rand = (Random) state.get("rand"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Setup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Setup.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Setup.java index 164fd4f..3902c97 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Setup.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Setup.java @@ -21,14 +21,14 @@ import java.util.List; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class Setup extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { Random rand = new Random(); state.set("rand", rand); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java index b0aa7e1..0754af1 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Compact.java @@ -20,7 +20,7 @@ import java.util.Properties; import java.util.Random; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -30,10 +30,10 @@ import org.apache.hadoop.io.Text; */ public class Compact extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String table = state.getString("tableName"); Random rand = (Random) state.get("rand"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); Text row1 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks")))); Text row2 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks")))); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java index 2c5448d..af8b387 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Flush.java @@ -20,7 +20,7 @@ import java.util.Properties; import java.util.Random; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -30,10 +30,10 @@ import org.apache.hadoop.io.Text; */ public class Flush extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String table = state.getString("tableName"); Random rand = (Random) state.get("rand"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); Text row1 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks")))); Text row2 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks")))); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java index 3656653..031639a 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Init.java @@ -26,7 +26,7 @@ import org.apache.accumulo.core.client.ConditionalWriter; import org.apache.accumulo.core.client.ConditionalWriter.Status; import org.apache.accumulo.core.data.Condition; import org.apache.accumulo.core.data.ConditionalMutation; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text; public class Init extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { int numBanks = (Integer) state.get("numBanks"); int numAccts = (Integer) state.get("numAccts"); @@ -46,7 +46,7 @@ public class Init extends Test { TreeSet<Text> splits = new TreeSet<>(); for (int i = 1; i < 10; i++) splits.add(new Text(Utils.getBank((int) (numBanks * .1 * i)))); - env.getConnector().tableOperations().addSplits((String) state.get("tableName"), splits); + env.getAccumuloConnector().tableOperations().addSplits((String) state.get("tableName"), splits); log.info("Added splits " + splits); ArrayList<Integer> banks = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java index 2f5d52b..af2bc25 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Merge.java @@ -20,7 +20,7 @@ import java.util.Properties; import java.util.Random; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -30,10 +30,10 @@ import org.apache.hadoop.io.Text; */ public class Merge extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String table = state.getString("tableName"); Random rand = (Random) state.get("rand"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); Text row1 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks")))); Text row2 = new Text(Utils.getBank(rand.nextInt((Integer) state.get("numBanks")))); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java index 1e4ad01..6973eb5 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Setup.java @@ -23,14 +23,14 @@ import org.apache.accumulo.core.client.ConditionalWriter; import org.apache.accumulo.core.client.ConditionalWriterConfig; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class Setup extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { Random rand = new Random(); state.set("rand", rand); @@ -46,14 +46,14 @@ public class Setup extends Test { state.set("tableName", tableName); try { - env.getConnector().tableOperations().create(tableName); + env.getAccumuloConnector().tableOperations().create(tableName); log.debug("created table " + tableName); boolean blockCache = rand.nextBoolean(); - env.getConnector().tableOperations().setProperty(tableName, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), blockCache + ""); + env.getAccumuloConnector().tableOperations().setProperty(tableName, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), blockCache + ""); log.debug("set " + Property.TABLE_BLOCKCACHE_ENABLED.getKey() + " " + blockCache); } catch (TableExistsException tee) {} - ConditionalWriter cw = env.getConnector().createConditionalWriter(tableName, new ConditionalWriterConfig().setMaxWriteThreads(1)); + ConditionalWriter cw = env.getAccumuloConnector().createConditionalWriter(tableName, new ConditionalWriterConfig().setMaxWriteThreads(1)); state.set("cw", cw); } http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java index 8ea9aab..e8c1732 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Split.java @@ -22,7 +22,7 @@ import java.util.Random; import java.util.TreeSet; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -32,10 +32,10 @@ import org.apache.hadoop.io.Text; */ public class Split extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String table = state.getString("tableName"); Random rand = (Random) state.get("rand"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); String row = Utils.getBank(rand.nextInt((Integer) state.get("numBanks"))); log.debug("adding split " + row); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/TearDown.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/TearDown.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/TearDown.java index cf72607..324d1a0 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/TearDown.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/TearDown.java @@ -19,7 +19,7 @@ package org.apache.accumulo.testing.core.randomwalk.conditional; import java.util.Properties; import org.apache.accumulo.core.client.ConditionalWriter; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; @@ -28,7 +28,7 @@ import org.apache.accumulo.testing.core.randomwalk.Test; */ public class TearDown extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { ConditionalWriter cw = (ConditionalWriter) state.get("cw"); cw.close(); } http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java index 73a7d91..7fb888d 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Transfer.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.commons.math3.distribution.ZipfDistribution; @@ -61,10 +61,10 @@ public class Transfer extends Test { } @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String table = state.getString("tableName"); Random rand = (Random) state.get("rand"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); int numAccts = (Integer) state.get("numAccts"); // note: non integer exponents are slow http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java index fa516f1..f35646c 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/conditional/Verify.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.user.ColumnSliceFilter; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; @@ -39,9 +39,9 @@ import org.apache.accumulo.testing.core.randomwalk.Test; public class Verify extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String table = state.getString("tableName"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); int numAccts = (Integer) state.get("numAccts"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Commit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Commit.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Commit.java index 09774ff..b7e5dae 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Commit.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Commit.java @@ -18,14 +18,14 @@ package org.apache.accumulo.testing.core.randomwalk.image; import java.util.Properties; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class Commit extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { env.getMultiTableBatchWriter().flush(); log.debug("Committed " + state.getLong("numWrites") + " writes. Total writes: " + state.getLong("totalWrites")); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java index 687b2d1..a638126 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ImageFixture.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.MultiTableBatchWriter; import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.impl.Tables; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.Fixture; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.hadoop.io.Text; @@ -42,10 +42,10 @@ public class ImageFixture extends Fixture { String indexTableName; @Override - public void setUp(State state, Environment env) throws Exception { + public void setUp(State state, RandWalkEnv env) throws Exception { - Connector conn = env.getConnector(); - Instance instance = env.getInstance(); + Connector conn = env.getAccumuloConnector(); + Instance instance = env.getAccumuloInstance(); SortedSet<Text> splits = new TreeSet<>(); for (int i = 1; i < 256; i++) { @@ -107,7 +107,7 @@ public class ImageFixture extends Fixture { } @Override - public void tearDown(State state, Environment env) throws Exception { + public void tearDown(State state, RandWalkEnv env) throws Exception { // We have resources we need to clean up if (env.isMultiTableBatchWriterInitialized()) { MultiTableBatchWriter mtbw = env.getMultiTableBatchWriter(); @@ -124,7 +124,7 @@ public class ImageFixture extends Fixture { // Now we can safely delete the tables log.debug("Dropping tables: " + imageTableName + " " + indexTableName); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); conn.tableOperations().delete(imageTableName); conn.tableOperations().delete(indexTableName); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java index dbd89e8..8fa1910 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -40,7 +40,7 @@ import org.apache.hadoop.io.Text; public class ScanMeta extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { // scan just the metadata of the images table to find N hashes... use the batch scanner to lookup those N hashes in the index table // this scan will test locality groups.... @@ -50,7 +50,7 @@ public class ScanMeta extends Test { String uuid = UUID.randomUUID().toString(); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); Scanner imageScanner = conn.createScanner(imageTableName, new Authorizations()); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java index 1d14a90..e7ad6b0 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/TableOp.java @@ -24,7 +24,7 @@ import java.util.Set; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.admin.TableOperations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text; public class TableOp extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { // choose a table Random rand = new Random(); @@ -44,7 +44,7 @@ public class TableOp extends Test { } // check if chosen table exists - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); TableOperations tableOps = conn.tableOperations(); if (tableOps.exists(tableName) == false) { log.error("Table " + tableName + " does not exist!"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java index f3caf15..fb20a5b 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Verify.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -42,7 +42,7 @@ public class Verify extends Test { String imageTableName; @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { Random rand = new Random(); @@ -52,7 +52,7 @@ public class Verify extends Test { indexTableName = state.getString("indexTableName"); imageTableName = state.getString("imageTableName"); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); Scanner indexScanner = conn.createScanner(indexTableName, new Authorizations()); Scanner imageScanner = conn.createScanner(imageTableName, new Authorizations()); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Write.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Write.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Write.java index f7a2781..965ba60 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Write.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/Write.java @@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.MultiTableBatchWriter; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -42,7 +42,7 @@ public class Write extends Test { static final Text CONTENT_COLUMN_FAMILY = new Text("content"); @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { MultiTableBatchWriter mtbw = env.getMultiTableBatchWriter(); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Commit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Commit.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Commit.java index 4ac6b47..72c3326 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Commit.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Commit.java @@ -18,14 +18,14 @@ package org.apache.accumulo.testing.core.randomwalk.multitable; import java.util.Properties; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class Commit extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { env.getMultiTableBatchWriter().flush(); Long numWrites = state.getLong("numWrites"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java index 8d1e451..a4cdbcf 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTable.java @@ -23,7 +23,7 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.impl.Tables; import org.apache.accumulo.testing.core.TestProps; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -41,7 +41,7 @@ public class CopyTable extends Test { } @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { @SuppressWarnings("unchecked") List<String> tables = (List<String>) state.get("tableList"); @@ -55,33 +55,33 @@ public class CopyTable extends Test { String dstTableName = String.format("%s_%d", state.getString("tableNamePrefix"), nextId); String[] args = new String[6]; - args[0] = env.getUserName(); - args[1] = env.getPassword(); + args[0] = env.getAccumuloUserName(); + args[1] = env.getAccumuloPassword(); if (null == args[1]) { - args[1] = env.getKeytab(); + args[1] = env.getAccumuloKeytab(); } args[2] = srcTableName; - args[3] = env.getInstance().getInstanceName(); + args[3] = env.getAccumuloInstance().getInstanceName(); args[4] = env.getConfigProperty(TestProps.ZOOKEEPERS); args[5] = dstTableName; log.debug("copying " + srcTableName + " to " + dstTableName); - env.getConnector().tableOperations().create(dstTableName); + env.getAccumuloConnector().tableOperations().create(dstTableName); - env.getConnector().tableOperations().addSplits(dstTableName, splits); + env.getAccumuloConnector().tableOperations().addSplits(dstTableName, splits); if (ToolRunner.run(env.getHadoopConfiguration(), new CopyTool(), args) != 0) { log.error("Failed to run map/red verify"); return; } - String tableId = Tables.getNameToIdMap(env.getInstance()).get(dstTableName); + String tableId = Tables.getNameToIdMap(env.getAccumuloInstance()).get(dstTableName); log.debug("copied " + srcTableName + " to " + dstTableName + " (id - " + tableId + " )"); tables.add(dstTableName); - env.getConnector().tableOperations().delete(srcTableName); + env.getAccumuloConnector().tableOperations().delete(srcTableName); log.debug("dropped " + srcTableName); nextId++; http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java index 4250003..f258297 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CreateTable.java @@ -23,7 +23,7 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.impl.Tables; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -40,8 +40,8 @@ public class CreateTable extends Test { } @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); int nextId = ((Integer) state.get("nextId")).intValue(); String tableName = String.format("%s_%d", state.getString("tableNamePrefix"), nextId); @@ -49,7 +49,7 @@ public class CreateTable extends Test { conn.tableOperations().create(tableName); // Add some splits to make the server's life easier conn.tableOperations().addSplits(tableName, splits); - String tableId = Tables.getNameToIdMap(env.getInstance()).get(tableName); + String tableId = Tables.getNameToIdMap(env.getAccumuloInstance()).get(tableName); log.debug("created " + tableName + " (id:" + tableId + ")"); // Add some splits to make the server's life easier conn.tableOperations().addSplits(tableName, splits); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java index 61904ca..a6069b8 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/DropTable.java @@ -21,14 +21,14 @@ import java.util.Properties; import java.util.Random; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class DropTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { @SuppressWarnings("unchecked") List<String> tables = (List<String>) state.get("tableList"); @@ -42,7 +42,7 @@ public class DropTable extends Test { String tableName = tables.remove(rand.nextInt(tables.size())); try { - env.getConnector().tableOperations().delete(tableName); + env.getAccumuloConnector().tableOperations().delete(tableName); log.debug("Dropped " + tableName); } catch (TableNotFoundException e) { log.error("Tried to drop table " + tableName + " but could not be found!"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java index 5a7a415..249acf1 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/MultiTableFixture.java @@ -24,14 +24,14 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.MultiTableBatchWriter; import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.Fixture; import org.apache.accumulo.testing.core.randomwalk.State; public class MultiTableFixture extends Fixture { @Override - public void setUp(State state, Environment env) throws Exception { + public void setUp(State state, RandWalkEnv env) throws Exception { String hostname = InetAddress.getLocalHost().getHostName().replaceAll("[-.]", "_"); @@ -43,7 +43,7 @@ public class MultiTableFixture extends Fixture { } @Override - public void tearDown(State state, Environment env) throws Exception { + public void tearDown(State state, RandWalkEnv env) throws Exception { // We have resources we need to clean up if (env.isMultiTableBatchWriterInitialized()) { MultiTableBatchWriter mtbw = env.getMultiTableBatchWriter(); @@ -57,7 +57,7 @@ public class MultiTableFixture extends Fixture { env.resetMultiTableBatchWriter(); } - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); @SuppressWarnings("unchecked") List<String> tables = (List<String>) state.get("tableList"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java index 70a6b21..d9e783f 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/OfflineTable.java @@ -20,14 +20,14 @@ import java.util.List; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class OfflineTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { @SuppressWarnings("unchecked") List<String> tables = (List<String>) state.get("tableList"); @@ -39,9 +39,9 @@ public class OfflineTable extends Test { Random rand = new Random(); String tableName = tables.get(rand.nextInt(tables.size())); - env.getConnector().tableOperations().offline(tableName, rand.nextBoolean()); + env.getAccumuloConnector().tableOperations().offline(tableName, rand.nextBoolean()); log.debug("Table " + tableName + " offline "); - env.getConnector().tableOperations().online(tableName, rand.nextBoolean()); + env.getAccumuloConnector().tableOperations().online(tableName, rand.nextBoolean()); log.debug("Table " + tableName + " online "); } } http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Write.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Write.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Write.java index 3c0c792..80e9c0e 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Write.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/Write.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text; public class Write extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { @SuppressWarnings("unchecked") List<String> tables = (List<String>) state.get("tableList"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java index c075541..dd0cd54 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterSystemPerm.java @@ -23,15 +23,15 @@ import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.security.SystemPermission; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class AlterSystemPerm extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getConnector(); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloConnector(); WalkingSecurity ws = new WalkingSecurity(state, env); String action = props.getProperty("task", "toggle"); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java index 0e613d8..77ce3bf 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTable.java @@ -25,15 +25,15 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.security.SecurityErrorCode; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class AlterTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); String tableName = WalkingSecurity.get(state, env).getTableName(); String namespaceName = WalkingSecurity.get(state, env).getNamespaceName(); @@ -46,7 +46,7 @@ public class AlterTable extends Test { renameTable(conn, state, env, tableName, newTableName, hasPermission, exists); } - public static void renameTable(Connector conn, State state, Environment env, String oldName, String newName, boolean hasPermission, boolean tableExists) + public static void renameTable(Connector conn, State state, RandWalkEnv env, String oldName, String newName, boolean hasPermission, boolean tableExists) throws AccumuloSecurityException, AccumuloException, TableExistsException { try { conn.tableOperations().rename(oldName, newName); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java index 381a801..6d6bf64 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java @@ -25,18 +25,18 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class AlterTablePerm extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { alter(state, env, props); } - public static void alter(State state, Environment env, Properties props) throws Exception { + public static void alter(State state, RandWalkEnv env, Properties props) throws Exception { String action = props.getProperty("task", "toggle"); String perm = props.getProperty("perm", "random"); String sourceUserProp = props.getProperty("source", "system"); @@ -71,19 +71,19 @@ public class AlterTablePerm extends Test { sourceUser = WalkingSecurity.get(state, env).getTabUserName(); sourceToken = WalkingSecurity.get(state, env).getTabToken(); } else { - sourceUser = env.getUserName(); + sourceUser = env.getAccumuloUserName(); sourceToken = env.getToken(); } - Connector conn = env.getInstance().getConnector(sourceUser, sourceToken); + Connector conn = env.getAccumuloInstance().getConnector(sourceUser, sourceToken); - canGive = WalkingSecurity.get(state, env).canGrantTable(new Credentials(sourceUser, sourceToken).toThrift(env.getInstance()), target, - WalkingSecurity.get(state, env).getTableName(), WalkingSecurity.get(state, env).getNamespaceName()); + canGive = WalkingSecurity.get(state, env).canGrantTable(new Credentials(sourceUser, sourceToken).toThrift(env.getAccumuloInstance()), target, + WalkingSecurity.get(state, env).getTableName(), WalkingSecurity.get(state, env).getNamespaceName()); // toggle if (!"take".equals(action) && !"give".equals(action)) { try { boolean res; - if (hasPerm != (res = env.getConnector().securityOperations().hasTablePermission(target, tableName, tabPerm))) + if (hasPerm != (res = env.getAccumuloConnector().securityOperations().hasTablePermission(target, tableName, tabPerm))) throw new AccumuloException("Test framework and accumulo are out of sync for user " + conn.whoami() + " for perm " + tabPerm.name() + " with local vs. accumulo being " + hasPerm + " " + res); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Authenticate.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Authenticate.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Authenticate.java index a9548c4..ba3c545 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Authenticate.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/Authenticate.java @@ -25,22 +25,22 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class Authenticate extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { authenticate(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken(), state, env, props); } - public static void authenticate(String principal, AuthenticationToken token, State state, Environment env, Properties props) throws Exception { + public static void authenticate(String principal, AuthenticationToken token, State state, RandWalkEnv env, Properties props) throws Exception { String targetProp = props.getProperty("target"); boolean success = Boolean.parseBoolean(props.getProperty("valid")); - Connector conn = env.getInstance().getConnector(principal, token); + Connector conn = env.getAccumuloInstance().getConnector(principal, token); String target; @@ -52,7 +52,7 @@ public class Authenticate extends Test { boolean exists = WalkingSecurity.get(state, env).userExists(target); // Copy so if failed it doesn't mess with the password stored in state byte[] password = Arrays.copyOf(WalkingSecurity.get(state, env).getUserPassword(target), WalkingSecurity.get(state, env).getUserPassword(target).length); - boolean hasPermission = WalkingSecurity.get(state, env).canAskAboutUser(new Credentials(principal, token).toThrift(env.getInstance()), target); + boolean hasPermission = WalkingSecurity.get(state, env).canAskAboutUser(new Credentials(principal, token).toThrift(env.getAccumuloInstance()), target); if (!success) for (int i = 0; i < password.length; i++) http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/ChangePass.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/ChangePass.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/ChangePass.java index e58db32..42ea317 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/ChangePass.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/ChangePass.java @@ -25,14 +25,14 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class ChangePass extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String target = props.getProperty("target"); String source = props.getProperty("source"); @@ -45,7 +45,7 @@ public class ChangePass extends Test { principal = WalkingSecurity.get(state, env).getTabUserName(); token = WalkingSecurity.get(state, env).getTabToken(); } - Connector conn = env.getInstance().getConnector(principal, token); + Connector conn = env.getAccumuloInstance().getConnector(principal, token); boolean hasPerm; boolean targetExists; @@ -56,7 +56,7 @@ public class ChangePass extends Test { targetExists = WalkingSecurity.get(state, env).userExists(target); - hasPerm = WalkingSecurity.get(state, env).canChangePassword(new Credentials(principal, token).toThrift(env.getInstance()), target); + hasPerm = WalkingSecurity.get(state, env).canChangePassword(new Credentials(principal, token).toThrift(env.getAccumuloInstance()), target); Random r = new Random(); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java index c0b1cd9..5e71410 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateTable.java @@ -24,15 +24,15 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.security.SecurityErrorCode; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class CreateTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); String tableName = WalkingSecurity.get(state, env).getTableName(); @@ -48,7 +48,7 @@ public class CreateTable extends Test { else { // create table anyway for sake of state try { - env.getConnector().tableOperations().create(tableName); + env.getAccumuloConnector().tableOperations().create(tableName); WalkingSecurity.get(state, env).initTable(tableName); } catch (TableExistsException tee) { if (exists) http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java index f604928..91e8f8b 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/CreateUser.java @@ -22,15 +22,15 @@ import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class CreateUser extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); String tableUserName = WalkingSecurity.get(state, env).getTabUserName(); @@ -47,7 +47,7 @@ public class CreateUser extends Test { else { // create user anyway for sake of state if (!exists) { - env.getConnector().securityOperations().createLocalUser(tableUserName, tabUserPass); + env.getAccumuloConnector().securityOperations().createLocalUser(tableUserName, tabUserPass); WalkingSecurity.get(state, env).createUser(tableUserName, tabUserPass); Thread.sleep(1000); } http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java index 235c9ba..a69b295 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java @@ -26,18 +26,18 @@ import org.apache.accumulo.core.client.TableNotFoundException; 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.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class DropTable extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { dropTable(state, env, props); } - public static void dropTable(State state, Environment env, Properties props) throws Exception { + public static void dropTable(State state, RandWalkEnv env, Properties props) throws Exception { String sourceUser = props.getProperty("source", "system"); String principal; AuthenticationToken token; @@ -48,14 +48,14 @@ public class DropTable extends Test { principal = WalkingSecurity.get(state, env).getSysUserName(); token = WalkingSecurity.get(state, env).getSysToken(); } - Connector conn = env.getInstance().getConnector(principal, token); + Connector conn = env.getAccumuloInstance().getConnector(principal, token); String tableName = WalkingSecurity.get(state, env).getTableName(); String namespaceName = WalkingSecurity.get(state, env).getNamespaceName(); boolean exists = WalkingSecurity.get(state, env).getTableExists(); - boolean hasPermission = WalkingSecurity.get(state, env).canDeleteTable(new Credentials(principal, token).toThrift(env.getInstance()), tableName, - namespaceName); + boolean hasPermission = WalkingSecurity.get(state, env).canDeleteTable(new Credentials(principal, token).toThrift(env.getAccumuloInstance()), tableName, + namespaceName); try { conn.tableOperations().delete(tableName); @@ -65,7 +65,7 @@ public class DropTable extends Test { throw new AccumuloException("Got a security exception when I should have had permission.", ae); else { // Drop anyway for sake of state - env.getConnector().tableOperations().delete(tableName); + env.getAccumuloConnector().tableOperations().delete(tableName); WalkingSecurity.get(state, env).cleanTablePermissions(tableName); return; } http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java index 8d6080b..7d1a9b6 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropUser.java @@ -21,15 +21,15 @@ import java.util.Properties; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class DropUser extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloInstance().getConnector(WalkingSecurity.get(state, env).getSysUserName(), WalkingSecurity.get(state, env).getSysToken()); String tableUserName = WalkingSecurity.get(state, env).getTabUserName(); @@ -45,7 +45,7 @@ public class DropUser extends Test { throw new AccumuloException("Got a security exception when I should have had permission.", ae); else { if (exists) { - env.getConnector().securityOperations().dropLocalUser(tableUserName); + env.getAccumuloConnector().securityOperations().dropLocalUser(tableUserName); WalkingSecurity.get(state, env).dropUser(tableUserName); } return; http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java index edfd15f..bc8fdc1 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SecurityFixture.java @@ -26,14 +26,14 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.Fixture; import org.apache.accumulo.testing.core.randomwalk.State; public class SecurityFixture extends Fixture { @Override - public void setUp(State state, Environment env) throws Exception { + public void setUp(State state, RandWalkEnv env) throws Exception { String secTableName, systemUserName, tableUserName, secNamespaceName; // A best-effort sanity check to guard against not password-based auth ClientConfiguration clientConf = ClientConfiguration.loadDefault(); @@ -41,7 +41,7 @@ public class SecurityFixture extends Fixture { throw new IllegalStateException("Security module currently cannot support Kerberos/SASL instances"); } - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); String hostname = InetAddress.getLocalHost().getHostName().replaceAll("[-.]", "_"); @@ -84,10 +84,10 @@ public class SecurityFixture extends Fixture { } @Override - public void tearDown(State state, Environment env) throws Exception { + public void tearDown(State state, RandWalkEnv env) throws Exception { log.debug("One last validate"); Validate.validate(state, env, log); - Connector conn = env.getConnector(); + Connector conn = env.getAccumuloConnector(); if (WalkingSecurity.get(state, env).getTableExists()) { String secTableName = WalkingSecurity.get(state, env).getTableName(); http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java index 54ab69f..d7a3cdd 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java @@ -25,14 +25,14 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; public class SetAuths extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { String authsString = props.getProperty("auths", "_random"); String targetUser = props.getProperty("system"); @@ -45,13 +45,13 @@ public class SetAuths extends Test { authToken = WalkingSecurity.get(state, env).getSysToken(); } else { target = WalkingSecurity.get(state, env).getSysUserName(); - authPrincipal = env.getUserName(); + authPrincipal = env.getAccumuloUserName(); authToken = env.getToken(); } - Connector conn = env.getInstance().getConnector(authPrincipal, authToken); + Connector conn = env.getAccumuloInstance().getConnector(authPrincipal, authToken); boolean exists = WalkingSecurity.get(state, env).userExists(target); - boolean hasPermission = WalkingSecurity.get(state, env).canChangeAuthorizations(new Credentials(authPrincipal, authToken).toThrift(env.getInstance()), + boolean hasPermission = WalkingSecurity.get(state, env).canChangeAuthorizations(new Credentials(authPrincipal, authToken).toThrift(env.getAccumuloInstance()), target); Authorizations auths; http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/fc3ddfc4/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java index d3335c4..7a40ac3 100644 --- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java +++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java @@ -45,7 +45,7 @@ import org.apache.accumulo.core.file.rfile.RFile; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.testing.core.randomwalk.Environment; +import org.apache.accumulo.testing.core.randomwalk.RandWalkEnv; import org.apache.accumulo.testing.core.randomwalk.State; import org.apache.accumulo.testing.core.randomwalk.Test; import org.apache.hadoop.fs.FileSystem; @@ -55,8 +55,8 @@ import org.apache.hadoop.io.Text; public class TableOp extends Test { @Override - public void visit(State state, Environment env, Properties props) throws Exception { - Connector conn = env.getInstance().getConnector(WalkingSecurity.get(state, env).getTabUserName(), WalkingSecurity.get(state, env).getTabToken()); + public void visit(State state, RandWalkEnv env, Properties props) throws Exception { + Connector conn = env.getAccumuloInstance().getConnector(WalkingSecurity.get(state, env).getTabUserName(), WalkingSecurity.get(state, env).getTabToken()); String action = props.getProperty("action", "_random"); TablePermission tp;
