accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject [01/12] git commit: ACCUMULO-2702 Create separate MR Client Opts
Date Mon, 21 Apr 2014 21:20:01 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 4e819419c -> 4dfcb9dec


ACCUMULO-2702 Create separate MR Client Opts

Separate the MR opts from the core client opts. There is plenty more
work to be done, but this is a reasonable first step in that direction.

We should probably be using a lot more composition than inheritance
overall, and this resulted in some slight code duplication, but the
change set would have been *much* more extensive otherwise.


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

Branch: refs/heads/master
Commit: f74c5c6da2a7532114599ac217b33072c03f05ec
Parents: 4e81941
Author: Mike Drob <mdrob@cloudera.com>
Authored: Mon Apr 21 13:05:18 2014 -0400
Committer: Mike Drob <mdrob@cloudera.com>
Committed: Mon Apr 21 17:17:48 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/cli/ClientOnDefaultTable.java | 30 +++--------
 .../core/cli/ClientOnRequiredTable.java         | 35 ++++---------
 .../apache/accumulo/core/cli/ClientOpts.java    |  8 ---
 .../core/cli/MapReduceClientOnDefaultTable.java | 49 ++++++++++++++++++
 .../cli/MapReduceClientOnRequiredTable.java     | 53 ++++++++++++++++++++
 .../accumulo/core/cli/MapReduceClientOpts.java  | 32 ++++++++++++
 .../org/apache/accumulo/core/util/Merge.java    | 10 ++--
 .../core/cli/ClientOnDefaultTableTest.java      | 43 ++++++++++++++++
 .../accumulo/examples/simple/client/Flush.java  |  2 +-
 .../simple/client/RandomBatchScanner.java       |  7 +--
 .../simple/client/RandomBatchWriter.java        |  2 +-
 .../simple/client/SequentialBatchWriter.java    |  2 +-
 .../examples/simple/dirlist/FileCount.java      |  4 +-
 .../examples/simple/dirlist/QueryUtil.java      |  2 +-
 .../simple/filedata/CharacterHistogram.java     |  4 +-
 .../simple/filedata/FileDataIngest.java         |  8 +--
 .../helloworld/InsertWithBatchWriter.java       |  6 +--
 .../examples/simple/helloworld/ReadData.java    |  2 +-
 .../simple/isolation/InterferenceTest.java      | 10 ++--
 .../examples/simple/mapreduce/NGramIngest.java  | 12 ++---
 .../examples/simple/mapreduce/RegexExample.java |  4 +-
 .../examples/simple/mapreduce/RowHash.java      |  4 +-
 .../examples/simple/mapreduce/TableToFile.java  |  4 +-
 .../simple/mapreduce/TeraSortIngest.java        |  6 +--
 .../simple/mapreduce/UniqueColumns.java         | 10 ++--
 .../examples/simple/mapreduce/WordCount.java    |  4 +-
 .../mapreduce/bulk/BulkIngestExample.java       |  8 +--
 .../simple/mapreduce/bulk/SetupTable.java       |  4 +-
 .../simple/mapreduce/bulk/VerifyIngest.java     |  2 +-
 .../accumulo/examples/simple/shard/Index.java   |  2 +-
 .../accumulo/examples/simple/shard/Query.java   |  2 +-
 .../examples/simple/dirlist/CountTest.java      |  2 +-
 .../accumulo/test/BulkImportDirectory.java      |  2 +-
 .../apache/accumulo/test/TestBinaryRows.java    | 12 ++---
 .../test/continuous/ContinuousIngest.java       |  4 +-
 .../continuous/ContinuousStatsCollector.java    |  2 +-
 .../test/continuous/ContinuousVerify.java       |  4 +-
 .../performance/scan/CollectTabletStats.java    | 12 ++---
 .../accumulo/test/randomwalk/bulk/Verify.java   |  2 +-
 .../accumulo/test/functional/BinaryIT.java      |  2 +-
 .../apache/accumulo/test/functional/BulkIT.java |  4 +-
 .../test/functional/FateStarvationIT.java       |  2 +-
 .../test/functional/MasterFailoverIT.java       |  2 +-
 .../accumulo/test/functional/RenameIT.java      |  6 +--
 .../accumulo/test/functional/TableIT.java       |  4 +-
 .../accumulo/test/functional/WriteLotsIT.java   |  4 +-
 46 files changed, 286 insertions(+), 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
index b86638a..d12f4a5 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
@@ -16,38 +16,22 @@
  */
 package org.apache.accumulo.core.cli;
 
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
-import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
-import org.apache.hadoop.mapreduce.Job;
-
 import com.beust.jcommander.Parameter;
 
 public class ClientOnDefaultTable extends ClientOpts {
-  private final String defaultTable;
-  
+  @Parameter(names = "--table", description = "table to use")
+  private String tableName;
+
   public ClientOnDefaultTable(String table) {
-    this.defaultTable = table;
+    this.tableName = table;
   }
   
-  @Parameter(names = "--table", description = "table to use")
-  public String tableName;
-  
   public String getTableName() {
-    if (tableName == null)
-      return defaultTable;
     return tableName;
   }
-  
-  @Override
-  public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
-    super.setAccumuloConfigs(job);
-    AccumuloInputFormat.setConnectorInfo(job, principal, getToken());
-    AccumuloInputFormat.setInputTableName(job, getTableName());
-    AccumuloInputFormat.setScanAuthorizations(job, auths);
-    AccumuloOutputFormat.setConnectorInfo(job, principal, getToken());
-    AccumuloOutputFormat.setCreateTables(job, true);
-    AccumuloOutputFormat.setDefaultTableName(job, getTableName());
+
+  public void setTableName(String tableName) {
+    this.tableName = tableName;
   }
   
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
index a451315..e6d331c 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
@@ -16,35 +16,18 @@
  */
 package org.apache.accumulo.core.cli;
 
-import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
-import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
-import org.apache.hadoop.mapreduce.Job;
-
 import com.beust.jcommander.Parameter;
 
+
 public class ClientOnRequiredTable extends ClientOpts {
-  
   @Parameter(names = {"-t", "--table"}, required = true, description = "table to use")
-  public String tableName = null;
-  
-  @Parameter(names = {"-tf", "--tokenFile"}, description = "File in hdfs containing the user's authentication token create with \"bin/accumulo create-token\"")
-  public String tokenFile = "";
-  
-  @Override
-  public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
-    super.setAccumuloConfigs(job);
-    
-    if (tokenFile.isEmpty()) {
-      AccumuloInputFormat.setConnectorInfo(job, principal, getToken());
-      AccumuloOutputFormat.setConnectorInfo(job, principal, getToken());
-    } else {
-      AccumuloInputFormat.setConnectorInfo(job, principal, tokenFile);
-      AccumuloOutputFormat.setConnectorInfo(job, principal, tokenFile);
-    }
-    AccumuloInputFormat.setInputTableName(job, tableName);
-    AccumuloInputFormat.setScanAuthorizations(job, auths);
-    AccumuloOutputFormat.setCreateTables(job, true);
-    AccumuloOutputFormat.setDefaultTableName(job, tableName);
+  private String tableName;
+
+  public String getTableName() {
+    return tableName;
+  }
+
+  public void setTableName(String tableName) {
+    this.tableName = tableName;
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index d209d3f..e582160 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -31,8 +31,6 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
-import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.Properties;
@@ -48,7 +46,6 @@ import org.apache.accumulo.trace.instrument.Trace;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.Job;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
@@ -213,11 +210,6 @@ public class ClientOpts extends Help {
     return getInstance().getConnector(principal, getToken());
   }
 
-  public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
-    AccumuloInputFormat.setZooKeeperInstance(job, this.getClientConfiguration());
-    AccumuloOutputFormat.setZooKeeperInstance(job, this.getClientConfiguration());
-  }
-
   protected ClientConfiguration getClientConfiguration() throws IllegalArgumentException {
     if (cachedClientConfig != null)
       return cachedClientConfig;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnDefaultTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnDefaultTable.java b/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnDefaultTable.java
new file mode 100644
index 0000000..e7a3dd4
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnDefaultTable.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.cli;
+
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
+import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
+import org.apache.hadoop.mapreduce.Job;
+
+import com.beust.jcommander.Parameter;
+
+public class MapReduceClientOnDefaultTable extends MapReduceClientOpts {
+  @Parameter(names = "--table", description = "table to use")
+  public String tableName;
+
+  public MapReduceClientOnDefaultTable(String table) {
+    this.tableName = table;
+  }
+
+  public String getTableName() {
+    return tableName;
+  }
+
+  @Override
+  public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
+    super.setAccumuloConfigs(job);
+    AccumuloInputFormat.setConnectorInfo(job, principal, getToken());
+    AccumuloInputFormat.setInputTableName(job, getTableName());
+    AccumuloInputFormat.setScanAuthorizations(job, auths);
+    AccumuloOutputFormat.setConnectorInfo(job, principal, getToken());
+    AccumuloOutputFormat.setCreateTables(job, true);
+    AccumuloOutputFormat.setDefaultTableName(job, getTableName());
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnRequiredTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnRequiredTable.java b/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnRequiredTable.java
new file mode 100644
index 0000000..abfc17d
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnRequiredTable.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.cli;
+
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
+import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
+import org.apache.hadoop.mapreduce.Job;
+
+import com.beust.jcommander.Parameter;
+
+public class MapReduceClientOnRequiredTable extends MapReduceClientOpts {
+  @Parameter(names = {"-t", "--table"}, required = true, description = "table to use")
+  private String tableName;
+
+  @Parameter(names = {"-tf", "--tokenFile"}, description = "File in hdfs containing the user's authentication token create with \"bin/accumulo create-token\"")
+  private String tokenFile = "";
+
+  @Override
+  public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
+    super.setAccumuloConfigs(job);
+
+    if (tokenFile.isEmpty()) {
+      AccumuloInputFormat.setConnectorInfo(job, principal, getToken());
+      AccumuloOutputFormat.setConnectorInfo(job, principal, getToken());
+    } else {
+      AccumuloInputFormat.setConnectorInfo(job, principal, tokenFile);
+      AccumuloOutputFormat.setConnectorInfo(job, principal, tokenFile);
+    }
+    AccumuloInputFormat.setInputTableName(job, getTableName());
+    AccumuloInputFormat.setScanAuthorizations(job, auths);
+    AccumuloOutputFormat.setCreateTables(job, true);
+    AccumuloOutputFormat.setDefaultTableName(job, getTableName());
+  }
+
+  public String getTableName() {
+    return tableName;
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOpts.java
new file mode 100644
index 0000000..4b3b7ed
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOpts.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.cli;
+
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
+import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
+import org.apache.hadoop.mapreduce.Job;
+
+/**
+ * Adds some MR awareness to the ClientOpts
+ */
+public class MapReduceClientOpts extends ClientOpts {
+  public void setAccumuloConfigs(Job job) throws AccumuloSecurityException {
+    AccumuloInputFormat.setZooKeeperInstance(job, this.getClientConfiguration());
+    AccumuloOutputFormat.setZooKeeperInstance(job, this.getClientConfiguration());
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/main/java/org/apache/accumulo/core/util/Merge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index 4c0a3ea..8049cd7 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@ -91,17 +91,17 @@ public class Merge {
     try {
       Connector conn = opts.getConnector();
       
-      if (!conn.tableOperations().exists(opts.tableName)) {
-        System.err.println("table " + opts.tableName + " does not exist");
+      if (!conn.tableOperations().exists(opts.getTableName())) {
+        System.err.println("table " + opts.getTableName() + " does not exist");
         return;
       }
       if (opts.goalSize == null || opts.goalSize < 1) {
-        AccumuloConfiguration tableConfig = new ConfigurationCopy(conn.tableOperations().getProperties(opts.tableName));
+        AccumuloConfiguration tableConfig = new ConfigurationCopy(conn.tableOperations().getProperties(opts.getTableName()));
         opts.goalSize = tableConfig.getMemoryInBytes(Property.TABLE_SPLIT_THRESHOLD);
       }
       
-      message("Merging tablets in table %s to %d bytes", opts.tableName, opts.goalSize);
-      mergomatic(conn, opts.tableName, opts.begin, opts.end, opts.goalSize, opts.force);
+      message("Merging tablets in table %s to %d bytes", opts.getTableName(), opts.goalSize);
+      mergomatic(conn, opts.getTableName(), opts.begin, opts.end, opts.goalSize, opts.force);
     } catch (Exception ex) {
       throw new MergeException(ex);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/core/src/test/java/org/apache/accumulo/core/cli/ClientOnDefaultTableTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/cli/ClientOnDefaultTableTest.java b/core/src/test/java/org/apache/accumulo/core/cli/ClientOnDefaultTableTest.java
new file mode 100644
index 0000000..78c0f1e
--- /dev/null
+++ b/core/src/test/java/org/apache/accumulo/core/cli/ClientOnDefaultTableTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.cli;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ClientOnDefaultTableTest {
+
+  ClientOnDefaultTable client;
+
+  @Before
+  public void setUp() {
+    client = new ClientOnDefaultTable("test");
+  }
+
+  @Test
+  public void testDefaultTable() {
+    assertEquals("test", client.getTableName());
+  }
+
+  @Test
+  public void testNonDefaultTable() {
+    client.parseArgs("program", new String[] {"--table", "other"});
+    assertEquals("other", client.getTableName());
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
index 225fac2..893ed3f 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/Flush.java
@@ -29,7 +29,7 @@ public class Flush {
     opts.parseArgs(Flush.class.getName(), args);
     try {
       Connector connector = opts.getConnector();
-      connector.tableOperations().flush(opts.tableName, null, null, true);
+      connector.tableOperations().flush(opts.getTableName(), null, null, true);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index 5fe23a5..4aa8269 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -16,12 +16,14 @@
  */
 package org.apache.accumulo.examples.simple.client;
 
+import static org.apache.accumulo.examples.simple.client.RandomBatchWriter.abs;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.cli.BatchScannerOpts;
 import org.apache.accumulo.core.cli.ClientOnRequiredTable;
@@ -35,7 +37,6 @@ import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
-import static org.apache.accumulo.examples.simple.client.RandomBatchWriter.abs;
 
 import com.beust.jcommander.Parameter;
 
@@ -198,7 +199,7 @@ public class RandomBatchScanner {
     opts.parseArgs(RandomBatchScanner.class.getName(), args, bsOpts);
     
     Connector connector = opts.getConnector();
-    BatchScanner batchReader = connector.createBatchScanner(opts.tableName, opts.auths, bsOpts.scanThreads);
+    BatchScanner batchReader = connector.createBatchScanner(opts.getTableName(), opts.auths, bsOpts.scanThreads);
     batchReader.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS);
     
     Random r;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
index 44947d1..50c5d06 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java
@@ -139,7 +139,7 @@ public class RandomBatchWriter {
       r = new Random(opts.seed);
     }
     Connector connector = opts.getConnector();
-    BatchWriter bw = connector.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());
+    BatchWriter bw = connector.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
 
     // reuse the ColumnVisibility object to improve performance
     ColumnVisibility cv = opts.visiblity;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
index c37c1c3..3ae21e9 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/SequentialBatchWriter.java
@@ -54,7 +54,7 @@ public class SequentialBatchWriter {
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     opts.parseArgs(SequentialBatchWriter.class.getName(), args, bwOpts);
     Connector connector = opts.getConnector();
-    BatchWriter bw = connector.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());
+    BatchWriter bw = connector.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
     
     long end = opts.start + opts.num;
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
index a810b38..cb6d350 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/FileCount.java
@@ -246,9 +246,9 @@ public class FileCount {
     inserts = 0;
     
     Connector conn = opts.getConnector();
-    Scanner scanner = conn.createScanner(opts.tableName, opts.auths);
+    Scanner scanner = conn.createScanner(opts.getTableName(), opts.auths);
     scanner.setBatchSize(scanOpts.scanBatchSize);
-    BatchWriter bw = conn.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());
+    BatchWriter bw = conn.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
     
     long t1 = System.currentTimeMillis();
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
index 7795ec3..09fb40c 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/QueryUtil.java
@@ -53,7 +53,7 @@ public class QueryUtil {
   public QueryUtil(Opts opts) throws AccumuloException,
       AccumuloSecurityException {
     conn = opts.getConnector();
-    this.tableName = opts.tableName;
+    this.tableName = opts.getTableName();
     this.auths = opts.auths;
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
index d0662b6..c760ee3 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
@@ -76,7 +76,7 @@ public class CharacterHistogram extends Configured implements Tool {
     }
   }
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--vis")
     String visibilities = "";
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
index 78fef0d..52ea0bd 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataIngest.java
@@ -188,11 +188,11 @@ public class FileDataIngest {
     opts.parseArgs(FileDataIngest.class.getName(), args, bwOpts);
     
     Connector conn = opts.getConnector();
-    if (!conn.tableOperations().exists(opts.tableName)) {
-      conn.tableOperations().create(opts.tableName);
-      conn.tableOperations().attachIterator(opts.tableName, new IteratorSetting(1, ChunkCombiner.class));
+    if (!conn.tableOperations().exists(opts.getTableName())) {
+      conn.tableOperations().create(opts.getTableName());
+      conn.tableOperations().attachIterator(opts.getTableName(), new IteratorSetting(1, ChunkCombiner.class));
     }
-    BatchWriter bw = conn.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());
+    BatchWriter bw = conn.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
     FileDataIngest fdi = new FileDataIngest(opts.chunkSize, opts.visibility);
     for (String filename : opts.files) {
       fdi.insertFileData(filename, bw);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
index b980133..74d8548 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
@@ -44,9 +44,9 @@ public class InsertWithBatchWriter {
     Connector connector = opts.getConnector();
     MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(bwOpts.getBatchWriterConfig());
     
-    if (!connector.tableOperations().exists(opts.tableName))
-      connector.tableOperations().create(opts.tableName);
-    BatchWriter bw = mtbw.getBatchWriter(opts.tableName);
+    if (!connector.tableOperations().exists(opts.getTableName()))
+      connector.tableOperations().create(opts.getTableName());
+    BatchWriter bw = mtbw.getBatchWriter(opts.getTableName());
     
     Text colf = new Text("colfam");
     System.out.println("writing ...");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
index 97bb633..4eaa31f 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
@@ -55,7 +55,7 @@ public class ReadData {
     
     Connector connector = opts.getConnector();
     
-    Scanner scan = connector.createScanner(opts.tableName, opts.auths);
+    Scanner scan = connector.createScanner(opts.getTableName(), opts.auths);
     scan.setBatchSize(scanOpts.scanBatchSize);
     Key start = null;
     if (opts.startKey != null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
index a90848e..db8c139 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/isolation/InterferenceTest.java
@@ -160,16 +160,16 @@ public class InterferenceTest {
       opts.iterations = Long.MAX_VALUE;
     
     Connector conn = opts.getConnector();
-    if (!conn.tableOperations().exists(opts.tableName))
-      conn.tableOperations().create(opts.tableName);
+    if (!conn.tableOperations().exists(opts.getTableName()))
+      conn.tableOperations().create(opts.getTableName());
     
-    Thread writer = new Thread(new Writer(conn.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig()), opts.iterations));
+    Thread writer = new Thread(new Writer(conn.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig()), opts.iterations));
     writer.start();
     Reader r;
     if (opts.isolated)
-      r = new Reader(new IsolatedScanner(conn.createScanner(opts.tableName, opts.auths)));
+      r = new Reader(new IsolatedScanner(conn.createScanner(opts.getTableName(), opts.auths)));
     else
-      r = new Reader(conn.createScanner(opts.tableName, opts.auths));
+      r = new Reader(conn.createScanner(opts.getTableName(), opts.auths));
     Thread reader;
     reader = new Thread(r);
     reader.start();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
index f8d0b0b..6ae74ce 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
@@ -45,7 +45,7 @@ public class NGramIngest extends Configured implements Tool {
 
   private static final Logger log = Logger.getLogger(NGramIngest.class);
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--input", required = true)
     String inputDirectory;
   }
@@ -83,9 +83,9 @@ public class NGramIngest extends Configured implements Tool {
     job.setNumReduceTasks(0);
     job.setSpeculativeExecution(false);
 
-    if (!opts.getConnector().tableOperations().exists(opts.tableName)) {
-      log.info("Creating table " + opts.tableName);
-      opts.getConnector().tableOperations().create(opts.tableName);
+    if (!opts.getConnector().tableOperations().exists(opts.getTableName())) {
+      log.info("Creating table " + opts.getTableName());
+      opts.getConnector().tableOperations().create(opts.getTableName());
       SortedSet<Text> splits = new TreeSet<Text>();
       String numbers[] = "1 2 3 4 5 6 7 8 9".split("\\s");
       String lower[] = "a b c d e f g h i j k l m n o p q r s t u v w x y z".split("\\s");
@@ -95,7 +95,7 @@ public class NGramIngest extends Configured implements Tool {
           splits.add(new Text(s));
         }
       }
-      opts.getConnector().tableOperations().addSplits(opts.tableName, splits);
+      opts.getConnector().tableOperations().addSplits(opts.getTableName(), splits);
     }
 
     TextInputFormat.addInputPath(job, new Path(opts.inputDirectory));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
index 47e5879..d6695e6 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.IOException;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.Key;
@@ -43,7 +43,7 @@ public class RegexExample extends Configured implements Tool {
     }
   }
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--rowRegex")
     String rowRegex;
     @Parameter(names = "--columnFamilyRegex")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
index 1fa9b8f..904713d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
@@ -19,7 +19,7 @@ package org.apache.accumulo.examples.simple.mapreduce;
 import java.io.IOException;
 import java.util.Collections;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.data.Key;
@@ -55,7 +55,7 @@ public class RowHash extends Configured implements Tool {
     public void setup(Context job) {}
   }
 
-  private static class Opts extends ClientOnRequiredTable {
+  private static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--column", required = true)
     String column = null;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
index 094e6c1..351a51c 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
@@ -21,7 +21,7 @@ import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.Key;
@@ -47,7 +47,7 @@ import com.beust.jcommander.Parameter;
  */
 public class TableToFile extends Configured implements Tool {
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--output", description = "output directory", required = true)
     String output;
     @Parameter(names = "--columns", description = "columns to extract, in cf:cq{,cf:cq,...} form")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index f9f2d39..33a9fa1 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.data.Mutation;
@@ -351,7 +351,7 @@ public class TeraSortIngest extends Configured implements Tool {
     ToolRunner.run(new Configuration(), new TeraSortIngest(), args);
   }
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--count", description = "number of rows to ingest", required = true)
     long numRows;
     @Parameter(names = {"-nk", "--minKeySize"}, description = "miniumum key size", required = true)
@@ -392,7 +392,7 @@ public class TeraSortIngest extends Configured implements Tool {
     conf.setInt("cloudgen.maxkeylength", opts.maxKeyLength);
     conf.setInt("cloudgen.minvaluelength", opts.minValueLength);
     conf.setInt("cloudgen.maxvaluelength", opts.maxValueLength);
-    conf.set("cloudgen.tablename", opts.tableName);
+    conf.set("cloudgen.tablename", opts.getTableName());
 
     if (args.length > 10)
       conf.setInt(NUMSPLITS, opts.splits);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
index e0e29ce..7c0b91a 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.ByteSequence;
@@ -73,7 +73,7 @@ public class UniqueColumns extends Configured implements Tool {
     }
   }
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--output", description = "output directory")
     String output;
     @Parameter(names = "--reducers", description = "number of reducers to use", required = true)
@@ -93,7 +93,7 @@ public class UniqueColumns extends Configured implements Tool {
     job.setJobName(jobName);
     job.setJarByClass(this.getClass());
 
-    String clone = opts.tableName;
+    String clone = opts.getTableName();
     Connector conn = null;
 
     opts.setAccumuloConfigs(job);
@@ -105,8 +105,8 @@ public class UniqueColumns extends Configured implements Tool {
        */
 
       conn = opts.getConnector();
-      clone = opts.tableName + "_" + jobName;
-      conn.tableOperations().clone(opts.tableName, clone, true, new HashMap<String,String>(), new HashSet<String>());
+      clone = opts.getTableName() + "_" + jobName;
+      conn.tableOperations().clone(opts.getTableName(), clone, true, new HashMap<String,String>(), new HashSet<String>());
       conn.tableOperations().offline(clone);
 
       AccumuloInputFormat.setOfflineTableScan(job, true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
index 220b85c..f114a24 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java
@@ -18,7 +18,7 @@ package org.apache.accumulo.examples.simple.mapreduce;
 
 import java.io.IOException;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
@@ -41,7 +41,7 @@ import com.beust.jcommander.Parameter;
  */
 public class WordCount extends Configured implements Tool {
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--input", description = "input directory")
     String inputDirectory;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
index 72bd7eb..1a43ec2 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collection;
 
-import org.apache.accumulo.core.cli.ClientOnRequiredTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.mapreduce.AccumuloFileOutputFormat;
 import org.apache.accumulo.core.client.mapreduce.lib.partition.RangePartitioner;
@@ -94,7 +94,7 @@ public class BulkIngestExample extends Configured implements Tool {
     }
   }
 
-  static class Opts extends ClientOnRequiredTable {
+  static class Opts extends MapReduceClientOnRequiredTable {
     @Parameter(names = "--inputDir", required = true)
     String inputDir;
     @Parameter(names = "--workDir", required = true)
@@ -131,7 +131,7 @@ public class BulkIngestExample extends Configured implements Tool {
       FileSystem fs = FileSystem.get(conf);
       out = new PrintStream(new BufferedOutputStream(fs.create(new Path(opts.workDir + "/splits.txt"))));
 
-      Collection<Text> splits = connector.tableOperations().listSplits(opts.tableName, 100);
+      Collection<Text> splits = connector.tableOperations().listSplits(opts.getTableName(), 100);
       for (Text split : splits)
         out.println(new String(Base64.encodeBase64(TextUtil.getBytes(split))));
 
@@ -145,7 +145,7 @@ public class BulkIngestExample extends Configured implements Tool {
       Path failures = new Path(opts.workDir, "failures");
       fs.delete(failures, true);
       fs.mkdirs(new Path(opts.workDir, "failures"));
-      connector.tableOperations().importDirectory(opts.tableName, opts.workDir + "/files", opts.workDir + "/failures", false);
+      connector.tableOperations().importDirectory(opts.getTableName(), opts.workDir + "/files", opts.workDir + "/failures", false);
 
     } catch (Exception e) {
       throw new RuntimeException(e);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
index b6d3d13..ac96e9d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/SetupTable.java
@@ -37,14 +37,14 @@ public class SetupTable {
     Opts opts = new Opts();
     opts.parseArgs(SetupTable.class.getName(), args);
     Connector conn = opts.getConnector();
-    conn.tableOperations().create(opts.tableName);
+    conn.tableOperations().create(opts.getTableName());
     if (!opts.splits.isEmpty()) {
       // create a table with initial partitions
       TreeSet<Text> intialPartitions = new TreeSet<Text>();
       for (String split : opts.splits) {
         intialPartitions.add(new Text(split));
       }
-      conn.tableOperations().addSplits(opts.tableName, intialPartitions);
+      conn.tableOperations().addSplits(opts.getTableName(), intialPartitions);
     } 
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
index 4366416..61d3f7e 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/VerifyIngest.java
@@ -48,7 +48,7 @@ public class VerifyIngest {
     opts.parseArgs(VerifyIngest.class.getName(), args);
     
     Connector connector = opts.getConnector();
-    Scanner scanner = connector.createScanner(opts.tableName, opts.auths);
+    Scanner scanner = connector.createScanner(opts.getTableName(), opts.auths);
     
     scanner.setRange(new Range(new Text(String.format("row_%08d", opts.startRow)), null));
     

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
index 4731061..accb3a0 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Index.java
@@ -105,7 +105,7 @@ public class Index {
     
     String splitRegex = "\\W+";
     
-    BatchWriter bw = opts.getConnector().createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());    
+    BatchWriter bw = opts.getConnector().createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
     for (String filename : opts.files) {
       index(opts.partitions, new File(filename), splitRegex, bw);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
index aa12c71..b0502a7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/Query.java
@@ -71,7 +71,7 @@ public class Query {
     BatchScannerOpts bsOpts = new BatchScannerOpts();
     opts.parseArgs(Query.class.getName(), args, bsOpts);
     Connector conn = opts.getConnector();
-    BatchScanner bs = conn.createBatchScanner(opts.tableName, opts.auths, bsOpts.scanThreads);
+    BatchScanner bs = conn.createBatchScanner(opts.getTableName(), opts.auths, bsOpts.scanThreads);
     bs.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS);
 
     for (String entry : query(bs, opts.terms))

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
index b32918e..f5f5d02 100644
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
@@ -70,7 +70,7 @@ public class CountTest extends TestCase {
     ScannerOpts scanOpts = new ScannerOpts();
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     opts.instance = "counttest";
-    opts.tableName = "dirlisttable";
+    opts.setTableName("dirlisttable");
     opts.password = new Password("secret");
     opts.mock = true;
     opts.password = new Opts.Password("");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java b/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
index 42a8041..93c2e98 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
@@ -62,7 +62,7 @@ public class BulkImportDirectory {
       opts.parseArgs(BulkImportDirectory.class.getName(), args);
       fs.delete(new Path(opts.failures), true);
       fs.mkdirs(new Path(opts.failures));
-      opts.getConnector().tableOperations().importDirectory(opts.tableName, opts.source, opts.failures, false);
+      opts.getConnector().tableOperations().importDirectory(opts.getTableName(), opts.source, opts.failures, false);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
index c2af60c..a5ac0e8 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
@@ -85,7 +85,7 @@ public class TestBinaryRows {
     final Text CF = new Text("cf"), CQ = new Text("cq");
     final byte[] CF_BYTES = "cf".getBytes(StandardCharsets.UTF_8), CQ_BYTES = "cq".getBytes(StandardCharsets.UTF_8);
     if (opts.mode.equals("ingest") || opts.mode.equals("delete")) {
-      BatchWriter bw = connector.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());
+      BatchWriter bw = connector.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig());
       boolean delete = opts.mode.equals("delete");
       
       for (long i = 0; i < opts.num; i++) {
@@ -103,7 +103,7 @@ public class TestBinaryRows {
       
       bw.close();
     } else if (opts.mode.equals("verifyDeleted")) {
-      Scanner s = connector.createScanner(opts.tableName, opts.auths);
+      Scanner s = connector.createScanner(opts.getTableName(), opts.auths);
       s.setBatchSize(scanOpts.scanBatchSize);
       Key startKey = new Key(encodeLong(opts.start), CF_BYTES, CQ_BYTES, new byte[0], Long.MAX_VALUE);
       Key stopKey = new Key(encodeLong(opts.start + opts.num - 1), CF_BYTES, CQ_BYTES, new byte[0], 0);
@@ -117,7 +117,7 @@ public class TestBinaryRows {
     } else if (opts.mode.equals("verify")) {
       long t1 = System.currentTimeMillis();
       
-      Scanner s = connector.createScanner(opts.tableName, opts.auths);
+      Scanner s = connector.createScanner(opts.getTableName(), opts.auths);
       Key startKey = new Key(encodeLong(opts.start), CF_BYTES, CQ_BYTES, new byte[0], Long.MAX_VALUE);
       Key stopKey = new Key(encodeLong(opts.start + opts.num - 1), CF_BYTES, CQ_BYTES, new byte[0], 0);
       s.setBatchSize(scanOpts.scanBatchSize);
@@ -153,7 +153,7 @@ public class TestBinaryRows {
       for (int i = 0; i < numLookups; i++) {
         long row = ((r.nextLong() & 0x7fffffffffffffffl) % opts.num) + opts.start;
         
-        Scanner s = connector.createScanner(opts.tableName, opts.auths);
+        Scanner s = connector.createScanner(opts.getTableName(), opts.auths);
         s.setBatchSize(scanOpts.scanBatchSize);
         Key startKey = new Key(encodeLong(row), CF_BYTES, CQ_BYTES, new byte[0], Long.MAX_VALUE);
         Key stopKey = new Key(encodeLong(row), CF_BYTES, CQ_BYTES, new byte[0], 0);
@@ -195,8 +195,8 @@ public class TestBinaryRows {
         System.out.printf("added split point 0x%016x  %,12d%n", splitPoint, splitPoint);
       }
       
-      connector.tableOperations().create(opts.tableName);
-      connector.tableOperations().addSplits(opts.tableName, splits);
+      connector.tableOperations().create(opts.getTableName());
+      connector.tableOperations().addSplits(opts.getTableName(), splits);
       
     } else {
       throw new Exception("ERROR : " + opts.mode + " is not a valid operation.");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
index 2aca579..d6a16df 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
@@ -30,7 +30,7 @@ import java.util.zip.Checksum;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.cli.ClientOnDefaultTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnDefaultTable;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -56,7 +56,7 @@ import com.beust.jcommander.Parameter;
 
 public class ContinuousIngest {
   
-  static public class BaseOpts extends ClientOnDefaultTable {
+  static public class BaseOpts extends MapReduceClientOnDefaultTable {
     public class DebugConverter implements IStringConverter<String> {
       @Override
       public String convert(String debugLog) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
index f8cb0a8..458afe0 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
@@ -65,7 +65,7 @@ public class ContinuousStatsCollector {
     public StatsCollectionTask(Opts opts, int scanBatchSize) {
       this.opts = opts;
       this.scanBatchSize = scanBatchSize;
-      this.tableId = Tables.getNameToIdMap(opts.getInstance()).get(opts.tableName);
+      this.tableId = Tables.getNameToIdMap(opts.getInstance()).get(opts.getTableName());
       System.out
           .println("TIME TABLET_SERVERS TOTAL_ENTRIES TOTAL_INGEST TOTAL_QUERY TABLE_RECS TABLE_RECS_IN_MEM TABLE_INGEST TABLE_QUERY TABLE_TABLETS TABLE_TABLETS_ONLINE"
               + " ACCUMULO_DU ACCUMULO_DIRS ACCUMULO_FILES TABLE_DU TABLE_DIRS TABLE_FILES"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index d56ccde..cd8e021 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.accumulo.core.cli.ClientOnDefaultTable;
+import org.apache.accumulo.core.cli.MapReduceClientOnDefaultTable;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.data.Key;
@@ -158,7 +158,7 @@ public class ContinuousVerify extends Configured implements Tool {
     }
   }
 
-  static class Opts extends ClientOnDefaultTable {
+  static class Opts extends MapReduceClientOnDefaultTable {
     @Parameter(names = "--output", description = "location in HDFS to store the results; must not exist", required = true)
     String outputDir = "/tmp/continuousVerify";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
index d2c8d0f..2195483 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
@@ -109,14 +109,14 @@ public class CollectTabletStats {
     Instance instance = opts.getInstance();
     final ServerConfiguration sconf = new ServerConfiguration(instance);
     
-    String tableId = Tables.getNameToIdMap(instance).get(opts.tableName);
+    String tableId = Tables.getNameToIdMap(instance).get(opts.getTableName());
     if (tableId == null) {
-      log.error("Unable to find table named " + opts.tableName);
+      log.error("Unable to find table named " + opts.getTableName());
       System.exit(-1);
     }
     
     TreeMap<KeyExtent,String> tabletLocations = new TreeMap<KeyExtent,String>();
-    List<KeyExtent> candidates = findTablets(!opts.selectFarTablets, new Credentials(opts.principal, opts.getToken()), opts.tableName, instance,
+    List<KeyExtent> candidates = findTablets(!opts.selectFarTablets, new Credentials(opts.principal, opts.getToken()), opts.getTableName(), instance,
         tabletLocations);
     
     if (candidates.size() < opts.numThreads) {
@@ -136,7 +136,7 @@ public class CollectTabletStats {
     System.out.println();
     System.out.println("run location      : " + InetAddress.getLocalHost().getHostName() + "/" + InetAddress.getLocalHost().getHostAddress());
     System.out.println("num threads       : " + opts.numThreads);
-    System.out.println("table             : " + opts.tableName);
+    System.out.println("table             : " + opts.getTableName());
     System.out.println("table id          : " + tableId);
     
     for (KeyExtent ke : tabletsToTest) {
@@ -217,7 +217,7 @@ public class CollectTabletStats {
         Test test = new Test(ke) {
           @Override
           public int runTest() throws Exception {
-            return scanTablet(conn, opts.tableName, opts.auths, scanOpts.scanBatchSize, ke.getPrevEndRow(), ke.getEndRow(), columns);
+            return scanTablet(conn, opts.getTableName(), opts.auths, scanOpts.scanBatchSize, ke.getPrevEndRow(), ke.getEndRow(), columns);
           }
         };
         
@@ -234,7 +234,7 @@ public class CollectTabletStats {
         @Override
         public void run() {
           try {
-            calcTabletStats(conn, opts.tableName, opts.auths, scanOpts.scanBatchSize, ke, columns);
+            calcTabletStats(conn, opts.getTableName(), opts.auths, scanOpts.scanBatchSize, ke, columns);
           } catch (Exception e) {
             e.printStackTrace();
           }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index c36e4a0..852fe37 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -105,7 +105,7 @@ public class Verify extends Test {
   public static void main(String args[]) throws Exception {
     ClientOnRequiredTable opts = new ClientOnRequiredTable();
     opts.parseArgs(Verify.class.getName(), args);
-    Scanner scanner = opts.getConnector().createScanner(opts.tableName, opts.auths);
+    Scanner scanner = opts.getConnector().createScanner(opts.getTableName(), opts.auths);
     scanner.fetchColumnFamily(BulkPlusOne.CHECK_COLUMN_FAMILY);
     Text startBadRow = null;
     Text lastBadRow = null;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
index e6c73c2..ef9034b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
@@ -55,7 +55,7 @@ public class BinaryIT extends ConfigurableMacIT {
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     ScannerOpts scanOpts = new ScannerOpts();
     TestBinaryRows.Opts opts = new TestBinaryRows.Opts();
-    opts.tableName = "bt";
+    opts.setTableName("bt");
     opts.start = 0;
     opts.num = 100000;
     opts.mode = "ingest";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
index 831dcd4..9520884 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -62,7 +62,7 @@ public class BulkIT extends SimpleMacIT {
     opts.rows = N;
     opts.instance = c.getInstance().getInstanceName();
     opts.cols = 1;
-    opts.tableName = tableName;
+    opts.setTableName(tableName);
     String fileFormat = "/testrf/"+filePrefix+"rf%02d";
     for (int i = 0; i < COUNT; i++) {
       opts.outputFile = base + String.format(fileFormat, i);
@@ -76,7 +76,7 @@ public class BulkIT extends SimpleMacIT {
     TestIngest.ingest(c, opts, BWOPTS);
     c.tableOperations().importDirectory(tableName, base + "/testrf", bulkFailures, false);
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    vopts.tableName = tableName;
+    vopts.setTableName(tableName);
     vopts.random = 56;
     for (int i = 0; i < COUNT; i++) {
       vopts.startRow = i * N;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
index 4d75a16..69e4595 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java
@@ -50,7 +50,7 @@ public class FateStarvationIT extends SimpleMacIT {
     opts.dataSize = 50;
     opts.rows = 100000;
     opts.cols = 1;
-    opts.tableName = tableName;
+    opts.setTableName(tableName);
     TestIngest.ingest(c, opts, new BatchWriterOpts());
 
     c.tableOperations().flush(tableName, null, null, true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
index 218d65e..4fd8b70 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
@@ -56,7 +56,7 @@ public class MasterFailoverIT extends ConfigurableMacIT {
     c.tableOperations().rename("test_ingest", "test_ingest2");
     try {
       VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-      vopts.tableName = "test_ingest2";
+      vopts.setTableName("test_ingest2");
       VerifyIngest.verifyIngest(c, vopts, SOPTS);
     } finally {
       p.destroy();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
index 8cbe84f..521ff84 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java
@@ -39,17 +39,17 @@ public class RenameIT extends SimpleMacIT {
     ScannerOpts scanOpts = new ScannerOpts();
     TestIngest.Opts opts = new TestIngest.Opts();
     opts.createTable = true;
-    opts.tableName = name1;
+    opts.setTableName(name1);
     Connector c = getConnector();
     TestIngest.ingest(c, opts, bwOpts);
     c.tableOperations().rename(name1, name2);
     TestIngest.ingest(c, opts, bwOpts);
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    vopts.tableName = name2;
+    vopts.setTableName(name2);
     VerifyIngest.verifyIngest(c, vopts, scanOpts);
     c.tableOperations().delete(name1);
     c.tableOperations().rename(name2, name1);
-    vopts.tableName = name1;
+    vopts.setTableName(name1);
     VerifyIngest.verifyIngest(c, vopts, scanOpts);
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
index 832ec60..19ea002 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
@@ -53,11 +53,11 @@ public class TableIT extends SimpleMacIT {
     String tableName = getUniqueNames(1)[0];
     to.create(tableName);
     TestIngest.Opts opts = new TestIngest.Opts();
-    opts.tableName = tableName;
+    opts.setTableName(tableName);
     TestIngest.ingest(c, opts, new BatchWriterOpts());
     to.flush(tableName, null, null, true);
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-    vopts.tableName = tableName;
+    vopts.setTableName(tableName);
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
     String id = to.tableIdMap().get(tableName);
     Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74c5c6d/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
index 214fc2f..9515089 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java
@@ -50,7 +50,7 @@ public class WriteLotsIT extends SimpleMacIT {
             TestIngest.Opts opts = new TestIngest.Opts();
             opts.startRow = index * 10000;
             opts.rows = 10000;
-            opts.tableName = tableName;
+            opts.setTableName(tableName);
             TestIngest.ingest(c, opts, new BatchWriterOpts());
           } catch (Exception ex) {
             ref.set(ex);
@@ -68,7 +68,7 @@ public class WriteLotsIT extends SimpleMacIT {
     }
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     vopts.rows = 10000 * 10;
-    vopts.tableName = tableName;
+    vopts.setTableName(tableName);
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
   }
 


Mime
View raw message