You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/02/20 03:58:35 UTC
[1/5] accumulo git commit: ACCUMULO-4145 Eliminate Text wrapping of
tableIDs
Repository: accumulo
Updated Branches:
refs/heads/master e20550202 -> a14bc292d
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index 5c892ef..c101a3a 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -239,7 +239,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
final IteratorSetting setting = new IteratorSetting(100, "slow", SlowIterator.class.getName(), Collections.singletonMap("sleepTime", "200"));
- String table;
+ String tableName;
ByteBuffer badLogin;
@Before
@@ -285,19 +285,19 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
// Create a general table to be used
- table = getUniqueNames(1)[0];
- client.createTable(creds, table, true, TimeType.MILLIS);
+ tableName = getUniqueNames(1)[0];
+ client.createTable(creds, tableName, true, TimeType.MILLIS);
}
@After
public void teardown() throws Exception {
- if (null != table) {
+ if (null != tableName) {
if (isKerberosEnabled()) {
UserGroupInformation.loginUserFromKeytab(clientPrincipal, clientKeytab.getAbsolutePath());
}
try {
- if (client.tableExists(creds, table)) {
- client.deleteTable(creds, table);
+ if (client.tableExists(creds, tableName)) {
+ client.deleteTable(creds, tableName);
}
} catch (Exception e) {
log.warn("Failed to delete test table", e);
@@ -316,72 +316,72 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void addConstraintLoginFailure() throws Exception {
- client.addConstraint(badLogin, table, NumericValueConstraint.class.getName());
+ client.addConstraint(badLogin, tableName, NumericValueConstraint.class.getName());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void addSplitsLoginFailure() throws Exception {
- client.addSplits(badLogin, table, Collections.singleton(s2bb("1")));
+ client.addSplits(badLogin, tableName, Collections.singleton(s2bb("1")));
}
@Test(expected = TApplicationException.class, timeout = 5000)
public void clearLocatorCacheLoginFailure() throws Exception {
- client.clearLocatorCache(badLogin, table);
+ client.clearLocatorCache(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void compactTableLoginFailure() throws Exception {
- client.compactTable(badLogin, table, null, null, null, true, false, null);
+ client.compactTable(badLogin, tableName, null, null, null, true, false, null);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void cancelCompactionLoginFailure() throws Exception {
- client.cancelCompaction(badLogin, table);
+ client.cancelCompaction(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void createTableLoginFailure() throws Exception {
- client.createTable(badLogin, table, false, TimeType.MILLIS);
+ client.createTable(badLogin, tableName, false, TimeType.MILLIS);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void deleteTableLoginFailure() throws Exception {
- client.deleteTable(badLogin, table);
+ client.deleteTable(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void deleteRowsLoginFailure() throws Exception {
- client.deleteRows(badLogin, table, null, null);
+ client.deleteRows(badLogin, tableName, null, null);
}
@Test(expected = TApplicationException.class, timeout = 5000)
public void tableExistsLoginFailure() throws Exception {
- client.tableExists(badLogin, table);
+ client.tableExists(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void flustTableLoginFailure() throws Exception {
- client.flushTable(badLogin, table, null, null, false);
+ client.flushTable(badLogin, tableName, null, null, false);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void getLocalityGroupsLoginFailure() throws Exception {
- client.getLocalityGroups(badLogin, table);
+ client.getLocalityGroups(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void getMaxRowLoginFailure() throws Exception {
- client.getMaxRow(badLogin, table, Collections.<ByteBuffer> emptySet(), null, false, null, false);
+ client.getMaxRow(badLogin, tableName, Collections.<ByteBuffer> emptySet(), null, false, null, false);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void getTablePropertiesLoginFailure() throws Exception {
- client.getTableProperties(badLogin, table);
+ client.getTableProperties(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void listSplitsLoginFailure() throws Exception {
- client.listSplits(badLogin, table, 10000);
+ client.listSplits(badLogin, tableName, 10000);
}
@Test(expected = TApplicationException.class, timeout = 5000)
@@ -391,37 +391,37 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void listConstraintsLoginFailure() throws Exception {
- client.listConstraints(badLogin, table);
+ client.listConstraints(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void mergeTabletsLoginFailure() throws Exception {
- client.mergeTablets(badLogin, table, null, null);
+ client.mergeTablets(badLogin, tableName, null, null);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void offlineTableLoginFailure() throws Exception {
- client.offlineTable(badLogin, table, false);
+ client.offlineTable(badLogin, tableName, false);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void onlineTableLoginFailure() throws Exception {
- client.onlineTable(badLogin, table, false);
+ client.onlineTable(badLogin, tableName, false);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void removeConstraintLoginFailure() throws Exception {
- client.removeConstraint(badLogin, table, 0);
+ client.removeConstraint(badLogin, tableName, 0);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void removeTablePropertyLoginFailure() throws Exception {
- client.removeTableProperty(badLogin, table, Property.TABLE_FILE_MAX.getKey());
+ client.removeTableProperty(badLogin, tableName, Property.TABLE_FILE_MAX.getKey());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void renameTableLoginFailure() throws Exception {
- client.renameTable(badLogin, table, "someTableName");
+ client.renameTable(badLogin, tableName, "someTableName");
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -429,12 +429,12 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
groups.put("group1", Collections.singleton("cf1"));
groups.put("group2", Collections.singleton("cf2"));
- client.setLocalityGroups(badLogin, table, groups);
+ client.setLocalityGroups(badLogin, tableName, groups);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void setTablePropertyLoginFailure() throws Exception {
- client.setTableProperty(badLogin, table, Property.TABLE_FILE_MAX.getKey(), "0");
+ client.setTableProperty(badLogin, tableName, Property.TABLE_FILE_MAX.getKey(), "0");
}
@Test(expected = TException.class, timeout = 5000)
@@ -529,7 +529,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void grantTablePermissionLoginFailure() throws Exception {
- client.grantTablePermission(badLogin, "root", table, TablePermission.WRITE);
+ client.grantTablePermission(badLogin, "root", tableName, TablePermission.WRITE);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -539,7 +539,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void hasTablePermission() throws Exception {
- client.hasTablePermission(badLogin, "root", table, TablePermission.WRITE);
+ client.hasTablePermission(badLogin, "root", tableName, TablePermission.WRITE);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -554,27 +554,27 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void revokeTablePermissionLoginFailure() throws Exception {
- client.revokeTablePermission(badLogin, "root", table, TablePermission.ALTER_TABLE);
+ client.revokeTablePermission(badLogin, "root", tableName, TablePermission.ALTER_TABLE);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void createScannerLoginFailure() throws Exception {
- client.createScanner(badLogin, table, new ScanOptions());
+ client.createScanner(badLogin, tableName, new ScanOptions());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void createBatchScannerLoginFailure() throws Exception {
- client.createBatchScanner(badLogin, table, new BatchScanOptions());
+ client.createBatchScanner(badLogin, tableName, new BatchScanOptions());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void updateAndFlushLoginFailure() throws Exception {
- client.updateAndFlush(badLogin, table, new HashMap<ByteBuffer,List<ColumnUpdate>>());
+ client.updateAndFlush(badLogin, tableName, new HashMap<ByteBuffer,List<ColumnUpdate>>());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void createWriterLoginFailure() throws Exception {
- client.createWriter(badLogin, table, new WriterOptions());
+ client.createWriter(badLogin, tableName, new WriterOptions());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -584,17 +584,17 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void checkIteratorLoginFailure() throws Exception {
- client.checkIteratorConflicts(badLogin, table, setting, EnumSet.allOf(IteratorScope.class));
+ client.checkIteratorConflicts(badLogin, tableName, setting, EnumSet.allOf(IteratorScope.class));
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void cloneTableLoginFailure() throws Exception {
- client.cloneTable(badLogin, table, table + "_clone", false, null, null);
+ client.cloneTable(badLogin, tableName, tableName + "_clone", false, null, null);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void exportTableLoginFailure() throws Exception {
- client.exportTable(badLogin, table, "/tmp");
+ client.exportTable(badLogin, tableName, "/tmp");
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -604,22 +604,22 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void getIteratorSettingLoginFailure() throws Exception {
- client.getIteratorSetting(badLogin, table, "foo", IteratorScope.SCAN);
+ client.getIteratorSetting(badLogin, tableName, "foo", IteratorScope.SCAN);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void listIteratorsLoginFailure() throws Exception {
- client.listIterators(badLogin, table);
+ client.listIterators(badLogin, tableName);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void removeIteratorLoginFailure() throws Exception {
- client.removeIterator(badLogin, table, "name", EnumSet.allOf(IteratorScope.class));
+ client.removeIterator(badLogin, tableName, "name", EnumSet.allOf(IteratorScope.class));
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void splitRangeByTabletsLoginFailure() throws Exception {
- client.splitRangeByTablets(badLogin, table, client.getRowRange(ByteBuffer.wrap("row".getBytes(UTF_8))), 10);
+ client.splitRangeByTablets(badLogin, tableName, client.getRowRange(ByteBuffer.wrap("row".getBytes(UTF_8))), 10);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -630,7 +630,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
Path failuresDir = new Path(base, "failuresDir");
assertTrue(cluster.getFileSystem().mkdirs(importDir));
assertTrue(cluster.getFileSystem().mkdirs(failuresDir));
- client.importDirectory(badLogin, table, importDir.toString(), failuresDir.toString(), true);
+ client.importDirectory(badLogin, tableName, importDir.toString(), failuresDir.toString(), true);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -645,12 +645,12 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void testTableClassLoadLoginFailure() throws Exception {
- client.testTableClassLoad(badLogin, table, VersioningIterator.class.getName(), SortedKeyValueIterator.class.getName());
+ client.testTableClassLoad(badLogin, tableName, VersioningIterator.class.getName(), SortedKeyValueIterator.class.getName());
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void createConditionalWriterLoginFailure() throws Exception {
- client.createConditionalWriter(badLogin, table, new ConditionalWriterOptions());
+ client.createConditionalWriter(badLogin, tableName, new ConditionalWriterOptions());
}
@Test
@@ -837,7 +837,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test
public void testUnknownScanner() throws Exception {
- String scanner = client.createScanner(creds, table, null);
+ String scanner = client.createScanner(creds, tableName, null);
assertFalse(client.hasNext(scanner));
client.closeScanner(scanner);
@@ -871,7 +871,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test
public void testUnknownWriter() throws Exception {
- String writer = client.createWriter(creds, table, null);
+ String writer = client.createWriter(creds, tableName, null);
client.update(writer, mutation("row0", "cf", "cq", "value"));
client.flush(writer);
client.update(writer, mutation("row2", "cf", "cq", "value2"));
@@ -900,15 +900,15 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test
public void testDelete() throws Exception {
- client.updateAndFlush(creds, table, mutation("row0", "cf", "cq", "value"));
+ client.updateAndFlush(creds, tableName, mutation("row0", "cf", "cq", "value"));
- assertScan(new String[][] {{"row0", "cf", "cq", "value"}}, table);
+ assertScan(new String[][] {{"row0", "cf", "cq", "value"}}, tableName);
ColumnUpdate upd = new ColumnUpdate(s2bb("cf"), s2bb("cq"));
upd.setDeleteCell(false);
Map<ByteBuffer,List<ColumnUpdate>> notDelete = Collections.singletonMap(s2bb("row0"), Collections.singletonList(upd));
- client.updateAndFlush(creds, table, notDelete);
- String scanner = client.createScanner(creds, table, null);
+ client.updateAndFlush(creds, tableName, notDelete);
+ String scanner = client.createScanner(creds, tableName, null);
ScanResult entries = client.nextK(scanner, 10);
client.closeScanner(scanner);
assertFalse(entries.more);
@@ -918,9 +918,9 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
upd.setDeleteCell(true);
Map<ByteBuffer,List<ColumnUpdate>> delete = Collections.singletonMap(s2bb("row0"), Collections.singletonList(upd));
- client.updateAndFlush(creds, table, delete);
+ client.updateAndFlush(creds, tableName, delete);
- assertScan(new String[][] {}, table);
+ assertScan(new String[][] {}, tableName);
}
@Test
@@ -1300,7 +1300,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
UserGroupInformation.loginUserFromKeytab(otherClient.getPrincipal(), otherClient.getKeytab().getAbsolutePath());
client = userClient;
}
- String scanner = client.createScanner(user, table, null);
+ String scanner = client.createScanner(user, tableName, null);
client.nextK(scanner, 100);
fail("stooge should not read table test");
} catch (AccumuloSecurityException ex) {}
@@ -1312,16 +1312,16 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
// grant
- assertFalse(client.hasTablePermission(creds, userName, table, TablePermission.READ));
- client.grantTablePermission(creds, userName, table, TablePermission.READ);
- assertTrue(client.hasTablePermission(creds, userName, table, TablePermission.READ));
+ assertFalse(client.hasTablePermission(creds, userName, tableName, TablePermission.READ));
+ client.grantTablePermission(creds, userName, tableName, TablePermission.READ);
+ assertTrue(client.hasTablePermission(creds, userName, tableName, TablePermission.READ));
if (isKerberosEnabled()) {
// Switch back to the extra user
UserGroupInformation.loginUserFromKeytab(otherClient.getPrincipal(), otherClient.getKeytab().getAbsolutePath());
client = userClient;
}
- String scanner = client.createScanner(user, table, null);
+ String scanner = client.createScanner(user, tableName, null);
client.nextK(scanner, 10);
client.closeScanner(scanner);
@@ -1332,15 +1332,15 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
// revoke
- client.revokeTablePermission(creds, userName, table, TablePermission.READ);
- assertFalse(client.hasTablePermission(creds, userName, table, TablePermission.READ));
+ client.revokeTablePermission(creds, userName, tableName, TablePermission.READ);
+ assertFalse(client.hasTablePermission(creds, userName, tableName, TablePermission.READ));
try {
if (isKerberosEnabled()) {
// Switch back to the extra user
UserGroupInformation.loginUserFromKeytab(otherClient.getPrincipal(), otherClient.getKeytab().getAbsolutePath());
client = userClient;
}
- scanner = client.createScanner(user, table, null);
+ scanner = client.createScanner(user, tableName, null);
client.nextK(scanner, 100);
fail("stooge should not read table test");
} catch (AccumuloSecurityException ex) {}
@@ -1365,7 +1365,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test
public void testBatchWriter() throws Exception {
- client.addConstraint(creds, table, NumericValueConstraint.class.getName());
+ client.addConstraint(creds, tableName, NumericValueConstraint.class.getName());
// zookeeper propagation time
sleepUninterruptibly(ZOOKEEPER_PROPAGATION_TIME, TimeUnit.MILLISECONDS);
@@ -1375,16 +1375,16 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
writerOptions.setThreads(1);
writerOptions.setTimeoutMs(100000);
- Map<String,Integer> constraints = client.listConstraints(creds, table);
+ Map<String,Integer> constraints = client.listConstraints(creds, tableName);
while (!constraints.containsKey(NumericValueConstraint.class.getName())) {
log.info("Constraints don't contain NumericValueConstraint");
Thread.sleep(2000);
- constraints = client.listConstraints(creds, table);
+ constraints = client.listConstraints(creds, tableName);
}
boolean success = false;
for (int i = 0; i < 15; i++) {
- String batchWriter = client.createWriter(creds, table, writerOptions);
+ String batchWriter = client.createWriter(creds, tableName, writerOptions);
client.update(batchWriter, mutation("row1", "cf", "cq", "x"));
client.update(batchWriter, mutation("row1", "cf", "cq", "x"));
try {
@@ -1407,16 +1407,16 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
fail("constraint did not fire");
}
- client.removeConstraint(creds, table, 2);
+ client.removeConstraint(creds, tableName, 2);
- constraints = client.listConstraints(creds, table);
+ constraints = client.listConstraints(creds, tableName);
while (constraints.containsKey(NumericValueConstraint.class.getName())) {
log.info("Constraints still contains NumericValueConstraint");
Thread.sleep(2000);
- constraints = client.listConstraints(creds, table);
+ constraints = client.listConstraints(creds, tableName);
}
- assertScan(new String[][] {}, table);
+ assertScan(new String[][] {}, tableName);
sleepUninterruptibly(ZOOKEEPER_PROPAGATION_TIME, TimeUnit.MILLISECONDS);
@@ -1429,7 +1429,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
success = false;
for (int i = 0; i < 15; i++) {
try {
- String batchWriter = client.createWriter(creds, table, writerOptions);
+ String batchWriter = client.createWriter(creds, tableName, writerOptions);
client.update(batchWriter, mutation("row1", "cf", "cq", "x"));
client.flush(batchWriter);
@@ -1446,35 +1446,35 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
fail("Failed to successfully write data after constraint was removed");
}
- assertScan(new String[][] {{"row1", "cf", "cq", "x"}}, table);
+ assertScan(new String[][] {{"row1", "cf", "cq", "x"}}, tableName);
- client.deleteTable(creds, table);
+ client.deleteTable(creds, tableName);
}
@Test
public void testTableConstraints() throws Exception {
- log.debug("Setting NumericValueConstraint on " + table);
+ log.debug("Setting NumericValueConstraint on " + tableName);
// constraints
- client.addConstraint(creds, table, NumericValueConstraint.class.getName());
+ client.addConstraint(creds, tableName, NumericValueConstraint.class.getName());
// zookeeper propagation time
Thread.sleep(ZOOKEEPER_PROPAGATION_TIME);
log.debug("Attempting to verify client-side that constraints are observed");
- Map<String,Integer> constraints = client.listConstraints(creds, table);
+ Map<String,Integer> constraints = client.listConstraints(creds, tableName);
while (!constraints.containsKey(NumericValueConstraint.class.getName())) {
log.debug("Constraints don't contain NumericValueConstraint");
Thread.sleep(2000);
- constraints = client.listConstraints(creds, table);
+ constraints = client.listConstraints(creds, tableName);
}
- assertEquals(2, client.listConstraints(creds, table).size());
+ assertEquals(2, client.listConstraints(creds, tableName).size());
log.debug("Verified client-side that constraints exist");
// Write data that satisfies the constraint
- client.updateAndFlush(creds, table, mutation("row1", "cf", "cq", "123"));
+ client.updateAndFlush(creds, tableName, mutation("row1", "cf", "cq", "123"));
log.debug("Successfully wrote data that satisfies the constraint");
log.debug("Trying to write data that the constraint should reject");
@@ -1482,7 +1482,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
// Expect failure on data that fails the constraint
while (true) {
try {
- client.updateAndFlush(creds, table, mutation("row1", "cf", "cq", "x"));
+ client.updateAndFlush(creds, tableName, mutation("row1", "cf", "cq", "x"));
log.debug("Expected mutation to be rejected, but was not. Waiting and retrying");
Thread.sleep(5000);
} catch (MutationsRejectedException ex) {
@@ -1493,25 +1493,25 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
log.debug("Saw expected failure on data which fails the constraint");
log.debug("Removing constraint from table");
- client.removeConstraint(creds, table, 2);
+ client.removeConstraint(creds, tableName, 2);
sleepUninterruptibly(ZOOKEEPER_PROPAGATION_TIME, TimeUnit.MILLISECONDS);
- constraints = client.listConstraints(creds, table);
+ constraints = client.listConstraints(creds, tableName);
while (constraints.containsKey(NumericValueConstraint.class.getName())) {
log.debug("Constraints contains NumericValueConstraint");
Thread.sleep(2000);
- constraints = client.listConstraints(creds, table);
+ constraints = client.listConstraints(creds, tableName);
}
- assertEquals(1, client.listConstraints(creds, table).size());
+ assertEquals(1, client.listConstraints(creds, tableName).size());
log.debug("Verified client-side that the constraint was removed");
log.debug("Attempting to write mutation that should succeed after constraints was removed");
// Make sure we can write the data after we removed the constraint
while (true) {
try {
- client.updateAndFlush(creds, table, mutation("row1", "cf", "cq", "x"));
+ client.updateAndFlush(creds, tableName, mutation("row1", "cf", "cq", "x"));
break;
} catch (MutationsRejectedException ex) {
log.debug("Expected mutation accepted, but was not. Waiting and retrying");
@@ -1520,24 +1520,24 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
log.debug("Verifying that record can be read from the table");
- assertScan(new String[][] {{"row1", "cf", "cq", "x"}}, table);
+ assertScan(new String[][] {{"row1", "cf", "cq", "x"}}, tableName);
}
@Test
public void tableMergesAndSplits() throws Exception {
// add some splits
- client.addSplits(creds, table, new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
- List<ByteBuffer> splits = client.listSplits(creds, table, 1);
+ client.addSplits(creds, tableName, new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
+ List<ByteBuffer> splits = client.listSplits(creds, tableName, 1);
assertEquals(Arrays.asList(s2bb("m")), splits);
// Merge some of the splits away
- client.mergeTablets(creds, table, null, s2bb("m"));
- splits = client.listSplits(creds, table, 10);
+ client.mergeTablets(creds, tableName, null, s2bb("m"));
+ splits = client.listSplits(creds, tableName, 10);
assertEquals(Arrays.asList(s2bb("m"), s2bb("z")), splits);
// Merge the entire table
- client.mergeTablets(creds, table, null, null);
- splits = client.listSplits(creds, table, 10);
+ client.mergeTablets(creds, tableName, null, null);
+ splits = client.listSplits(creds, tableName, 10);
List<ByteBuffer> empty = Collections.emptyList();
// No splits after merge on whole table
@@ -1550,29 +1550,29 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
HashMap<String,String> options = new HashMap<String,String>();
options.put("type", "STRING");
options.put("columns", "cf");
- IteratorSetting setting = new IteratorSetting(10, table, SummingCombiner.class.getName(), options);
- client.attachIterator(creds, table, setting, EnumSet.allOf(IteratorScope.class));
+ IteratorSetting setting = new IteratorSetting(10, tableName, SummingCombiner.class.getName(), options);
+ client.attachIterator(creds, tableName, setting, EnumSet.allOf(IteratorScope.class));
for (int i = 0; i < 10; i++) {
- client.updateAndFlush(creds, table, mutation("row1", "cf", "cq", "1"));
+ client.updateAndFlush(creds, tableName, mutation("row1", "cf", "cq", "1"));
}
// 10 updates of "1" in the value w/ SummingCombiner should return value of "10"
- assertScan(new String[][] {{"row1", "cf", "cq", "10"}}, table);
+ assertScan(new String[][] {{"row1", "cf", "cq", "10"}}, tableName);
try {
- client.checkIteratorConflicts(creds, table, setting, EnumSet.allOf(IteratorScope.class));
+ client.checkIteratorConflicts(creds, tableName, setting, EnumSet.allOf(IteratorScope.class));
fail("checkIteratorConflicts did not throw an exception");
} catch (Exception ex) {
// Expected
}
- client.deleteRows(creds, table, null, null);
- client.removeIterator(creds, table, "test", EnumSet.allOf(IteratorScope.class));
+ client.deleteRows(creds, tableName, null, null);
+ client.removeIterator(creds, tableName, "test", EnumSet.allOf(IteratorScope.class));
String expected[][] = new String[10][];
for (int i = 0; i < 10; i++) {
- client.updateAndFlush(creds, table, mutation("row" + i, "cf", "cq", "" + i));
+ client.updateAndFlush(creds, tableName, mutation("row" + i, "cf", "cq", "" + i));
expected[i] = new String[] {"row" + i, "cf", "cq", "" + i};
- client.flushTable(creds, table, null, null, true);
+ client.flushTable(creds, tableName, null, null, true);
}
- assertScan(expected, table);
+ assertScan(expected, tableName);
}
@Test
@@ -1581,14 +1581,14 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
String expected[][] = new String[10][];
for (int i = 0; i < 10; i++) {
- client.updateAndFlush(creds, table, mutation("row" + i, "cf", "cq", "" + i));
+ client.updateAndFlush(creds, tableName, mutation("row" + i, "cf", "cq", "" + i));
expected[i] = new String[] {"row" + i, "cf", "cq", "" + i};
- client.flushTable(creds, table, null, null, true);
+ client.flushTable(creds, tableName, null, null, true);
}
- assertScan(expected, table);
+ assertScan(expected, tableName);
// clone
- client.cloneTable(creds, table, TABLE_TEST2, true, null, null);
+ client.cloneTable(creds, tableName, TABLE_TEST2, true, null, null);
assertScan(expected, TABLE_TEST2);
client.deleteTable(creds, TABLE_TEST2);
}
@@ -1596,23 +1596,23 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test
public void clearLocatorCache() throws Exception {
// don't know how to test this, call it just for fun
- client.clearLocatorCache(creds, table);
+ client.clearLocatorCache(creds, tableName);
}
@Test
public void compactTable() throws Exception {
String expected[][] = new String[10][];
for (int i = 0; i < 10; i++) {
- client.updateAndFlush(creds, table, mutation("row" + i, "cf", "cq", "" + i));
+ client.updateAndFlush(creds, tableName, mutation("row" + i, "cf", "cq", "" + i));
expected[i] = new String[] {"row" + i, "cf", "cq", "" + i};
- client.flushTable(creds, table, null, null, true);
+ client.flushTable(creds, tableName, null, null, true);
}
- assertScan(expected, table);
+ assertScan(expected, tableName);
// compact
- client.compactTable(creds, table, null, null, null, true, true, null);
- assertEquals(1, countFiles(table));
- assertScan(expected, table);
+ client.compactTable(creds, tableName, null, null, null, true, true, null);
+ assertEquals(1, countFiles(tableName));
+ assertScan(expected, tableName);
}
@Test
@@ -1622,21 +1622,21 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
// Write some data
String expected[][] = new String[10][];
for (int i = 0; i < 10; i++) {
- client.updateAndFlush(creds, table, mutation("row" + i, "cf", "cq", "" + i));
+ client.updateAndFlush(creds, tableName, mutation("row" + i, "cf", "cq", "" + i));
expected[i] = new String[] {"row" + i, "cf", "cq", "" + i};
- client.flushTable(creds, table, null, null, true);
+ client.flushTable(creds, tableName, null, null, true);
}
- assertScan(expected, table);
+ assertScan(expected, tableName);
// compact
- client.compactTable(creds, table, null, null, null, true, true, null);
- assertEquals(1, countFiles(table));
- assertScan(expected, table);
+ client.compactTable(creds, tableName, null, null, null, true, true, null);
+ assertEquals(1, countFiles(tableName));
+ assertScan(expected, tableName);
// Clone the table
- client.cloneTable(creds, table, TABLE_TEST2, true, null, null);
+ client.cloneTable(creds, tableName, TABLE_TEST2, true, null, null);
Set<String> tablesToScan = new HashSet<String>();
- tablesToScan.add(table);
+ tablesToScan.add(tableName);
tablesToScan.add(TABLE_TEST2);
tablesToScan.add("foo");
@@ -1670,11 +1670,11 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
// Write some data
String expected[][] = new String[10][];
for (int i = 0; i < 10; i++) {
- client.updateAndFlush(creds, table, mutation("row" + i, "cf", "cq", "" + i));
+ client.updateAndFlush(creds, tableName, mutation("row" + i, "cf", "cq", "" + i));
expected[i] = new String[] {"row" + i, "cf", "cq", "" + i};
- client.flushTable(creds, table, null, null, true);
+ client.flushTable(creds, tableName, null, null, true);
}
- assertScan(expected, table);
+ assertScan(expected, tableName);
// export/import
MiniAccumuloClusterImpl cluster = SharedMiniClusterBase.getCluster();
@@ -1684,8 +1684,8 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertTrue(fs.mkdirs(dir));
Path destDir = new Path(base, "test_dest");
assertTrue(fs.mkdirs(destDir));
- client.offlineTable(creds, table, false);
- client.exportTable(creds, table, dir.toString());
+ client.offlineTable(creds, tableName, false);
+ client.exportTable(creds, tableName, dir.toString());
// copy files to a new location
FSDataInputStream is = fs.open(new Path(dir, "distcp.txt"));
try (BufferedReader r = new BufferedReader(new InputStreamReader(is, UTF_8))) {
@@ -1697,7 +1697,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
FileUtil.copy(fs, srcPath, fs, destDir, false, fs.getConf());
}
}
- client.deleteTable(creds, table);
+ client.deleteTable(creds, tableName);
client.importTable(creds, "testify", destDir.toString());
assertScan(expected, "testify");
client.deleteTable(creds, "testify");
@@ -1716,8 +1716,8 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
Map<String,Set<String>> groups = new HashMap<String,Set<String>>();
groups.put("group1", Collections.singleton("cf1"));
groups.put("group2", Collections.singleton("cf2"));
- client.setLocalityGroups(creds, table, groups);
- assertEquals(groups, client.getLocalityGroups(creds, table));
+ client.setLocalityGroups(creds, tableName, groups);
+ assertEquals(groups, client.getLocalityGroups(creds, tableName));
}
@Test
@@ -1725,18 +1725,18 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
Map<String,String> systemProps = client.getSystemConfiguration(creds);
String systemTableSplitThreshold = systemProps.get("table.split.threshold");
- Map<String,String> orig = client.getTableProperties(creds, table);
- client.setTableProperty(creds, table, "table.split.threshold", "500M");
+ Map<String,String> orig = client.getTableProperties(creds, tableName);
+ client.setTableProperty(creds, tableName, "table.split.threshold", "500M");
// Get the new table property value
- Map<String,String> update = client.getTableProperties(creds, table);
+ Map<String,String> update = client.getTableProperties(creds, tableName);
assertEquals(update.get("table.split.threshold"), "500M");
// Table level properties shouldn't affect system level values
assertEquals(systemTableSplitThreshold, client.getSystemConfiguration(creds).get("table.split.threshold"));
- client.removeTableProperty(creds, table, "table.split.threshold");
- update = client.getTableProperties(creds, table);
+ client.removeTableProperty(creds, tableName, "table.split.threshold");
+ update = client.getTableProperties(creds, tableName);
assertEquals(orig, update);
}
@@ -1744,13 +1744,13 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
public void tableRenames() throws Exception {
// rename table
Map<String,String> tables = client.tableIdMap(creds);
- client.renameTable(creds, table, "bar");
+ client.renameTable(creds, tableName, "bar");
Map<String,String> tables2 = client.tableIdMap(creds);
- assertEquals(tables.get(table), tables2.get("bar"));
+ assertEquals(tables.get(tableName), tables2.get("bar"));
// table exists
assertTrue(client.tableExists(creds, "bar"));
- assertFalse(client.tableExists(creds, table));
- client.renameTable(creds, "bar", table);
+ assertFalse(client.tableExists(creds, tableName));
+ client.renameTable(creds, "bar", tableName);
}
@Test
@@ -1772,21 +1772,21 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
fs.mkdirs(new Path(dir + "/bulk/fail"));
// Run the bulk import
- client.importDirectory(creds, table, dir + "/bulk/import", dir + "/bulk/fail", true);
+ client.importDirectory(creds, tableName, dir + "/bulk/import", dir + "/bulk/fail", true);
// Make sure we find the data
- String scanner = client.createScanner(creds, table, null);
+ String scanner = client.createScanner(creds, tableName, null);
ScanResult more = client.nextK(scanner, 100);
client.closeScanner(scanner);
assertEquals(1, more.results.size());
- ByteBuffer maxRow = client.getMaxRow(creds, table, null, null, false, null, false);
+ ByteBuffer maxRow = client.getMaxRow(creds, tableName, null, null, false, null, false);
assertEquals(s2bb("a"), maxRow);
}
@Test
public void testTableClassLoad() throws Exception {
- assertFalse(client.testTableClassLoad(creds, table, "abc123", SortedKeyValueIterator.class.getName()));
- assertTrue(client.testTableClassLoad(creds, table, VersioningIterator.class.getName(), SortedKeyValueIterator.class.getName()));
+ assertFalse(client.testTableClassLoad(creds, tableName, "abc123", SortedKeyValueIterator.class.getName()));
+ assertTrue(client.testTableClassLoad(creds, tableName, VersioningIterator.class.getName(), SortedKeyValueIterator.class.getName()));
}
private Condition newCondition(String cf, String cq) {
@@ -1825,16 +1825,16 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
@Test
public void testConditionalWriter() throws Exception {
- log.debug("Adding constraint {} to {}", table, NumericValueConstraint.class.getName());
- client.addConstraint(creds, table, NumericValueConstraint.class.getName());
+ log.debug("Adding constraint {} to {}", tableName, NumericValueConstraint.class.getName());
+ client.addConstraint(creds, tableName, NumericValueConstraint.class.getName());
sleepUninterruptibly(ZOOKEEPER_PROPAGATION_TIME, TimeUnit.MILLISECONDS);
- while (!client.listConstraints(creds, table).containsKey(NumericValueConstraint.class.getName())) {
+ while (!client.listConstraints(creds, tableName).containsKey(NumericValueConstraint.class.getName())) {
log.info("Failed to see constraint");
Thread.sleep(1000);
}
- String cwid = client.createConditionalWriter(creds, table, new ConditionalWriterOptions());
+ String cwid = client.createConditionalWriter(creds, tableName, new ConditionalWriterOptions());
Map<ByteBuffer,ConditionalUpdates> updates = new HashMap<ByteBuffer,ConditionalUpdates>();
@@ -1848,7 +1848,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(1, results.size());
assertEquals(ConditionalStatus.ACCEPTED, results.get(s2bb("00345")));
- assertScan(new String[][] { {"00345", "data", "img", "73435435"}, {"00345", "meta", "seq", "1"}}, table);
+ assertScan(new String[][] { {"00345", "data", "img", "73435435"}, {"00345", "meta", "seq", "1"}}, tableName);
// test not setting values on conditions
updates.clear();
@@ -1862,7 +1862,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00345")));
assertEquals(ConditionalStatus.ACCEPTED, results.get(s2bb("00346")));
- assertScan(new String[][] { {"00345", "data", "img", "73435435"}, {"00345", "meta", "seq", "1"}, {"00346", "meta", "seq", "1"}}, table);
+ assertScan(new String[][] { {"00345", "data", "img", "73435435"}, {"00345", "meta", "seq", "1"}, {"00346", "meta", "seq", "1"}}, tableName);
// test setting values on conditions
updates.clear();
@@ -1880,7 +1880,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.ACCEPTED, results.get(s2bb("00345")));
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00346")));
- assertScan(new String[][] { {"00345", "data", "img", "567890"}, {"00345", "meta", "seq", "2"}, {"00346", "meta", "seq", "1"}}, table);
+ assertScan(new String[][] { {"00345", "data", "img", "567890"}, {"00345", "meta", "seq", "2"}, {"00346", "meta", "seq", "1"}}, tableName);
// test setting timestamp on condition to a non-existant version
updates.clear();
@@ -1895,7 +1895,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(1, results.size());
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00345")));
- assertScan(new String[][] { {"00345", "data", "img", "567890"}, {"00345", "meta", "seq", "2"}, {"00346", "meta", "seq", "1"}}, table);
+ assertScan(new String[][] { {"00345", "data", "img", "567890"}, {"00345", "meta", "seq", "2"}, {"00346", "meta", "seq", "1"}}, tableName);
// test setting timestamp to an existing version
@@ -1911,13 +1911,13 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(1, results.size());
assertEquals(ConditionalStatus.ACCEPTED, results.get(s2bb("00345")));
- assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"}}, table);
+ assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"}}, tableName);
// run test w/ condition that has iterators
// following should fail w/o iterator
- client.updateAndFlush(creds, table, Collections.singletonMap(s2bb("00347"), Arrays.asList(newColUpdate("data", "count", "1"))));
- client.updateAndFlush(creds, table, Collections.singletonMap(s2bb("00347"), Arrays.asList(newColUpdate("data", "count", "1"))));
- client.updateAndFlush(creds, table, Collections.singletonMap(s2bb("00347"), Arrays.asList(newColUpdate("data", "count", "1"))));
+ client.updateAndFlush(creds, tableName, Collections.singletonMap(s2bb("00347"), Arrays.asList(newColUpdate("data", "count", "1"))));
+ client.updateAndFlush(creds, tableName, Collections.singletonMap(s2bb("00347"), Arrays.asList(newColUpdate("data", "count", "1"))));
+ client.updateAndFlush(creds, tableName, Collections.singletonMap(s2bb("00347"), Arrays.asList(newColUpdate("data", "count", "1"))));
updates.clear();
updates.put(s2bb("00347"),
@@ -1929,7 +1929,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00347")));
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "1"}}, table);
+ {"00347", "data", "count", "1"}}, tableName);
// following test w/ iterator setup should succeed
Condition iterCond = newCondition("data", "count", "3");
@@ -1948,7 +1948,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.ACCEPTED, results.get(s2bb("00347")));
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, table);
+ {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, tableName);
ConditionalStatus status = null;
for (int i = 0; i < 30; i++) {
@@ -1975,7 +1975,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.VIOLATED, status);
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, table);
+ {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, tableName);
// run test with two conditions
// both conditions should fail
@@ -1991,7 +1991,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00347")));
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, table);
+ {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, tableName);
// one condition should fail
updates.clear();
@@ -2006,7 +2006,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00347")));
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, table);
+ {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, tableName);
// one condition should fail
updates.clear();
@@ -2021,13 +2021,13 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.REJECTED, results.get(s2bb("00347")));
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, table);
+ {"00347", "data", "count", "1"}, {"00347", "data", "img", "1234567890"}}, tableName);
// both conditions should succeed
ConditionalStatus result = client.updateRowConditionally(
creds,
- table,
+ tableName,
s2bb("00347"),
new ConditionalUpdates(Arrays.asList(newCondition("data", "img", "1234567890"), newCondition("data", "count", "1")), Arrays.asList(
newColUpdate("data", "count", "3"), newColUpdate("data", "img", "0987654321"))));
@@ -2035,7 +2035,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
assertEquals(ConditionalStatus.ACCEPTED, result);
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}}, table);
+ {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}}, tableName);
client.closeConditionalWriter(cwid);
try {
@@ -2057,8 +2057,8 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
client.changeUserAuthorizations(creds, principal, Collections.singleton(s2bb("A")));
- client.grantTablePermission(creds, principal, table, TablePermission.WRITE);
- client.grantTablePermission(creds, principal, table, TablePermission.READ);
+ client.grantTablePermission(creds, principal, tableName, TablePermission.WRITE);
+ client.grantTablePermission(creds, principal, tableName, TablePermission.READ);
TestProxyClient cwuserProxyClient = null;
Client origClient = null;
@@ -2078,7 +2078,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
try {
ByteBuffer cwCreds = client.login(principal, cwProperties);
- cwid = client.createConditionalWriter(cwCreds, table, new ConditionalWriterOptions().setAuthorizations(Collections.singleton(s2bb("A"))));
+ cwid = client.createConditionalWriter(cwCreds, tableName, new ConditionalWriterOptions().setAuthorizations(Collections.singleton(s2bb("A"))));
updates.clear();
updates.put(
@@ -2103,7 +2103,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
// Verify that the original user can't see the updates with visibilities set
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}, {"00348", "data", "seq", "1"}}, table);
+ {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}, {"00348", "data", "seq", "1"}}, tableName);
if (isKerberosEnabled()) {
UserGroupInformation.loginUserFromKeytab(cwuser.getPrincipal(), cwuser.getKeytab().getAbsolutePath());
@@ -2128,7 +2128,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
// Same results as the original user
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}, {"00348", "data", "seq", "1"}}, table);
+ {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}, {"00348", "data", "seq", "1"}}, tableName);
if (isKerberosEnabled()) {
UserGroupInformation.loginUserFromKeytab(cwuser.getPrincipal(), cwuser.getKeytab().getAbsolutePath());
@@ -2150,7 +2150,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
}
assertScan(new String[][] { {"00345", "data", "img", "1234567890"}, {"00345", "meta", "seq", "3"}, {"00346", "meta", "seq", "1"},
- {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}, {"00348", "data", "seq", "2"}}, table);
+ {"00347", "data", "count", "3"}, {"00347", "data", "img", "0987654321"}, {"00348", "data", "seq", "2"}}, tableName);
if (isKerberosEnabled()) {
UserGroupInformation.loginUserFromKeytab(cwuser.getPrincipal(), cwuser.getKeytab().getAbsolutePath());
@@ -2251,31 +2251,31 @@ public abstract class SimpleProxyBase extends SharedMiniClusterBase {
File jarFile = new File(jarDir, "TestCompactionStrat.jar");
FileUtils.copyInputStreamToFile(Class.class.getResourceAsStream("/TestCompactionStrat.jar"), jarFile);
client.setProperty(creds, Property.VFS_CONTEXT_CLASSPATH_PROPERTY.getKey() + "context1", jarFile.toString());
- client.setTableProperty(creds, table, Property.TABLE_CLASSPATH.getKey(), "context1");
+ client.setTableProperty(creds, tableName, Property.TABLE_CLASSPATH.getKey(), "context1");
- client.addSplits(creds, table, Collections.singleton(s2bb("efg")));
+ client.addSplits(creds, tableName, Collections.singleton(s2bb("efg")));
- client.updateAndFlush(creds, table, mutation("a", "cf", "cq", "v1"));
- client.flushTable(creds, table, null, null, true);
+ client.updateAndFlush(creds, tableName, mutation("a", "cf", "cq", "v1"));
+ client.flushTable(creds, tableName, null, null, true);
- client.updateAndFlush(creds, table, mutation("b", "cf", "cq", "v2"));
- client.flushTable(creds, table, null, null, true);
+ client.updateAndFlush(creds, tableName, mutation("b", "cf", "cq", "v2"));
+ client.flushTable(creds, tableName, null, null, true);
- client.updateAndFlush(creds, table, mutation("y", "cf", "cq", "v1"));
- client.flushTable(creds, table, null, null, true);
+ client.updateAndFlush(creds, tableName, mutation("y", "cf", "cq", "v1"));
+ client.flushTable(creds, tableName, null, null, true);
- client.updateAndFlush(creds, table, mutation("z", "cf", "cq", "v2"));
- client.flushTable(creds, table, null, null, true);
+ client.updateAndFlush(creds, tableName, mutation("z", "cf", "cq", "v2"));
+ client.flushTable(creds, tableName, null, null, true);
- assertEquals(4, countFiles(table));
+ assertEquals(4, countFiles(tableName));
CompactionStrategyConfig csc = new CompactionStrategyConfig();
// The EfgCompactionStrat will only compact tablets with and end row of efg
csc.setClassName("org.apache.accumulo.test.EfgCompactionStrat");
- client.compactTable(creds, table, null, null, null, true, true, csc);
+ client.compactTable(creds, tableName, null, null, null, true, true, csc);
- assertEquals(3, countFiles(table));
+ assertEquals(3, countFiles(tableName));
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
index df1f64f..237a8a0 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
@@ -42,7 +42,6 @@ import org.apache.accumulo.master.replication.RemoveCompleteReplicationRecords;
import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.test.functional.ConfigurableMacBase;
-import org.apache.hadoop.io.Text;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
@@ -84,7 +83,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
for (int i = 0; i < numRecords; i++) {
String file = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
Mutation m = new Mutation(file);
- StatusSection.add(m, new Text(Integer.toString(i)), StatusUtil.openWithUnknownLengthValue());
+ StatusSection.add(m, Integer.toString(i), StatusUtil.openWithUnknownLengthValue());
bw.addMutation(m);
}
@@ -117,7 +116,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
for (int i = 0; i < numRecords; i++) {
String file = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
Mutation m = new Mutation(file);
- StatusSection.add(m, new Text(Integer.toString(i)), ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build()));
+ StatusSection.add(m, Integer.toString(i), ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build()));
bw.addMutation(m);
}
@@ -154,21 +153,21 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
for (int i = 0; i < numRecords; i++) {
String file = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
Mutation m = new Mutation(file);
- StatusSection.add(m, new Text(Integer.toString(i)), ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build()));
+ StatusSection.add(m, Integer.toString(i), ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build()));
replBw.addMutation(m);
}
// Add two records that we can delete
String fileToRemove = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
Mutation m = new Mutation(fileToRemove);
- StatusSection.add(m, new Text("5"), ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build()));
+ StatusSection.add(m, "5", ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build()));
replBw.addMutation(m);
numRecords++;
fileToRemove = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
m = new Mutation(fileToRemove);
- StatusSection.add(m, new Text("6"), ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build()));
+ StatusSection.add(m, "6", ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build()));
replBw.addMutation(m);
numRecords++;
@@ -209,10 +208,10 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
String file = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
Mutation m = new Mutation(file);
Value v = ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build());
- StatusSection.add(m, new Text(Integer.toString(i)), v);
+ StatusSection.add(m, Integer.toString(i), v);
replBw.addMutation(m);
m = OrderSection.createMutation(file, time);
- OrderSection.add(m, new Text(Integer.toString(i)), v);
+ OrderSection.add(m, Integer.toString(i), v);
replBw.addMutation(m);
}
@@ -227,12 +226,12 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
Mutation m = new Mutation(fileToRemove);
ReplicationTarget target = new ReplicationTarget("peer1", "5", "5");
Value value = ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(true).setCreatedTime(time).build());
- StatusSection.add(m, new Text("5"), value);
+ StatusSection.add(m, "5", value);
WorkSection.add(m, target.toText(), value);
replBw.addMutation(m);
m = OrderSection.createMutation(fileToRemove, time);
- OrderSection.add(m, new Text("5"), value);
+ OrderSection.add(m, "5", value);
replBw.addMutation(m);
time++;
@@ -243,12 +242,12 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
m = new Mutation(fileToRemove);
value = ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(true).setCreatedTime(time).build());
target = new ReplicationTarget("peer1", "6", "6");
- StatusSection.add(m, new Text("6"), value);
+ StatusSection.add(m, "6", value);
WorkSection.add(m, target.toText(), value);
replBw.addMutation(m);
m = OrderSection.createMutation(fileToRemove, time);
- OrderSection.add(m, new Text("6"), value);
+ OrderSection.add(m, "6", value);
replBw.addMutation(m);
time++;
@@ -297,7 +296,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
for (int i = 0; i < numRecords; i++) {
String file = "/accumulo/wal/tserver+port/" + UUID.randomUUID();
Mutation m = new Mutation(file);
- StatusSection.add(m, new Text(Integer.toString(i)), ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build()));
+ StatusSection.add(m, Integer.toString(i), ProtobufUtil.toValue(builder.setBegin(1000 * (i + 1)).build()));
replBw.addMutation(m);
}
@@ -306,7 +305,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
Mutation m = new Mutation(fileToRemove);
ReplicationTarget target = new ReplicationTarget("peer1", "5", "5");
Value value = ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(true).build());
- StatusSection.add(m, new Text("5"), value);
+ StatusSection.add(m, "5", value);
WorkSection.add(m, target.toText(), value);
target = new ReplicationTarget("peer2", "5", "5");
WorkSection.add(m, target.toText(), value);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
index 7f39df3..467a69b 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.replication;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.net.URI;
@@ -106,7 +107,6 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import com.google.protobuf.TextFormat;
/**
@@ -179,8 +179,7 @@ public class ReplicationIT extends ConfigurableMacBase {
StatusSection.getFile(entry.getKey(), buff);
String file = buff.toString();
- StatusSection.getTableId(entry.getKey(), buff);
- String tableId = buff.toString();
+ String tableId = StatusSection.getTableId(entry.getKey());
logs.put(file, tableId);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
index fa026d1..00945a1 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
@@ -113,7 +113,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
@Test
public void waitsUntilEntriesAreReplicated() throws Exception {
conn.tableOperations().create("foo");
- Text tableId = new Text(conn.tableOperations().tableIdMap().get("foo"));
+ String tableId = conn.tableOperations().tableIdMap().get("foo");
String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(), file2 = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build();
@@ -132,12 +132,12 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.put(ReplicationSection.COLF, tableId, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId), ProtobufUtil.toValue(stat));
bw.addMutation(m);
m = new Mutation(ReplicationSection.getRowPrefix() + file2);
- m.put(ReplicationSection.COLF, tableId, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId), ProtobufUtil.toValue(stat));
bw.close();
@@ -164,14 +164,14 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.putDelete(ReplicationSection.COLF, tableId);
+ m.putDelete(ReplicationSection.COLF, new Text(tableId));
bw.addMutation(m);
bw.flush();
Assert.assertFalse(done.get());
m = new Mutation(ReplicationSection.getRowPrefix() + file2);
- m.putDelete(ReplicationSection.COLF, tableId);
+ m.putDelete(ReplicationSection.COLF, new Text(tableId));
bw.addMutation(m);
bw.flush();
bw.close();
@@ -182,14 +182,14 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
// Remove the replication entries too
bw = ReplicationTable.getBatchWriter(conn);
m = new Mutation(file1);
- m.putDelete(StatusSection.NAME, tableId);
+ m.putDelete(StatusSection.NAME, new Text(tableId));
bw.addMutation(m);
bw.flush();
Assert.assertFalse(done.get());
m = new Mutation(file2);
- m.putDelete(StatusSection.NAME, tableId);
+ m.putDelete(StatusSection.NAME, new Text(tableId));
bw.addMutation(m);
bw.flush();
@@ -209,8 +209,8 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
conn.tableOperations().create("foo");
conn.tableOperations().create("bar");
- Text tableId1 = new Text(conn.tableOperations().tableIdMap().get("foo"));
- Text tableId2 = new Text(conn.tableOperations().tableIdMap().get("bar"));
+ String tableId1 = conn.tableOperations().tableIdMap().get("foo");
+ String tableId2 = conn.tableOperations().tableIdMap().get("bar");
String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(), file2 = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build();
@@ -229,12 +229,12 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.put(ReplicationSection.COLF, tableId1, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId1), ProtobufUtil.toValue(stat));
bw.addMutation(m);
m = new Mutation(ReplicationSection.getRowPrefix() + file2);
- m.put(ReplicationSection.COLF, tableId2, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId2), ProtobufUtil.toValue(stat));
bw.close();
@@ -263,7 +263,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.putDelete(ReplicationSection.COLF, tableId1);
+ m.putDelete(ReplicationSection.COLF, new Text(tableId1));
bw.addMutation(m);
bw.flush();
@@ -273,7 +273,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
// Remove the replication entries too
bw = ReplicationTable.getBatchWriter(conn);
m = new Mutation(file1);
- m.putDelete(StatusSection.NAME, tableId1);
+ m.putDelete(StatusSection.NAME, new Text(tableId1));
bw.addMutation(m);
bw.flush();
@@ -292,7 +292,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
public void inprogressReplicationRecordsBlockExecution() throws Exception {
conn.tableOperations().create("foo");
- Text tableId1 = new Text(conn.tableOperations().tableIdMap().get("foo"));
+ String tableId1 = conn.tableOperations().tableIdMap().get("foo");
String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build();
@@ -304,11 +304,11 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw.addMutation(m);
bw.close();
- LogEntry logEntry = new LogEntry(new KeyExtent(new Text(tableId1), null, null), System.currentTimeMillis(), "tserver", file1);
+ LogEntry logEntry = new LogEntry(new KeyExtent(tableId1, null, null), System.currentTimeMillis(), "tserver", file1);
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.put(ReplicationSection.COLF, tableId1, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId1), ProtobufUtil.toValue(stat));
bw.addMutation(m);
m = new Mutation(logEntry.getRow());
@@ -341,7 +341,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
Status newStatus = Status.newBuilder().setBegin(1000).setEnd(2000).setInfiniteEnd(false).setClosed(true).build();
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.put(ReplicationSection.COLF, tableId1, ProtobufUtil.toValue(newStatus));
+ m.put(ReplicationSection.COLF, new Text(tableId1), ProtobufUtil.toValue(newStatus));
bw.addMutation(m);
bw.flush();
@@ -351,7 +351,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
// Remove the replication entries too
bw = ReplicationTable.getBatchWriter(conn);
m = new Mutation(file1);
- m.put(StatusSection.NAME, tableId1, ProtobufUtil.toValue(newStatus));
+ m.put(StatusSection.NAME, new Text(tableId1), ProtobufUtil.toValue(newStatus));
bw.addMutation(m);
bw.flush();
@@ -370,7 +370,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
public void laterCreatedLogsDontBlockExecution() throws Exception {
conn.tableOperations().create("foo");
- Text tableId1 = new Text(conn.tableOperations().tableIdMap().get("foo"));
+ String tableId1 = conn.tableOperations().tableIdMap().get("foo");
String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID();
Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build();
@@ -383,7 +383,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.put(ReplicationSection.COLF, tableId1, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId1), ProtobufUtil.toValue(stat));
bw.addMutation(m);
bw.close();
@@ -417,10 +417,10 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
// Write another file, but also delete the old files
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(ReplicationSection.getRowPrefix() + "/accumulo/wals/tserver+port/" + UUID.randomUUID());
- m.put(ReplicationSection.COLF, tableId1, ProtobufUtil.toValue(stat));
+ m.put(ReplicationSection.COLF, new Text(tableId1), ProtobufUtil.toValue(stat));
bw.addMutation(m);
m = new Mutation(ReplicationSection.getRowPrefix() + file1);
- m.putDelete(ReplicationSection.COLF, tableId1);
+ m.putDelete(ReplicationSection.COLF, new Text(tableId1));
bw.addMutation(m);
bw.close();
@@ -431,7 +431,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw = ReplicationTable.getBatchWriter(conn);
m = new Mutation(file1);
- m.putDelete(StatusSection.NAME, tableId1);
+ m.putDelete(StatusSection.NAME, new Text(tableId1));
bw.addMutation(m);
bw.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
index 5668a67..ae277c9 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java
@@ -126,11 +126,11 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase {
bw.addMutation(m);
m = OrderSection.createMutation(file1, stat1.getCreatedTime());
- OrderSection.add(m, new Text(target.getSourceTableId()), ProtobufUtil.toValue(stat1));
+ OrderSection.add(m, target.getSourceTableId(), ProtobufUtil.toValue(stat1));
bw.addMutation(m);
m = OrderSection.createMutation(file2, stat2.getCreatedTime());
- OrderSection.add(m, new Text(target.getSourceTableId()), ProtobufUtil.toValue(stat2));
+ OrderSection.add(m, target.getSourceTableId(), ProtobufUtil.toValue(stat2));
bw.addMutation(m);
bw.close();
@@ -188,11 +188,11 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase {
bw.addMutation(m);
m = OrderSection.createMutation(file1, stat1.getCreatedTime());
- OrderSection.add(m, new Text(target1.getSourceTableId()), ProtobufUtil.toValue(stat1));
+ OrderSection.add(m, target1.getSourceTableId(), ProtobufUtil.toValue(stat1));
bw.addMutation(m);
m = OrderSection.createMutation(file2, stat2.getCreatedTime());
- OrderSection.add(m, new Text(target2.getSourceTableId()), ProtobufUtil.toValue(stat2));
+ OrderSection.add(m, target2.getSourceTableId(), ProtobufUtil.toValue(stat2));
bw.addMutation(m);
bw.close();
@@ -257,11 +257,11 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase {
bw.addMutation(m);
m = OrderSection.createMutation(file1, stat1.getCreatedTime());
- OrderSection.add(m, new Text(target1.getSourceTableId()), ProtobufUtil.toValue(stat1));
+ OrderSection.add(m, target1.getSourceTableId(), ProtobufUtil.toValue(stat1));
bw.addMutation(m);
m = OrderSection.createMutation(file2, stat2.getCreatedTime());
- OrderSection.add(m, new Text(target2.getSourceTableId()), ProtobufUtil.toValue(stat2));
+ OrderSection.add(m, target2.getSourceTableId(), ProtobufUtil.toValue(stat2));
bw.addMutation(m);
bw.close();
@@ -325,11 +325,11 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase {
bw.addMutation(m);
m = OrderSection.createMutation(file1, stat1.getCreatedTime());
- OrderSection.add(m, new Text(target.getSourceTableId()), ProtobufUtil.toValue(stat1));
+ OrderSection.add(m, target.getSourceTableId(), ProtobufUtil.toValue(stat1));
bw.addMutation(m);
m = OrderSection.createMutation(file2, stat2.getCreatedTime());
- OrderSection.add(m, new Text(target.getSourceTableId()), ProtobufUtil.toValue(stat2));
+ OrderSection.add(m, target.getSourceTableId(), ProtobufUtil.toValue(stat2));
bw.addMutation(m);
bw.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
index b072aa7..b0a787b 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
@@ -41,7 +41,6 @@ import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.replication.StatusUtil;
import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.ReplicationTableUtil;
-import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
@@ -90,7 +89,7 @@ public class StatusCombinerMacIT extends SharedMiniClusterBase {
long createTime = System.currentTimeMillis();
try {
Mutation m = new Mutation("file:/accumulo/wal/HW10447.local+56808/93cdc17e-7521-44fa-87b5-37f45bcb92d3");
- StatusSection.add(m, new Text("1"), StatusUtil.fileCreatedValue(createTime));
+ StatusSection.add(m, "1", StatusUtil.fileCreatedValue(createTime));
bw.addMutation(m);
} finally {
bw.close();
@@ -103,7 +102,7 @@ public class StatusCombinerMacIT extends SharedMiniClusterBase {
bw = ReplicationTable.getBatchWriter(conn);
try {
Mutation m = new Mutation("file:/accumulo/wal/HW10447.local+56808/93cdc17e-7521-44fa-87b5-37f45bcb92d3");
- StatusSection.add(m, new Text("1"), ProtobufUtil.toValue(StatusUtil.replicated(Long.MAX_VALUE)));
+ StatusSection.add(m, "1", ProtobufUtil.toValue(StatusUtil.replicated(Long.MAX_VALUE)));
bw.addMutation(m);
} finally {
bw.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
index cb34ed2..cd57ae1 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java
@@ -98,13 +98,13 @@ public class StatusMakerIT extends ConfigurableMacBase {
Scanner s = ReplicationTable.getScanner(conn);
StatusSection.limit(s);
- Text file = new Text(), tableId = new Text();
+ Text file = new Text();
for (Entry<Key,Value> entry : s) {
StatusSection.getFile(entry.getKey(), file);
- StatusSection.getTableId(entry.getKey(), tableId);
+ String tableId = StatusSection.getTableId(entry.getKey());
Assert.assertTrue("Found unexpected file: " + file, files.contains(file.toString()));
- Assert.assertEquals(fileToTableId.get(file.toString()), new Integer(tableId.toString()));
+ Assert.assertEquals(fileToTableId.get(file.toString()), new Integer(tableId));
timeCreated = fileToTimeCreated.get(file.toString());
Assert.assertNotNull(timeCreated);
Assert.assertEquals(StatusUtil.fileCreated(timeCreated), Status.parseFrom(entry.getValue().get()));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
index 048fa94..f24129e 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java
@@ -138,14 +138,14 @@ public class UnorderedWorkAssignerIT extends ConfigurableMacBase {
WorkSection.add(m, serializedTarget1, ProtobufUtil.toValue(status1));
bw.addMutation(m);
m = OrderSection.createMutation(file1, status1.getCreatedTime());
- OrderSection.add(m, new Text(target1.getSourceTableId()), ProtobufUtil.toValue(status1));
+ OrderSection.add(m, target1.getSourceTableId(), ProtobufUtil.toValue(status1));
bw.addMutation(m);
m = new Mutation(file2);
WorkSection.add(m, serializedTarget2, ProtobufUtil.toValue(status2));
bw.addMutation(m);
m = OrderSection.createMutation(file2, status2.getCreatedTime());
- OrderSection.add(m, new Text(target2.getSourceTableId()), ProtobufUtil.toValue(status2));
+ OrderSection.add(m, target2.getSourceTableId(), ProtobufUtil.toValue(status2));
bw.addMutation(m);
bw.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
index 59197de..0eae4f3 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java
@@ -113,7 +113,7 @@ public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase
value.write(out);
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text(Integer.toString(fakeTableId)), null, null);
+ key.tablet = new KeyExtent(Integer.toString(fakeTableId), null, null);
key.seq = 1l;
key.tid = 1;
@@ -169,7 +169,7 @@ public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase
// Add our fake WAL to the log column for this table
String walUri = tserverWal.toURI().toString();
- KeyExtent extent = new KeyExtent(new Text(tableId), null, null);
+ KeyExtent extent = new KeyExtent(tableId, null, null);
bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
m = new Mutation(extent.getMetadataEntry());
m.put(MetadataSchema.TabletsSection.LogColumnFamily.NAME, new Text("localhost:12345/" + walUri), new Value((walUri + "|1").getBytes(UTF_8)));
[5/5] accumulo git commit: ACCUMULO-4145 Eliminate Text wrapping of
tableIDs
Posted by ct...@apache.org.
ACCUMULO-4145 Eliminate Text wrapping of tableIDs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a14bc292
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a14bc292
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a14bc292
Branch: refs/heads/master
Commit: a14bc292d2271a4d369d2b3f04cd49e6efc36280
Parents: e205502
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 18 18:56:54 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Feb 19 21:57:30 2016 -0500
----------------------------------------------------------------------
.../core/client/impl/ActiveCompactionImpl.java | 5 +-
.../core/client/impl/ActiveScanImpl.java | 9 +-
.../core/client/impl/BatchWriterImpl.java | 12 +-
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../client/impl/MultiTableBatchWriterImpl.java | 10 +-
.../core/client/impl/OfflineIterator.java | 4 +-
.../client/impl/ReplicationOperationsImpl.java | 22 +-
.../accumulo/core/client/impl/ScannerImpl.java | 11 +-
.../core/client/impl/ScannerIterator.java | 5 +-
.../core/client/impl/TableOperationsImpl.java | 14 +-
.../core/client/impl/TabletLocator.java | 14 +-
.../core/client/impl/TabletLocatorImpl.java | 6 +-
.../client/impl/TabletServerBatchReader.java | 10 +-
.../impl/TabletServerBatchReaderIterator.java | 25 +-
.../client/impl/TabletServerBatchWriter.java | 24 +-
.../core/client/impl/ThriftScanner.java | 23 +-
.../accumulo/core/client/impl/Writer.java | 22 +-
.../client/mapred/AccumuloOutputFormat.java | 5 +-
.../client/mapreduce/AccumuloOutputFormat.java | 5 +-
.../mapreduce/lib/impl/InputConfigurator.java | 6 +-
.../client/mock/impl/MockTabletLocator.java | 2 +-
.../apache/accumulo/core/data/KeyExtent.java | 12 +-
.../accumulo/core/data/impl/KeyExtent.java | 58 +--
.../accumulo/core/data/impl/TabletIdImpl.java | 4 +-
.../accumulo/core/metadata/RootTable.java | 5 +-
.../core/metadata/schema/MetadataSchema.java | 12 +-
.../core/replication/ReplicationSchema.java | 27 +-
.../org/apache/accumulo/core/util/Merge.java | 2 +-
.../client/impl/TableOperationsImplTest.java | 3 +-
.../core/client/impl/TabletLocatorImplTest.java | 56 +--
.../accumulo/core/data/KeyExtentTest.java | 8 +-
.../apache/accumulo/core/data/RangeTest.java | 21 +-
.../accumulo/core/file/rfile/RFileTest.java | 4 +-
.../core/iterators/IteratorUtilTest.java | 11 +-
.../iterators/system/MultiIteratorTest.java | 6 +-
.../ReplicationConfigurationUtilTest.java | 12 +-
.../core/replication/ReplicationSchemaTest.java | 14 +-
.../apache/accumulo/core/util/MergeTest.java | 2 +-
.../simple/client/RandomBatchWriter.java | 5 +-
.../examples/simple/client/RowOperations.java | 10 +-
.../simple/mapreduce/TeraSortIngest.java | 6 +-
.../examples/simple/shard/ContinuousQuery.java | 4 +-
.../accumulo/server/client/BulkImporter.java | 2 +-
.../server/conf/ServerConfigurationFactory.java | 2 +-
.../server/conf/TableConfiguration.java | 16 +-
.../apache/accumulo/server/fs/VolumeUtil.java | 2 +-
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../server/master/balancer/GroupBalancer.java | 5 +-
.../master/balancer/TableLoadBalancer.java | 4 +-
.../master/state/TabletStateChangeIterator.java | 9 +-
.../accumulo/server/problems/ProblemReport.java | 36 +-
.../problems/ProblemReportingIterator.java | 12 +-
.../tabletserver/LargestFirstMemoryManager.java | 9 +-
.../org/apache/accumulo/server/util/Admin.java | 12 +-
.../server/util/CheckForMetadataProblems.java | 2 +-
.../server/util/FindOfflineTablets.java | 6 +-
.../server/util/MasterMetadataUtil.java | 4 +-
.../accumulo/server/util/MetadataTableUtil.java | 39 +-
.../util/RemoveEntriesForMissingFiles.java | 3 +-
.../server/util/ReplicationTableUtil.java | 6 +-
.../accumulo/server/util/TableDiskUsage.java | 3 +-
.../accumulo/server/util/TabletIterator.java | 7 +-
.../server/client/BulkImporterTest.java | 11 +-
.../balancer/ChaoticLoadBalancerTest.java | 6 +-
.../balancer/DefaultLoadBalancerTest.java | 12 +-
.../master/balancer/GroupBalancerTest.java | 2 +-
.../master/balancer/TableLoadBalancerTest.java | 6 +-
.../server/master/state/MergeInfoTest.java | 24 +-
.../server/problems/ProblemReportTest.java | 44 +--
.../problems/ProblemReportingIteratorTest.java | 4 +-
.../accumulo/server/util/AdminCommandsTest.java | 2 +-
.../server/util/ReplicationTableUtilTest.java | 6 +-
.../accumulo/gc/GarbageCollectionTest.java | 4 +-
.../java/org/apache/accumulo/master/Master.java | 39 +-
.../master/MasterClientServiceHandler.java | 2 +-
.../accumulo/master/TabletGroupWatcher.java | 24 +-
.../master/replication/FinishedWorkUpdater.java | 4 +-
.../master/replication/StatusMaker.java | 10 +-
.../accumulo/master/replication/WorkMaker.java | 8 +-
.../accumulo/master/state/MergeStats.java | 2 +-
.../accumulo/master/state/TableStats.java | 13 +-
.../accumulo/master/tableOps/CleanUp.java | 3 +-
.../master/tableOps/CompactionDriver.java | 2 +-
.../accumulo/master/tableOps/CopyFailed.java | 3 +-
.../master/tableOps/PopulateMetadata.java | 3 +-
.../master/tableOps/PopulateMetadataTable.java | 2 +-
.../accumulo/master/tableOps/TableRangeOp.java | 10 +-
.../master/tableOps/TableRangeOpWait.java | 9 +-
.../master/tableOps/WriteExportFiles.java | 5 +-
.../master/state/RootTabletStateStoreTest.java | 3 +-
.../monitor/servlets/TServersServlet.java | 2 +-
.../monitor/servlets/TablesServlet.java | 4 +-
.../org/apache/accumulo/monitor/util/Table.java | 20 +-
.../org/apache/accumulo/tracer/TraceServer.java | 18 +-
.../apache/accumulo/tserver/FileManager.java | 6 +-
.../apache/accumulo/tserver/TabletServer.java | 29 +-
.../compaction/MajorCompactionRequest.java | 9 -
.../accumulo/tserver/logger/LogReader.java | 2 +-
.../replication/AccumuloReplicaSystem.java | 6 +-
.../tserver/session/SessionManager.java | 11 +-
.../accumulo/tserver/tablet/Compactor.java | 4 +-
.../tserver/tablet/DatafileManager.java | 6 +-
.../accumulo/tserver/tablet/MinorCompactor.java | 12 +-
.../apache/accumulo/tserver/tablet/Tablet.java | 9 +-
.../accumulo/tserver/AssignmentWatcherTest.java | 3 +-
.../tserver/CheckTabletMetadataTest.java | 6 +-
.../tserver/LargestFirstMemoryManagerTest.java | 4 +-
.../DefaultCompactionStrategyTest.java | 3 +-
.../SizeLimitCompactionStrategyTest.java | 3 +-
.../ConfigurableCompactionStrategyTest.java | 3 +-
.../accumulo/tserver/log/LogEntryTest.java | 2 +-
.../tserver/log/SortedLogRecoveryTest.java | 2 +-
.../accumulo/tserver/logger/LogFileTest.java | 2 +-
.../replication/AccumuloReplicaSystemTest.java | 14 +-
.../java/org/apache/accumulo/test/CloneIT.java | 18 +-
.../accumulo/test/ConditionalWriterIT.java | 22 +-
.../org/apache/accumulo/test/LocatorIT.java | 2 +-
.../test/MasterRepairsDualAssignmentIT.java | 4 +-
.../accumulo/test/MetaConstraintRetryIT.java | 3 +-
.../MissingWalHeaderCompletesRecoveryIT.java | 6 +-
.../accumulo/test/QueryMetadataTable.java | 2 +-
.../apache/accumulo/test/SplitRecoveryIT.java | 4 +-
.../java/org/apache/accumulo/test/VolumeIT.java | 4 +-
.../apache/accumulo/test/WrongTabletTest.java | 2 +-
.../continuous/ContinuousStatsCollector.java | 3 +-
.../accumulo/test/functional/CompactionIT.java | 5 +-
.../test/functional/MasterAssignmentIT.java | 3 +-
.../accumulo/test/functional/MergeIT.java | 6 +-
.../accumulo/test/functional/SplitIT.java | 3 +-
.../test/functional/SplitRecoveryIT.java | 4 +-
.../accumulo/test/functional/TableIT.java | 3 +-
.../functional/TabletStateChangeIteratorIT.java | 8 +-
.../CloseWriteAheadLogReferencesIT.java | 2 +-
.../accumulo/test/master/MergeStateIT.java | 2 +-
.../metadata/MetadataBatchScanTest.java | 2 +-
.../performance/scan/CollectTabletStats.java | 2 +-
.../test/performance/thrift/NullTserver.java | 3 +-
.../accumulo/test/proxy/SimpleProxyBase.java | 364 +++++++++----------
.../RemoveCompleteReplicationRecordsIT.java | 27 +-
.../test/replication/ReplicationIT.java | 5 +-
.../ReplicationOperationsImplIT.java | 46 +--
.../replication/SequentialWorkAssignerIT.java | 16 +-
.../test/replication/StatusCombinerMacIT.java | 5 +-
.../test/replication/StatusMakerIT.java | 6 +-
.../replication/UnorderedWorkAssignerIT.java | 4 +-
...UnusedWalDoesntCloseReplicationStatusIT.java | 4 +-
146 files changed, 827 insertions(+), 905 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
index 1e429c8..838baa9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveCompactionImpl.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.core.data.TabletId;
import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.data.impl.TabletIdImpl;
import org.apache.accumulo.core.data.thrift.IterInfo;
+import org.apache.hadoop.io.Text;
/**
*
@@ -45,14 +46,14 @@ public class ActiveCompactionImpl extends ActiveCompaction {
@Override
public String getTable() throws TableNotFoundException {
- return Tables.getTableName(instance, new KeyExtent(tac.getExtent()).getTableId().toString());
+ return Tables.getTableName(instance, new KeyExtent(tac.getExtent()).getTableId());
}
@Override
@Deprecated
public org.apache.accumulo.core.data.KeyExtent getExtent() {
KeyExtent ke = new KeyExtent(tac.getExtent());
- org.apache.accumulo.core.data.KeyExtent oke = new org.apache.accumulo.core.data.KeyExtent(ke.getTableId(), ke.getEndRow(), ke.getPrevEndRow());
+ org.apache.accumulo.core.data.KeyExtent oke = new org.apache.accumulo.core.data.KeyExtent(new Text(ke.getTableId()), ke.getEndRow(), ke.getPrevEndRow());
return oke;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
index 429f8cd..7015303 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ActiveScanImpl.java
@@ -32,6 +32,7 @@ import org.apache.accumulo.core.data.impl.TabletIdImpl;
import org.apache.accumulo.core.data.thrift.IterInfo;
import org.apache.accumulo.core.data.thrift.TColumn;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.hadoop.io.Text;
/**
* A class that contains information about an ActiveScan
@@ -42,7 +43,7 @@ public class ActiveScanImpl extends ActiveScan {
private long scanId;
private String client;
- private String table;
+ private String tableName;
private long age;
private long idle;
private ScanType type;
@@ -60,7 +61,7 @@ public class ActiveScanImpl extends ActiveScan {
this.user = activeScan.user;
this.age = activeScan.age;
this.idle = activeScan.idleTime;
- this.table = Tables.getTableName(instance, activeScan.tableId);
+ this.tableName = Tables.getTableName(instance, activeScan.tableId);
this.type = ScanType.valueOf(activeScan.getType().name());
this.state = ScanState.valueOf(activeScan.state.name());
this.extent = new KeyExtent(activeScan.extent);
@@ -95,7 +96,7 @@ public class ActiveScanImpl extends ActiveScan {
@Override
public String getTable() {
- return table;
+ return tableName;
}
@Override
@@ -121,7 +122,7 @@ public class ActiveScanImpl extends ActiveScan {
@Override
@Deprecated
public org.apache.accumulo.core.data.KeyExtent getExtent() {
- return new org.apache.accumulo.core.data.KeyExtent(extent.getTableId(), extent.getEndRow(), extent.getPrevEndRow());
+ return new org.apache.accumulo.core.data.KeyExtent(new Text(extent.getTableId()), extent.getEndRow(), extent.getPrevEndRow());
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java
index c173333..7096187 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java
@@ -25,28 +25,28 @@ import org.apache.accumulo.core.data.Mutation;
public class BatchWriterImpl implements BatchWriter {
- private final String table;
+ private final String tableId;
private final TabletServerBatchWriter bw;
- public BatchWriterImpl(ClientContext context, String table, BatchWriterConfig config) {
+ public BatchWriterImpl(ClientContext context, String tableId, BatchWriterConfig config) {
checkArgument(context != null, "context is null");
- checkArgument(table != null, "table is null");
+ checkArgument(tableId != null, "tableId is null");
if (config == null)
config = new BatchWriterConfig();
- this.table = table;
+ this.tableId = tableId;
this.bw = new TabletServerBatchWriter(context, config);
}
@Override
public void addMutation(Mutation m) throws MutationsRejectedException {
checkArgument(m != null, "m is null");
- bw.addMutation(table, m);
+ bw.addMutation(tableId, m);
}
@Override
public void addMutations(Iterable<Mutation> iterable) throws MutationsRejectedException {
checkArgument(iterable != null, "iterable is null");
- bw.addMutation(table, iterable.iterator());
+ bw.addMutation(tableId, iterable.iterator());
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index c9ef101..00140e9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -388,7 +388,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
this.auths = config.getAuthorizations();
this.ve = new VisibilityEvaluator(config.getAuthorizations());
this.threadPool = new ScheduledThreadPoolExecutor(config.getMaxWriteThreads(), new NamingThreadFactory(this.getClass().getSimpleName()));
- this.locator = TabletLocator.getLocator(context, new Text(tableId));
+ this.locator = TabletLocator.getLocator(context, tableId);
this.serverQueues = new HashMap<String,ServerQueue>();
this.tableId = tableId;
this.timeout = config.getTimeout(TimeUnit.MILLISECONDS);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 5d13eda..6f700a3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -53,21 +53,21 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
private class TableBatchWriter implements BatchWriter {
- private String table;
+ private String tableId;
- TableBatchWriter(String table) {
- this.table = table;
+ TableBatchWriter(String tableId) {
+ this.tableId = tableId;
}
@Override
public void addMutation(Mutation m) throws MutationsRejectedException {
checkArgument(m != null, "m is null");
- bw.addMutation(table, m);
+ bw.addMutation(tableId, m);
}
@Override
public void addMutations(Iterable<Mutation> iterable) throws MutationsRejectedException {
- bw.addMutation(table, iterable.iterator());
+ bw.addMutation(tableId, iterable.iterator());
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
index 9cce089..487af11 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java
@@ -221,7 +221,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
else
startRow = new Text();
- nextRange = new Range(new KeyExtent(new Text(tableId), startRow, null).getMetadataEntry(), true, null, false);
+ nextRange = new Range(new KeyExtent(tableId, startRow, null).getMetadataEntry(), true, null, false);
} else {
if (currentExtent.getEndRow() == null) {
@@ -256,7 +256,7 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
KeyExtent extent = eloc.getFirst();
- if (!extent.getTableId().toString().equals(tableId)) {
+ if (!extent.getTableId().equals(tableId)) {
throw new AccumuloException(" did not find tablets for table " + tableId + " " + extent);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
index 25d26a8..ab6160e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.client.impl;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import static java.util.Objects.requireNonNull;
import java.util.Collections;
@@ -51,8 +52,6 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-
public class ReplicationOperationsImpl implements ReplicationOperations {
private static final Logger log = LoggerFactory.getLogger(ReplicationOperationsImpl.class);
@@ -118,22 +117,22 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
});
}
- protected Text getTableId(Connector conn, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+ protected String getTableId(Connector conn, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
TableOperations tops = conn.tableOperations();
if (!conn.tableOperations().exists(tableName)) {
throw new TableNotFoundException(null, tableName, null);
}
- String strTableId = null;
- while (null == strTableId) {
- strTableId = tops.tableIdMap().get(tableName);
- if (null == strTableId) {
+ String tableId = null;
+ while (null == tableId) {
+ tableId = tops.tableIdMap().get(tableName);
+ if (null == tableId) {
sleepUninterruptibly(200, TimeUnit.MILLISECONDS);
}
}
- return new Text(strTableId);
+ return tableId;
}
@Override
@@ -143,13 +142,13 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
log.debug("Collecting referenced files for replication of table {}", tableName);
Connector conn = context.getConnector();
- Text tableId = getTableId(conn, tableName);
+ String tableId = getTableId(conn, tableName);
log.debug("Found id of {} for name {}", tableId, tableName);
// Get the WALs currently referenced by the table
BatchScanner metaBs = conn.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY, 4);
- metaBs.setRanges(Collections.singleton(MetadataSchema.TabletsSection.getRange(tableId.toString())));
+ metaBs.setRanges(Collections.singleton(MetadataSchema.TabletsSection.getRange(tableId)));
metaBs.fetchColumnFamily(LogColumnFamily.NAME);
Set<String> wals = new HashSet<>();
try {
@@ -168,8 +167,7 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
try {
Text buffer = new Text();
for (Entry<Key,Value> entry : metaBs) {
- ReplicationSection.getTableId(entry.getKey(), buffer);
- if (buffer.equals(tableId)) {
+ if (tableId.equals(ReplicationSection.getTableId(entry.getKey()))) {
ReplicationSection.getFile(entry.getKey(), buffer);
wals.add(buffer.toString());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
index 09edc4a..89406f4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
@@ -28,7 +28,6 @@ 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.hadoop.io.Text;
/**
* provides scanner functionality
@@ -47,7 +46,7 @@ public class ScannerImpl extends ScannerOptions implements Scanner {
private final ClientContext context;
private Authorizations authorizations;
- private Text table;
+ private String tableId;
private int size;
@@ -55,12 +54,12 @@ public class ScannerImpl extends ScannerOptions implements Scanner {
private boolean isolated = false;
private long readaheadThreshold = Constants.SCANNER_DEFAULT_READAHEAD_THRESHOLD;
- public ScannerImpl(ClientContext context, String table, Authorizations authorizations) {
+ public ScannerImpl(ClientContext context, String tableId, Authorizations authorizations) {
checkArgument(context != null, "context is null");
- checkArgument(table != null, "table is null");
+ checkArgument(tableId != null, "tableId is null");
checkArgument(authorizations != null, "authorizations is null");
this.context = context;
- this.table = new Text(table);
+ this.tableId = tableId;
this.range = new Range((Key) null, (Key) null);
this.authorizations = authorizations;
@@ -93,7 +92,7 @@ public class ScannerImpl extends ScannerOptions implements Scanner {
@Override
public synchronized Iterator<Entry<Key,Value>> iterator() {
- return new ScannerIterator(context, table, authorizations, range, size, getTimeOut(), this, isolated, readaheadThreshold);
+ return new ScannerIterator(context, tableId, authorizations, range, size, getTimeOut(), this, isolated, readaheadThreshold);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
index d6512f0..18b90e0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java
@@ -40,7 +40,6 @@ 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.core.util.NamingThreadFactory;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +48,6 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
private static final Logger log = LoggerFactory.getLogger(ScannerIterator.class);
// scanner options
- private Text tableId;
private int timeOut;
// scanner state
@@ -106,9 +104,8 @@ public class ScannerIterator implements Iterator<Entry<Key,Value>> {
}
- ScannerIterator(ClientContext context, Text table, Authorizations authorizations, Range range, int size, int timeOut, ScannerOptions options,
+ ScannerIterator(ClientContext context, String tableId, Authorizations authorizations, Range range, int size, int timeOut, ScannerOptions options,
boolean isolated, long readaheadThreshold) {
- this.tableId = new Text(table);
this.timeOut = timeOut;
this.readaheadThreshold = readaheadThreshold;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index d3d38bf..5a685d8 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -442,7 +442,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
private void addSplits(String tableName, SortedSet<Text> partitionKeys, String tableId) throws AccumuloException, AccumuloSecurityException,
TableNotFoundException, AccumuloServerException {
- TabletLocator tabLocator = TabletLocator.getLocator(context, new Text(tableId));
+ TabletLocator tabLocator = TabletLocator.getLocator(context, tableId);
for (Text split : partitionKeys) {
boolean successful = false;
@@ -984,7 +984,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
Random random = new Random();
Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
String tableId = Tables.getTableId(context.getInstance(), tableName);
- TabletLocator tl = TabletLocator.getLocator(context, new Text(tableId));
+ TabletLocator tl = TabletLocator.getLocator(context, tableId);
// its possible that the cache could contain complete, but old information about a tables tablets... so clear it
tl.invalidateCache();
while (!tl.binRanges(context, Collections.singletonList(range), binnedRanges).isEmpty()) {
@@ -1106,9 +1106,9 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- Range range = new KeyExtent(new Text(tableId), null, null).toMetadataRange();
+ Range range = new KeyExtent(tableId, null, null).toMetadataRange();
if (startRow == null || lastRow == null)
- range = new KeyExtent(new Text(tableId), null, null).toMetadataRange();
+ range = new KeyExtent(tableId, null, null).toMetadataRange();
else
range = new Range(startRow, lastRow);
@@ -1163,7 +1163,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
serverCounts.increment(future, 1);
}
- if (!extent.getTableId().toString().equals(tableId)) {
+ if (!extent.getTableId().equals(tableId)) {
throw new AccumuloException("Saw unexpected table Id " + tableId + " " + extent);
}
@@ -1264,7 +1264,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
@Override
public void clearLocatorCache(String tableName) throws TableNotFoundException {
checkArgument(tableName != null, "tableName is null");
- TabletLocator tabLocator = TabletLocator.getLocator(context, new Text(Tables.getTableId(context.getInstance(), tableName)));
+ TabletLocator tabLocator = TabletLocator.getLocator(context, Tables.getTableId(context.getInstance(), tableName));
tabLocator.invalidateCache();
}
@@ -1590,7 +1590,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
requireNonNull(ranges, "ranges must be non null");
String tableId = Tables.getTableId(context.getInstance(), tableName);
- TabletLocator locator = TabletLocator.getLocator(context, new Text(tableId));
+ TabletLocator locator = TabletLocator.getLocator(context, tableId);
List<Range> rangeList = null;
if (ranges instanceof List) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
index 1fbaee8..4a28bff 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
@@ -65,9 +65,9 @@ public abstract class TabletLocator {
private static class LocatorKey {
String instanceId;
- Text tableName;
+ String tableName;
- LocatorKey(String instanceId, Text table) {
+ LocatorKey(String instanceId, String table) {
this.instanceId = instanceId;
this.tableName = table;
}
@@ -96,19 +96,19 @@ public abstract class TabletLocator {
locators.clear();
}
- public static synchronized TabletLocator getLocator(ClientContext context, Text tableId) {
+ public static synchronized TabletLocator getLocator(ClientContext context, String tableId) {
Instance instance = context.getInstance();
LocatorKey key = new LocatorKey(instance.getInstanceID(), tableId);
TabletLocator tl = locators.get(key);
if (tl == null) {
MetadataLocationObtainer mlo = new MetadataLocationObtainer();
- if (tableId.toString().equals(RootTable.ID)) {
+ if (RootTable.ID.equals(tableId)) {
tl = new RootTabletLocator(new ZookeeperLockChecker(instance));
- } else if (tableId.toString().equals(MetadataTable.ID)) {
- tl = new TabletLocatorImpl(new Text(MetadataTable.ID), getLocator(context, new Text(RootTable.ID)), mlo, new ZookeeperLockChecker(instance));
+ } else if (MetadataTable.ID.equals(tableId)) {
+ tl = new TabletLocatorImpl(MetadataTable.ID, getLocator(context, RootTable.ID), mlo, new ZookeeperLockChecker(instance));
} else {
- tl = new TabletLocatorImpl(tableId, getLocator(context, new Text(MetadataTable.ID)), mlo, new ZookeeperLockChecker(instance));
+ tl = new TabletLocatorImpl(tableId, getLocator(context, MetadataTable.ID), mlo, new ZookeeperLockChecker(instance));
}
locators.put(key, tl);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
index 16ef8e8..1422b0c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
@@ -88,7 +88,7 @@ public class TabletLocatorImpl extends TabletLocator {
static final EndRowComparator endRowComparator = new EndRowComparator();
- protected Text tableId;
+ protected String tableId;
protected TabletLocator parent;
protected TreeMap<Text,TabletLocation> metaCache = new TreeMap<Text,TabletLocation>(endRowComparator);
protected TabletLocationObtainer locationObtainer;
@@ -152,8 +152,8 @@ public class TabletLocatorImpl extends TabletLocator {
}
}
- public TabletLocatorImpl(Text table, TabletLocator parent, TabletLocationObtainer tlo, TabletServerLockChecker tslc) {
- this.tableId = table;
+ public TabletLocatorImpl(String tableId, TabletLocator parent, TabletLocationObtainer tlo, TabletServerLockChecker tslc) {
+ this.tableId = tableId;
this.parent = parent;
this.locationObtainer = tlo;
this.lockChecker = tslc;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
index 6d09936..ce28f8b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
public class TabletServerBatchReader extends ScannerOptions implements BatchScanner {
private static final Logger log = LoggerFactory.getLogger(TabletServerBatchReader.class);
- private String table;
+ private String tableId;
private int numThreads;
private ExecutorService queryThreadPool;
@@ -54,13 +54,13 @@ public class TabletServerBatchReader extends ScannerOptions implements BatchScan
private final int batchReaderInstance = getNextBatchReaderInstance();
- public TabletServerBatchReader(ClientContext context, String table, Authorizations authorizations, int numQueryThreads) {
+ public TabletServerBatchReader(ClientContext context, String tableId, Authorizations authorizations, int numQueryThreads) {
checkArgument(context != null, "context is null");
- checkArgument(table != null, "table is null");
+ checkArgument(tableId != null, "tableId is null");
checkArgument(authorizations != null, "authorizations is null");
this.context = context;
this.authorizations = authorizations;
- this.table = table;
+ this.tableId = tableId;
this.numThreads = numQueryThreads;
queryThreadPool = new SimpleThreadPool(numQueryThreads, "batch scanner " + batchReaderInstance + "-");
@@ -112,6 +112,6 @@ public class TabletServerBatchReader extends ScannerOptions implements BatchScan
throw new IllegalStateException("batch reader closed");
}
- return new TabletServerBatchReaderIterator(context, table, authorizations, ranges, numThreads, queryThreadPool, this, timeOut);
+ return new TabletServerBatchReaderIterator(context, tableId, authorizations, ranges, numThreads, queryThreadPool, this, timeOut);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index 814e71b..13e52c0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -65,7 +65,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.OpTimer;
-import org.apache.hadoop.io.Text;
import org.apache.htrace.wrappers.TraceRunnable;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
@@ -82,7 +81,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
private final ClientContext context;
private final Instance instance;
- private final String table;
+ private final String tableId;
private Authorizations authorizations = Authorizations.EMPTY;
private final int numThreads;
private final ExecutorService queryThreadPool;
@@ -108,19 +107,19 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
void receive(List<Entry<Key,Value>> entries);
}
- public TabletServerBatchReaderIterator(ClientContext context, String table, Authorizations authorizations, ArrayList<Range> ranges, int numThreads,
+ public TabletServerBatchReaderIterator(ClientContext context, String tableId, Authorizations authorizations, ArrayList<Range> ranges, int numThreads,
ExecutorService queryThreadPool, ScannerOptions scannerOptions, long timeout) {
this.context = context;
this.instance = context.getInstance();
- this.table = table;
+ this.tableId = tableId;
this.authorizations = authorizations;
this.numThreads = numThreads;
this.queryThreadPool = queryThreadPool;
this.options = new ScannerOptions(scannerOptions);
resultsQueue = new ArrayBlockingQueue<List<Entry<Key,Value>>>(numThreads);
- this.locator = new TimeoutTabletLocator(TabletLocator.getLocator(context, new Text(table)), timeout);
+ this.locator = new TimeoutTabletLocator(TabletLocator.getLocator(context, tableId), timeout);
timeoutTrackers = Collections.synchronizedMap(new HashMap<String,TabletServerBatchReaderIterator.TimeoutTracker>());
timedoutServers = Collections.synchronizedSet(new HashSet<String>());
@@ -242,10 +241,10 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
// the table was deleted the tablet locator entries for the deleted table were not cleared... so
// need to always do the check when failures occur
if (failures.size() >= lastFailureSize)
- if (!Tables.exists(instance, table))
- throw new TableDeletedException(table);
- else if (Tables.getTableState(instance, table) == TableState.OFFLINE)
- throw new TableOfflineException(instance, table);
+ if (!Tables.exists(instance, tableId))
+ throw new TableDeletedException(tableId);
+ else if (Tables.getTableState(instance, tableId) == TableState.OFFLINE)
+ throw new TableOfflineException(instance, tableId);
lastFailureSize = failures.size();
@@ -313,7 +312,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
}
private String getTableInfo() {
- return Tables.getPrintableTableInfoFromId(instance, table);
+ return Tables.getPrintableTableInfoFromId(instance, tableId);
}
private class QueryTask implements Runnable {
@@ -374,8 +373,8 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
log.debug("AccumuloSecurityException thrown", e);
Tables.clearCache(instance);
- if (!Tables.exists(instance, table))
- fatalException = new TableDeletedException(table);
+ if (!Tables.exists(instance, tableId))
+ fatalException = new TableDeletedException(tableId);
else
fatalException = e;
} catch (SampleNotPresentException e) {
@@ -729,7 +728,7 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value
log.debug("Server : " + server + " msg : " + e.getMessage(), e);
String tableInfo = "?";
if (e.getExtent() != null) {
- String tableId = new KeyExtent(e.getExtent()).getTableId().toString();
+ String tableId = new KeyExtent(e.getExtent()).getTableId();
tableInfo = Tables.getPrintableTableInfoFromId(context.getInstance(), tableId);
}
String message = "Table " + tableInfo + " does not have sampling configured or built";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index f14116a..bc90d00 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -66,7 +66,6 @@ import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.trace.thrift.TInfo;
import org.apache.accumulo.core.util.SimpleThreadPool;
-import org.apache.hadoop.io.Text;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
@@ -489,7 +488,7 @@ public class TabletServerBatchWriter {
// was a table deleted?
HashSet<String> tableIds = new HashSet<String>();
for (KeyExtent ke : authorizationFailures.keySet())
- tableIds.add(ke.getTableId().toString());
+ tableIds.add(ke.getTableId());
Tables.clearCache(context.getInstance());
for (String tableId : tableIds)
@@ -593,7 +592,7 @@ public class TabletServerBatchWriter {
synchronized void add(String location, TabletServerMutations<Mutation> tsm) {
init();
for (Entry<KeyExtent,List<Mutation>> entry : tsm.getMutations().entrySet()) {
- recentFailures.addAll(entry.getKey().getTableId().toString(), entry.getValue());
+ recentFailures.addAll(entry.getKey().getTableId(), entry.getValue());
}
}
@@ -644,7 +643,7 @@ public class TabletServerBatchWriter {
private TabletLocator getLocator(String tableId) {
TabletLocator ret = locators.get(tableId);
if (ret == null) {
- ret = TabletLocator.getLocator(context, new Text(tableId));
+ ret = TabletLocator.getLocator(context, tableId);
ret = new TimeoutTabletLocator(ret, timeout);
locators.put(tableId, ret);
}
@@ -686,8 +685,7 @@ public class TabletServerBatchWriter {
// assume an IOError communicating with metadata tablet
failedMutations.add(mutationsToProcess);
} catch (AccumuloSecurityException e) {
- updateAuthorizationFailures(Collections.singletonMap(new KeyExtent(new Text(tableId), null, null),
- SecurityErrorCode.valueOf(e.getSecurityErrorCode().name())));
+ updateAuthorizationFailures(Collections.singletonMap(new KeyExtent(tableId, null, null), SecurityErrorCode.valueOf(e.getSecurityErrorCode().name())));
} catch (TableDeletedException e) {
updateUnknownErrors(e.getMessage(), e);
} catch (TableOfflineException e) {
@@ -843,10 +841,10 @@ public class TabletServerBatchWriter {
HashSet<String> tables = new HashSet<String>();
for (KeyExtent ke : mutationBatch.keySet())
- tables.add(ke.getTableId().toString());
+ tables.add(ke.getTableId());
for (String table : tables)
- TabletLocator.getLocator(context, new Text(table)).invalidateCache(context.getInstance(), location);
+ TabletLocator.getLocator(context, table).invalidateCache(context.getInstance(), location);
failedMutations.add(location, tsm);
} finally {
@@ -882,8 +880,8 @@ public class TabletServerBatchWriter {
try {
client.update(tinfo, context.rpcCreds(), entry.getKey().toThrift(), entry.getValue().get(0).toThrift(), DurabilityImpl.toThrift(durability));
} catch (NotServingTabletException e) {
- allFailures.addAll(entry.getKey().getTableId().toString(), entry.getValue());
- TabletLocator.getLocator(context, new Text(entry.getKey().getTableId())).invalidateCache(entry.getKey());
+ allFailures.addAll(entry.getKey().getTableId(), entry.getValue());
+ TabletLocator.getLocator(context, entry.getKey().getTableId()).invalidateCache(entry.getKey());
} catch (ConstraintViolationException e) {
updatedConstraintViolations(Translator.translate(e.violationSummaries, Translators.TCVST));
}
@@ -922,12 +920,12 @@ public class TabletServerBatchWriter {
int numCommitted = (int) (long) entry.getValue();
totalCommitted += numCommitted;
- String table = failedExtent.getTableId().toString();
+ String tableId = failedExtent.getTableId();
- TabletLocator.getLocator(context, new Text(table)).invalidateCache(failedExtent);
+ TabletLocator.getLocator(context, tableId).invalidateCache(failedExtent);
ArrayList<Mutation> mutations = (ArrayList<Mutation>) tabMuts.get(failedExtent);
- allFailures.addAll(table, mutations.subList(numCommitted, mutations.size()));
+ allFailures.addAll(tableId, mutations.subList(numCommitted, mutations.size()));
}
if (failures.keySet().containsAll(tabMuts.keySet()) && totalCommitted == 0) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
index 57f5102..ed8e95a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
@@ -136,7 +136,7 @@ public class ThriftScanner {
public static class ScanState {
boolean isolated;
- Text tableId;
+ String tableId;
Text startRow;
boolean skipStartRow;
long readaheadThreshold;
@@ -163,7 +163,7 @@ public class ThriftScanner {
SamplerConfiguration samplerConfig;
- public ScanState(ClientContext context, Text tableId, Authorizations authorizations, Range range, SortedSet<Column> fetchedColumns, int size,
+ public ScanState(ClientContext context, String tableId, Authorizations authorizations, Range range, SortedSet<Column> fetchedColumns, int size,
List<IterInfo> serverSideIteratorList, Map<String,Map<String,String>> serverSideIteratorOptions, boolean isolated, long readaheadThreshold,
SamplerConfiguration samplerConfig, long batchTimeOut, String classLoaderContext) {
this.context = context;
@@ -245,10 +245,10 @@ public class ThriftScanner {
loc = TabletLocator.getLocator(context, scanState.tableId).locateTablet(context, scanState.startRow, scanState.skipStartRow, false);
if (loc == null) {
- if (!Tables.exists(instance, scanState.tableId.toString()))
- throw new TableDeletedException(scanState.tableId.toString());
- else if (Tables.getTableState(instance, scanState.tableId.toString()) == TableState.OFFLINE)
- throw new TableOfflineException(instance, scanState.tableId.toString());
+ if (!Tables.exists(instance, scanState.tableId))
+ throw new TableDeletedException(scanState.tableId);
+ else if (Tables.getTableState(instance, scanState.tableId) == TableState.OFFLINE)
+ throw new TableOfflineException(instance, scanState.tableId);
error = "Failed to locate tablet for table : " + scanState.tableId + " row : " + scanState.startRow;
if (!error.equals(lastError))
@@ -296,15 +296,14 @@ public class ThriftScanner {
results = scan(loc, scanState, context);
} catch (AccumuloSecurityException e) {
Tables.clearCache(instance);
- if (!Tables.exists(instance, scanState.tableId.toString()))
- throw new TableDeletedException(scanState.tableId.toString());
- e.setTableInfo(Tables.getPrintableTableInfoFromId(instance, scanState.tableId.toString()));
+ if (!Tables.exists(instance, scanState.tableId))
+ throw new TableDeletedException(scanState.tableId);
+ e.setTableInfo(Tables.getPrintableTableInfoFromId(instance, scanState.tableId));
throw e;
} catch (TApplicationException tae) {
throw new AccumuloServerException(loc.tablet_location, tae);
} catch (TSampleNotPresentException tsnpe) {
- String message = "Table " + Tables.getPrintableTableInfoFromId(instance, scanState.tableId.toString())
- + " does not have sampling configured or built";
+ String message = "Table " + Tables.getPrintableTableInfoFromId(instance, scanState.tableId) + " does not have sampling configured or built";
throw new SampleNotPresentException(message, tsnpe);
} catch (NotServingTabletException e) {
error = "Scan failed, not serving tablet " + loc;
@@ -442,7 +441,7 @@ public class ThriftScanner {
client.closeScan(tinfo, is.scanID);
} else {
- // log.debug("Calling continue scan : "+scanState.range+" loc = "+loc);
+ // log.debug("Calling continue scan : "+scanState.range+" loc = "+loc);
String msg = "Continuing scan tserver=" + loc.tablet_location + " scanid=" + scanState.scanID;
Thread.currentThread().setName(msg);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
index b8ce516..90691ef 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.core.client.impl;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.util.concurrent.TimeUnit;
@@ -41,24 +42,19 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.net.HostAndPort;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
public class Writer {
private static final Logger log = LoggerFactory.getLogger(Writer.class);
private ClientContext context;
- private Text table;
+ private String tableId;
- public Writer(ClientContext context, Text table) {
+ public Writer(ClientContext context, String tableId) {
checkArgument(context != null, "context is null");
- checkArgument(table != null, "table is null");
+ checkArgument(tableId != null, "tableId is null");
this.context = context;
- this.table = table;
- }
-
- public Writer(ClientContext context, String table) {
- this(context, new Text(table));
+ this.tableId = tableId;
}
private static void updateServer(ClientContext context, Mutation m, KeyExtent extent, HostAndPort server) throws TException, NotServingTabletException,
@@ -87,7 +83,7 @@ public class Writer {
throw new IllegalArgumentException("Can not add empty mutations");
while (true) {
- TabletLocation tabLoc = TabletLocator.getLocator(context, table).locateTablet(context, new Text(m.getRow()), false, true);
+ TabletLocation tabLoc = TabletLocator.getLocator(context, tableId).locateTablet(context, new Text(m.getRow()), false, true);
if (tabLoc == null) {
log.trace("No tablet location found for row " + new String(m.getRow(), UTF_8));
@@ -101,15 +97,15 @@ public class Writer {
return;
} catch (NotServingTabletException e) {
log.trace("Not serving tablet, server = " + parsedLocation);
- TabletLocator.getLocator(context, table).invalidateCache(tabLoc.tablet_extent);
+ TabletLocator.getLocator(context, tableId).invalidateCache(tabLoc.tablet_extent);
} catch (ConstraintViolationException cve) {
log.error("error sending update to " + parsedLocation + ": " + cve);
// probably do not need to invalidate cache, but it does not hurt
- TabletLocator.getLocator(context, table).invalidateCache(tabLoc.tablet_extent);
+ TabletLocator.getLocator(context, tableId).invalidateCache(tabLoc.tablet_extent);
throw cve;
} catch (TException e) {
log.error("error sending update to " + parsedLocation + ": " + e);
- TabletLocator.getLocator(context, table).invalidateCache(tabLoc.tablet_extent);
+ TabletLocator.getLocator(context, tableId).invalidateCache(tabLoc.tablet_extent);
}
sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
index c24557a..461bdc0 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
@@ -545,10 +545,11 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
if (e.getSecurityErrorCodes().size() >= 0) {
HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
- Set<SecurityErrorCode> secCodes = tables.get(ke.getKey().getTableId().toString());
+ String tableId = ke.getKey().getTableId().toString();
+ Set<SecurityErrorCode> secCodes = tables.get(tableId);
if (secCodes == null) {
secCodes = new HashSet<SecurityErrorCode>();
- tables.put(ke.getKey().getTableId().toString(), secCodes);
+ tables.put(tableId, secCodes);
}
secCodes.addAll(ke.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
index 42bd243..fa926b6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
@@ -544,10 +544,11 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
if (e.getSecurityErrorCodes().size() >= 0) {
HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
- Set<SecurityErrorCode> secCodes = tables.get(ke.getKey().getTableId().toString());
+ String tableId = ke.getKey().getTableId().toString();
+ Set<SecurityErrorCode> secCodes = tables.get(tableId);
if (secCodes == null) {
secCodes = new HashSet<SecurityErrorCode>();
- tables.put(ke.getKey().getTableId().toString(), secCodes);
+ tables.put(tableId, secCodes);
}
secCodes.addAll(ke.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
index 175abbf..4cc3055 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
@@ -683,7 +683,7 @@ public class InputConfigurator extends ConfiguratorBase {
ClientConfiguration clientConf = getClientConfiguration(implementingClass, conf);
ClientContext context = new ClientContext(instance,
new Credentials(getPrincipal(implementingClass, conf), getAuthenticationToken(implementingClass, conf)), clientConf);
- return TabletLocator.getLocator(context, new Text(tableId));
+ return TabletLocator.getLocator(context, tableId);
}
/**
@@ -869,7 +869,7 @@ public class InputConfigurator extends ConfiguratorBase {
else
startRow = new Text();
- Range metadataRange = new Range(new KeyExtent(new Text(tableId), startRow, null).getMetadataEntry(), true, null, false);
+ Range metadataRange = new Range(new KeyExtent(tableId, startRow, null).getMetadataEntry(), true, null, false);
Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
scanner.fetchColumnFamily(MetadataSchema.TabletsSection.LastLocationColumnFamily.NAME);
@@ -907,7 +907,7 @@ public class InputConfigurator extends ConfiguratorBase {
if (location != null)
return null;
- if (!extent.getTableId().toString().equals(tableId)) {
+ if (!extent.getTableId().equals(tableId)) {
throw new AccumuloException("Saw unexpected table Id " + tableId + " " + extent);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
index 9936709..1046a8d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/impl/MockTabletLocator.java
@@ -57,7 +57,7 @@ public class MockTabletLocator extends TabletLocator {
@Override
public List<Range> binRanges(ClientContext context, List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges) throws AccumuloException,
AccumuloSecurityException, TableNotFoundException {
- binnedRanges.put("", Collections.singletonMap(new KeyExtent(new Text(), null, null), ranges));
+ binnedRanges.put("", Collections.singletonMap(new KeyExtent("", null, null), ranges));
return Collections.emptyList();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
index 7bbb0c2..4e3d058 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
@@ -51,11 +51,11 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
public KeyExtent(Text table, Text endRow, Text prevEndRow) {
- this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(table, endRow, prevEndRow);
+ this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(table.toString(), endRow, prevEndRow);
}
public KeyExtent(KeyExtent extent) {
- this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(extent.getTableId(), extent.getEndRow(), extent.getPrevEndRow());
+ this.wrapped = new org.apache.accumulo.core.data.impl.KeyExtent(extent.getTableId().toString(), extent.getEndRow(), extent.getPrevEndRow());
}
public KeyExtent(TKeyExtent tke) {
@@ -78,11 +78,11 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
public void setTableId(Text tId) {
- wrapped.setTableId(tId);
+ wrapped.setTableId(tId.toString());
}
public Text getTableId() {
- return wrapped.getTableId();
+ return new Text(wrapped.getTableId());
}
public void setEndRow(Text endRow) {
@@ -189,7 +189,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
private static KeyExtent wrap(org.apache.accumulo.core.data.impl.KeyExtent ke) {
- return new KeyExtent(ke.getTableId(), ke.getEndRow(), ke.getPrevEndRow());
+ return new KeyExtent(new Text(ke.getTableId()), ke.getEndRow(), ke.getPrevEndRow());
}
private static SortedSet<KeyExtent> wrap(Collection<org.apache.accumulo.core.data.impl.KeyExtent> unwrapped) {
@@ -202,7 +202,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
public static Text getMetadataEntry(Text tableId, Text endRow) {
- return MetadataSchema.TabletsSection.getRow(tableId, endRow);
+ return MetadataSchema.TabletsSection.getRow(tableId.toString(), endRow);
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
index d2ae00b..6cfacb3 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/impl/KeyExtent.java
@@ -16,12 +16,15 @@
*/
package org.apache.accumulo.core.data.impl;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.lang.ref.WeakReference;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -55,25 +58,24 @@ import org.apache.hadoop.io.WritableComparable;
public class KeyExtent implements WritableComparable<KeyExtent> {
- private static final WeakHashMap<Text,WeakReference<Text>> tableIds = new WeakHashMap<Text,WeakReference<Text>>();
+ private static final WeakHashMap<String,WeakReference<String>> tableIds = new WeakHashMap<>();
- private static Text dedupeTableId(Text tableId) {
+ private static String dedupeTableId(String tableId) {
synchronized (tableIds) {
- WeakReference<Text> etir = tableIds.get(tableId);
+ WeakReference<String> etir = tableIds.get(tableId);
if (etir != null) {
- Text eti = etir.get();
+ String eti = etir.get();
if (eti != null) {
return eti;
}
}
- tableId = new Text(tableId);
- tableIds.put(tableId, new WeakReference<Text>(tableId));
+ tableIds.put(tableId, new WeakReference<>(tableId));
return tableId;
}
}
- private Text textTableId;
+ private String tableId;
private Text textEndRow;
private Text textPrevEndRow;
@@ -95,12 +97,12 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
*
*/
public KeyExtent() {
- this.setTableId(new Text());
+ this.setTableId("");
this.setEndRow(new Text(), false, false);
this.setPrevEndRow(new Text(), false, false);
}
- public KeyExtent(Text table, Text endRow, Text prevEndRow) {
+ public KeyExtent(String table, Text endRow, Text prevEndRow) {
this.setTableId(table);
this.setEndRow(endRow, false, true);
this.setPrevEndRow(prevEndRow, false, true);
@@ -110,7 +112,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
public KeyExtent(KeyExtent extent) {
// extent has already deduped table id, so there is no need to do it again
- this.textTableId = extent.textTableId;
+ this.tableId = extent.tableId;
this.setEndRow(extent.getEndRow(), false, true);
this.setPrevEndRow(extent.getPrevEndRow(), false, true);
@@ -118,7 +120,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
public KeyExtent(TKeyExtent tke) {
- this.setTableId(new Text(ByteBufferUtil.toBytes(tke.table)));
+ this.setTableId(dedupeTableId(new String(ByteBufferUtil.toBytes(tke.table), UTF_8)));
this.setEndRow(tke.endRow == null ? null : new Text(ByteBufferUtil.toBytes(tke.endRow)), false, false);
this.setPrevEndRow(tke.prevEndRow == null ? null : new Text(ByteBufferUtil.toBytes(tke.prevEndRow)), false, false);
@@ -133,7 +135,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
return getMetadataEntry(getTableId(), getEndRow());
}
- public static Text getMetadataEntry(Text tableId, Text endRow) {
+ public static Text getMetadataEntry(String tableId, Text endRow) {
return MetadataSchema.TabletsSection.getRow(tableId, endRow);
}
@@ -164,12 +166,12 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
* Sets the extents table id
*
*/
- public void setTableId(Text tId) {
+ public void setTableId(String tId) {
if (tId == null)
throw new IllegalArgumentException("null table name not allowed");
- this.textTableId = dedupeTableId(tId);
+ this.tableId = dedupeTableId(tId);
hashCode = 0;
}
@@ -178,8 +180,8 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
* Returns the extent's table id
*
*/
- public Text getTableId() {
- return textTableId;
+ public String getTableId() {
+ return tableId;
}
private void setEndRow(Text endRow, boolean check, boolean copy) {
@@ -246,7 +248,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
public void readFields(DataInput in) throws IOException {
Text tid = new Text();
tid.readFields(in);
- setTableId(tid);
+ setTableId(tid.toString());
boolean hasRow = in.readBoolean();
if (hasRow) {
Text er = new Text();
@@ -270,7 +272,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
@Override
public void write(DataOutput out) throws IOException {
- getTableId().write(out);
+ new Text(getTableId()).write(out);
if (getEndRow() != null) {
out.writeBoolean(true);
getEndRow().write(out);
@@ -453,14 +455,14 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
if (!(o instanceof KeyExtent))
return false;
KeyExtent oke = (KeyExtent) o;
- return textTableId.equals(oke.textTableId) && equals(textEndRow, oke.textEndRow) && equals(textPrevEndRow, oke.textPrevEndRow);
+ return tableId.equals(oke.tableId) && equals(textEndRow, oke.textEndRow) && equals(textPrevEndRow, oke.textPrevEndRow);
}
@Override
public String toString() {
String endRowString;
String prevEndRowString;
- String tableIdString = getTableId().toString().replaceAll(";", "\\\\;").replaceAll("\\\\", "\\\\\\\\");
+ String tableIdString = getTableId().replaceAll(";", "\\\\;").replaceAll("\\\\", "\\\\\\\\");
if (getEndRow() == null)
endRowString = "<";
@@ -526,14 +528,12 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
throw new IllegalArgumentException("< must come at end of Metadata row " + flattenedExtent);
}
- Text tableId = new Text();
- tableId.set(flattenedExtent.getBytes(), 0, flattenedExtent.getLength() - 1);
+ String tableId = new String(flattenedExtent.getBytes(), 0, flattenedExtent.getLength() - 1, UTF_8);
this.setTableId(tableId);
this.setEndRow(null, false, false);
} else {
- Text tableId = new Text();
- tableId.set(flattenedExtent.getBytes(), 0, semiPos);
+ String tableId = new String(flattenedExtent.getBytes(), 0, semiPos, UTF_8);
Text endRow = new Text();
endRow.set(flattenedExtent.getBytes(), semiPos + 1, flattenedExtent.getLength() - (semiPos + 1));
@@ -547,7 +547,7 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
public static byte[] tableOfMetadataRow(Text row) {
KeyExtent ke = new KeyExtent();
ke.decodeMetadataRow(row);
- return TextUtil.getBytes(ke.getTableId());
+ return ke.getTableId().getBytes(UTF_8);
}
public boolean contains(final ByteSequence bsrow) {
@@ -738,8 +738,8 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
public TKeyExtent toThrift() {
- return new TKeyExtent(TextUtil.getByteBuffer(textTableId), textEndRow == null ? null : TextUtil.getByteBuffer(textEndRow), textPrevEndRow == null ? null
- : TextUtil.getByteBuffer(textPrevEndRow));
+ return new TKeyExtent(ByteBuffer.wrap(tableId.getBytes(UTF_8)), textEndRow == null ? null : TextUtil.getByteBuffer(textEndRow),
+ textPrevEndRow == null ? null : TextUtil.getByteBuffer(textPrevEndRow));
}
public boolean isPreviousExtent(KeyExtent prevExtent) {
@@ -759,10 +759,10 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
}
public boolean isMeta() {
- return getTableId().toString().equals(MetadataTable.ID) || isRootTablet();
+ return getTableId().equals(MetadataTable.ID) || isRootTablet();
}
public boolean isRootTablet() {
- return getTableId().toString().equals(RootTable.ID);
+ return getTableId().equals(RootTable.ID);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java b/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
index 41ff3f5..24a7141 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/impl/TabletIdImpl.java
@@ -53,7 +53,7 @@ public class TabletIdImpl implements TabletId {
@Deprecated
public TabletIdImpl(org.apache.accumulo.core.data.KeyExtent ke) {
- this.ke = new KeyExtent(ke.getTableId(), ke.getEndRow(), ke.getPrevEndRow());
+ this.ke = new KeyExtent(ke.getTableId().toString(), ke.getEndRow(), ke.getPrevEndRow());
}
public TabletIdImpl(KeyExtent ke) {
@@ -67,7 +67,7 @@ public class TabletIdImpl implements TabletId {
@Override
public Text getTableId() {
- return ke.getTableId();
+ return new Text(ke.getTableId());
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java b/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
index 97d73d1..2052563 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/RootTable.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.metadata;
import org.apache.accumulo.core.client.impl.Namespaces;
import org.apache.accumulo.core.data.impl.KeyExtent;
-import org.apache.hadoop.io.Text;
/**
*
@@ -44,7 +43,7 @@ public class RootTable {
public static final String ZROOT_TABLET_CURRENT_LOGS = ZROOT_TABLET + "/current_logs";
public static final String ZROOT_TABLET_PATH = ZROOT_TABLET + "/dir";
- public static final KeyExtent EXTENT = new KeyExtent(new Text(ID), null, null);
- public static final KeyExtent OLD_EXTENT = new KeyExtent(new Text(MetadataTable.ID), KeyExtent.getMetadataEntry(new Text(MetadataTable.ID), null), null);
+ public static final KeyExtent EXTENT = new KeyExtent(ID, null, null);
+ public static final KeyExtent OLD_EXTENT = new KeyExtent(MetadataTable.ID, KeyExtent.getMetadataEntry(MetadataTable.ID, null), null);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
index 8c2bde5..7426fed 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
@@ -49,7 +49,7 @@ public class MetadataSchema {
return new Range(new Key(tableId + ';'), true, new Key(tableId + '<').followingKey(PartialKey.ROW), false);
}
- public static Text getRow(Text tableId, Text endRow) {
+ public static Text getRow(String tableId, Text endRow) {
Text entry = new Text(tableId);
if (endRow == null) {
@@ -247,18 +247,14 @@ public class MetadataSchema {
}
/**
- * Extract the table ID from the colfam into the given {@link Text}
+ * Extract the table ID from the colfam
*
* @param k
* Key to extract from
- * @param buff
- * Text to place table ID into
*/
- public static void getTableId(Key k, Text buff) {
+ public static String getTableId(Key k) {
requireNonNull(k);
- requireNonNull(buff);
-
- k.getColumnQualifier(buff);
+ return k.getColumnQualifier().toString();
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
index 7e7ae38..94d19b5 100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/ReplicationSchema.java
@@ -95,27 +95,10 @@ public class ReplicationSchema {
* @param k
* Key to extract from
* @return The table ID
- * @see #getTableId(Key,Text)
*/
public static String getTableId(Key k) {
- Text buff = new Text();
- getTableId(k, buff);
- return buff.toString();
- }
-
- /**
- * Extract the table ID from the key into the given {@link Text}
- *
- * @param k
- * Key to extract from
- * @param buff
- * Text to place table ID into
- */
- public static void getTableId(Key k, Text buff) {
requireNonNull(k);
- requireNonNull(buff);
-
- k.getColumnQualifier(buff);
+ return k.getColumnQualifier().toString();
}
/**
@@ -141,8 +124,8 @@ public class ReplicationSchema {
scanner.fetchColumnFamily(NAME);
}
- public static Mutation add(Mutation m, Text tableId, Value v) {
- m.put(NAME, tableId, v);
+ public static Mutation add(Mutation m, String tableId, Value v) {
+ m.put(NAME, new Text(tableId), v);
return m;
}
}
@@ -234,8 +217,8 @@ public class ReplicationSchema {
* Serialized Status msg
* @return The original Mutation
*/
- public static Mutation add(Mutation m, Text tableId, Value v) {
- m.put(NAME, tableId, v);
+ public static Mutation add(Mutation m, String tableId, Value v) {
+ m.put(NAME, new Text(tableId), v);
return m;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/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 9f6f6ab..71f8325 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
@@ -212,7 +212,7 @@ public class Merge {
} catch (Exception e) {
throw new MergeException(e);
}
- scanner.setRange(new KeyExtent(new Text(tableId), end, start).toMetadataRange());
+ scanner.setRange(new KeyExtent(tableId, end, start).toMetadataRange());
scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
final Iterator<Entry<Key,Value>> iterator = scanner.iterator();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
index 7351ede..825060b 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TableOperationsImplTest.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.hadoop.io.Text;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -45,7 +44,7 @@ public class TableOperationsImplTest {
Connector connector = EasyMock.createMock(Connector.class);
Scanner scanner = EasyMock.createMock(Scanner.class);
- Range range = new KeyExtent(new Text("1"), null, null).toMetadataRange();
+ Range range = new KeyExtent("1", null, null).toMetadataRange();
String user = "root";
PasswordToken token = new PasswordToken("password");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
index 2e78bd8..a053cef 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
@@ -63,10 +63,10 @@ import org.junit.Test;
public class TabletLocatorImplTest {
private static final KeyExtent RTE = RootTable.EXTENT;
- private static final KeyExtent MTE = new KeyExtent(new Text(MetadataTable.ID), null, RTE.getEndRow());
+ private static final KeyExtent MTE = new KeyExtent(MetadataTable.ID, null, RTE.getEndRow());
static KeyExtent nke(String t, String er, String per) {
- return new KeyExtent(new Text(t), er == null ? null : new Text(er), per == null ? null : new Text(per));
+ return new KeyExtent(t, er == null ? null : new Text(er), per == null ? null : new Text(per));
}
static Range nr(String k1, boolean si, String k2, boolean ei) {
@@ -143,8 +143,8 @@ public class TabletLocatorImplTest {
TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
RootTabletLocator rtl = new TestRootTabletLocator();
- TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
- TabletLocatorImpl tab1TabletCache = new TabletLocatorImpl(new Text(table), rootTabletCache, ttlo, tslc);
+ TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(MetadataTable.ID, rtl, ttlo, new YesLockChecker());
+ TabletLocatorImpl tab1TabletCache = new TabletLocatorImpl(table, rootTabletCache, ttlo, tslc);
setLocation(tservers, rootTabLoc, RTE, MTE, metaTabLoc);
@@ -692,8 +692,8 @@ public class TabletLocatorImplTest {
TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
RootTabletLocator rtl = new TestRootTabletLocator();
- TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
- TabletLocatorImpl tab1TabletCache = new TabletLocatorImpl(new Text("tab1"), rootTabletCache, ttlo, new YesLockChecker());
+ TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(MetadataTable.ID, rtl, ttlo, new YesLockChecker());
+ TabletLocatorImpl tab1TabletCache = new TabletLocatorImpl("tab1", rootTabletCache, ttlo, new YesLockChecker());
locateTabletTest(tab1TabletCache, "r1", null, null);
@@ -770,8 +770,8 @@ public class TabletLocatorImplTest {
locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver3");
// simulate the metadata table splitting
- KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), tab1e21.getMetadataEntry(), RTE.getEndRow());
- KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), null, tab1e21.getMetadataEntry());
+ KeyExtent mte1 = new KeyExtent(MetadataTable.ID, tab1e21.getMetadataEntry(), RTE.getEndRow());
+ KeyExtent mte2 = new KeyExtent(MetadataTable.ID, null, tab1e21.getMetadataEntry());
setLocation(tservers, "tserver4", RTE, mte1, "tserver5");
setLocation(tservers, "tserver4", RTE, mte2, "tserver6");
@@ -809,8 +809,8 @@ public class TabletLocatorImplTest {
locateTabletTest(tab1TabletCache, "r", tab1e22, "tserver9");
// simulate a hole in the metadata, caused by a partial split
- KeyExtent mte11 = new KeyExtent(new Text(MetadataTable.ID), tab1e1.getMetadataEntry(), RTE.getEndRow());
- KeyExtent mte12 = new KeyExtent(new Text(MetadataTable.ID), tab1e21.getMetadataEntry(), tab1e1.getMetadataEntry());
+ KeyExtent mte11 = new KeyExtent(MetadataTable.ID, tab1e1.getMetadataEntry(), RTE.getEndRow());
+ KeyExtent mte12 = new KeyExtent(MetadataTable.ID, tab1e21.getMetadataEntry(), tab1e1.getMetadataEntry());
deleteServer(tservers, "tserver10");
setLocation(tservers, "tserver4", RTE, mte12, "tserver10");
setLocation(tservers, "tserver10", mte12, tab1e21, "tserver12");
@@ -1228,22 +1228,22 @@ public class TabletLocatorImplTest {
@Test
public void testBug1() throws Exception {
// a bug that occurred while running continuous ingest
- KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), new Text("0;0bc"), RTE.getEndRow());
- KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), null, new Text("0;0bc"));
+ KeyExtent mte1 = new KeyExtent(MetadataTable.ID, new Text("0;0bc"), RTE.getEndRow());
+ KeyExtent mte2 = new KeyExtent(MetadataTable.ID, null, new Text("0;0bc"));
TServers tservers = new TServers();
TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
RootTabletLocator rtl = new TestRootTabletLocator();
- TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
- TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl(new Text("0"), rootTabletCache, ttlo, new YesLockChecker());
+ TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(MetadataTable.ID, rtl, ttlo, new YesLockChecker());
+ TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl("0", rootTabletCache, ttlo, new YesLockChecker());
setLocation(tservers, "tserver1", RTE, mte1, "tserver2");
setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
// create two tablets that straddle a metadata split point
- KeyExtent ke1 = new KeyExtent(new Text("0"), new Text("0bbf20e"), null);
- KeyExtent ke2 = new KeyExtent(new Text("0"), new Text("0bc0756"), new Text("0bbf20e"));
+ KeyExtent ke1 = new KeyExtent("0", new Text("0bbf20e"), null);
+ KeyExtent ke2 = new KeyExtent("0", new Text("0bc0756"), new Text("0bbf20e"));
setLocation(tservers, "tserver2", mte1, ke1, "tserver4");
setLocation(tservers, "tserver3", mte2, ke2, "tserver5");
@@ -1255,15 +1255,15 @@ public class TabletLocatorImplTest {
@Test
public void testBug2() throws Exception {
// a bug that occurred while running a functional test
- KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), new Text("~"), RTE.getEndRow());
- KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), null, new Text("~"));
+ KeyExtent mte1 = new KeyExtent(MetadataTable.ID, new Text("~"), RTE.getEndRow());
+ KeyExtent mte2 = new KeyExtent(MetadataTable.ID, null, new Text("~"));
TServers tservers = new TServers();
TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
RootTabletLocator rtl = new TestRootTabletLocator();
- TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
- TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl(new Text("0"), rootTabletCache, ttlo, new YesLockChecker());
+ TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(MetadataTable.ID, rtl, ttlo, new YesLockChecker());
+ TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl("0", rootTabletCache, ttlo, new YesLockChecker());
setLocation(tservers, "tserver1", RTE, mte1, "tserver2");
setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
@@ -1280,21 +1280,21 @@ public class TabletLocatorImplTest {
// this test reproduces a problem where empty metadata tablets, that were created by user tablets being merged away, caused locating tablets to fail
@Test
public void testBug3() throws Exception {
- KeyExtent mte1 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;c"), RTE.getEndRow());
- KeyExtent mte2 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;f"), new Text("1;c"));
- KeyExtent mte3 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;j"), new Text("1;f"));
- KeyExtent mte4 = new KeyExtent(new Text(MetadataTable.ID), new Text("1;r"), new Text("1;j"));
- KeyExtent mte5 = new KeyExtent(new Text(MetadataTable.ID), null, new Text("1;r"));
+ KeyExtent mte1 = new KeyExtent(MetadataTable.ID, new Text("1;c"), RTE.getEndRow());
+ KeyExtent mte2 = new KeyExtent(MetadataTable.ID, new Text("1;f"), new Text("1;c"));
+ KeyExtent mte3 = new KeyExtent(MetadataTable.ID, new Text("1;j"), new Text("1;f"));
+ KeyExtent mte4 = new KeyExtent(MetadataTable.ID, new Text("1;r"), new Text("1;j"));
+ KeyExtent mte5 = new KeyExtent(MetadataTable.ID, null, new Text("1;r"));
- KeyExtent ke1 = new KeyExtent(new Text("1"), null, null);
+ KeyExtent ke1 = new KeyExtent("1", null, null);
TServers tservers = new TServers();
TestTabletLocationObtainer ttlo = new TestTabletLocationObtainer(tservers);
RootTabletLocator rtl = new TestRootTabletLocator();
- TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(new Text(MetadataTable.ID), rtl, ttlo, new YesLockChecker());
- TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl(new Text("1"), rootTabletCache, ttlo, new YesLockChecker());
+ TabletLocatorImpl rootTabletCache = new TabletLocatorImpl(MetadataTable.ID, rtl, ttlo, new YesLockChecker());
+ TabletLocatorImpl tab0TabletCache = new TabletLocatorImpl("1", rootTabletCache, ttlo, new YesLockChecker());
setLocation(tservers, "tserver1", RTE, mte1, "tserver2");
setLocation(tservers, "tserver1", RTE, mte2, "tserver3");
[4/5] accumulo git commit: ACCUMULO-4145 Eliminate Text wrapping of
tableIDs
Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index b1ac1c5..724bfee 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
public class KeyExtentTest {
KeyExtent nke(String t, String er, String per) {
- return new KeyExtent(new Text(t), er == null ? null : new Text(er), per == null ? null : new Text(per));
+ return new KeyExtent(t, er == null ? null : new Text(er), per == null ? null : new Text(per));
}
KeyExtent ke;
@@ -62,7 +62,7 @@ public class KeyExtentTest {
ke = new KeyExtent(flattenedExtent, (Text) null);
assertEquals(new Text("bar"), ke.getEndRow());
- assertEquals(new Text("foo"), ke.getTableId());
+ assertEquals("foo", ke.getTableId());
assertNull(ke.getPrevEndRow());
flattenedExtent = new Text("foo<");
@@ -70,7 +70,7 @@ public class KeyExtentTest {
ke = new KeyExtent(flattenedExtent, (Text) null);
assertNull(ke.getEndRow());
- assertEquals(new Text("foo"), ke.getTableId());
+ assertEquals("foo", ke.getTableId());
assertNull(ke.getPrevEndRow());
flattenedExtent = new Text("foo;bar;");
@@ -78,7 +78,7 @@ public class KeyExtentTest {
ke = new KeyExtent(flattenedExtent, (Text) null);
assertEquals(new Text("bar;"), ke.getEndRow());
- assertEquals(new Text("foo"), ke.getTableId());
+ assertEquals("foo", ke.getTableId());
assertNull(ke.getPrevEndRow());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index 1e5e985..2641ef1 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@ -191,31 +191,30 @@ public class RangeTest extends TestCase {
public void testMergeOverlapping22() {
- Range ke1 = new KeyExtent(new Text("tab1"), new Text("Bank"), null).toMetadataRange();
- Range ke2 = new KeyExtent(new Text("tab1"), new Text("Fails"), new Text("Bank")).toMetadataRange();
- Range ke3 = new KeyExtent(new Text("tab1"), new Text("Sam"), new Text("Fails")).toMetadataRange();
- Range ke4 = new KeyExtent(new Text("tab1"), new Text("bails"), new Text("Sam")).toMetadataRange();
- Range ke5 = new KeyExtent(new Text("tab1"), null, new Text("bails")).toMetadataRange();
+ Range ke1 = new KeyExtent("tab1", new Text("Bank"), null).toMetadataRange();
+ Range ke2 = new KeyExtent("tab1", new Text("Fails"), new Text("Bank")).toMetadataRange();
+ Range ke3 = new KeyExtent("tab1", new Text("Sam"), new Text("Fails")).toMetadataRange();
+ Range ke4 = new KeyExtent("tab1", new Text("bails"), new Text("Sam")).toMetadataRange();
+ Range ke5 = new KeyExtent("tab1", null, new Text("bails")).toMetadataRange();
List<Range> rl = nrl(ke1, ke2, ke3, ke4, ke5);
- List<Range> expected = nrl(new KeyExtent(new Text("tab1"), null, null).toMetadataRange());
+ List<Range> expected = nrl(new KeyExtent("tab1", null, null).toMetadataRange());
check(Range.mergeOverlapping(rl), expected);
rl = nrl(ke1, ke2, ke4, ke5);
- expected = nrl(new KeyExtent(new Text("tab1"), new Text("Fails"), null).toMetadataRange(),
- new KeyExtent(new Text("tab1"), null, new Text("Sam")).toMetadataRange());
+ expected = nrl(new KeyExtent("tab1", new Text("Fails"), null).toMetadataRange(), new KeyExtent("tab1", null, new Text("Sam")).toMetadataRange());
check(Range.mergeOverlapping(rl), expected);
rl = nrl(ke2, ke3, ke4, ke5);
- expected = nrl(new KeyExtent(new Text("tab1"), null, new Text("Bank")).toMetadataRange());
+ expected = nrl(new KeyExtent("tab1", null, new Text("Bank")).toMetadataRange());
check(Range.mergeOverlapping(rl), expected);
rl = nrl(ke1, ke2, ke3, ke4);
- expected = nrl(new KeyExtent(new Text("tab1"), new Text("bails"), null).toMetadataRange());
+ expected = nrl(new KeyExtent("tab1", new Text("bails"), null).toMetadataRange());
check(Range.mergeOverlapping(rl), expected);
rl = nrl(ke2, ke3, ke4);
- expected = nrl(new KeyExtent(new Text("tab1"), new Text("bails"), new Text("Bank")).toMetadataRange());
+ expected = nrl(new KeyExtent("tab1", new Text("bails"), new Text("Bank")).toMetadataRange());
check(Range.mergeOverlapping(rl), expected);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
index ab98f49..a442347 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
@@ -2132,7 +2132,7 @@ public class RFileTest {
// mfw.startDefaultLocalityGroup();
- Text tableExtent = new Text(KeyExtent.getMetadataEntry(new Text(MetadataTable.ID), MetadataSchema.TabletsSection.getRange().getEndKey().getRow()));
+ Text tableExtent = new Text(KeyExtent.getMetadataEntry(MetadataTable.ID, MetadataSchema.TabletsSection.getRange().getEndKey().getRow()));
// table tablet's directory
Key tableDirKey = new Key(tableExtent, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily(),
@@ -2150,7 +2150,7 @@ public class RFileTest {
mfw.append(tablePrevRowKey, KeyExtent.encodePrevEndRow(null));
// ----------] default tablet info
- Text defaultExtent = new Text(KeyExtent.getMetadataEntry(new Text(MetadataTable.ID), null));
+ Text defaultExtent = new Text(KeyExtent.getMetadataEntry(MetadataTable.ID, null));
// default's directory
Key defaultDirKey = new Key(defaultExtent, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily(),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
index 87ad392..4c4303c 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
@@ -40,7 +40,6 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.system.MultiIteratorTest;
import org.apache.accumulo.core.iterators.user.AgeOffFilter;
import org.apache.accumulo.core.iterators.user.SummingCombiner;
-import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
@@ -139,7 +138,7 @@ public class IteratorUtilTest {
SortedMapIterator source = new SortedMapIterator(tm);
- SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent(new Text("tab"), null, null), conf,
+ SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent("tab", null, null), conf,
new DefaultIteratorEnvironment(conf));
iter.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -171,7 +170,7 @@ public class IteratorUtilTest {
SortedMapIterator source = new SortedMapIterator(tm);
- SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.majc, source, new KeyExtent(new Text("tab"), null, null), conf,
+ SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.majc, source, new KeyExtent("tab", null, null), conf,
new DefaultIteratorEnvironment(conf));
iter.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -207,7 +206,7 @@ public class IteratorUtilTest {
conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".addIter", "2," + AddingIter.class.getName());
conf.set(Property.TABLE_ITERATOR_PREFIX + IteratorScope.minc.name() + ".sqIter", "1," + SquaringIter.class.getName());
- SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent(new Text("tab"), null, null), conf,
+ SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent("tab", null, null), conf,
new DefaultIteratorEnvironment(conf));
iter.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -243,7 +242,7 @@ public class IteratorUtilTest {
SortedMapIterator source = new SortedMapIterator(tm);
- SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent(new Text("tab"), null, null), conf,
+ SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent("tab", null, null), conf,
new DefaultIteratorEnvironment(conf));
iter.seek(new Range(), EMPTY_COL_FAMS, false);
@@ -279,7 +278,7 @@ public class IteratorUtilTest {
SortedMapIterator source = new SortedMapIterator(tm);
- SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent(new Text("tab"), null, null), conf,
+ SortedKeyValueIterator<Key,Value> iter = IteratorUtil.loadIterators(IteratorScope.minc, source, new KeyExtent("tab", null, null), conf,
new DefaultIteratorEnvironment(conf));
iter.seek(new Range(), EMPTY_COL_FAMS, false);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
index 3fbf92d..bbf87e5 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
@@ -22,8 +22,6 @@ import java.util.Collection;
import java.util.List;
import java.util.TreeMap;
-import junit.framework.TestCase;
-
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
@@ -34,6 +32,8 @@ import org.apache.accumulo.core.iterators.SortedMapIterator;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.hadoop.io.Text;
+import junit.framework.TestCase;
+
public class MultiIteratorTest extends TestCase {
private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
@@ -344,7 +344,7 @@ public class MultiIteratorTest extends TestCase {
List<SortedKeyValueIterator<Key,Value>> skvil = new ArrayList<SortedKeyValueIterator<Key,Value>>(1);
skvil.add(new SortedMapIterator(tm1));
- KeyExtent extent = new KeyExtent(new Text("tablename"), nr(1), nr(0));
+ KeyExtent extent = new KeyExtent("tablename", nr(1), nr(0));
MultiIterator mi = new MultiIterator(skvil, extent);
Range r1 = new Range((Text) null, (Text) null);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
index c060917..6d87005 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationConfigurationUtilTest.java
@@ -46,39 +46,39 @@ public class ReplicationConfigurationUtilTest {
@Test
public void rootTableExtent() {
- KeyExtent extent = new KeyExtent(new Text(RootTable.ID), null, null);
+ KeyExtent extent = new KeyExtent(RootTable.ID, null, null);
Assert.assertFalse("The root table should never be replicated", ReplicationConfigurationUtil.isEnabled(extent, conf));
}
@Test
public void metadataTableExtent() {
- KeyExtent extent = new KeyExtent(new Text(MetadataTable.ID), null, null);
+ KeyExtent extent = new KeyExtent(MetadataTable.ID, null, null);
Assert.assertFalse("The metadata table should never be replicated", ReplicationConfigurationUtil.isEnabled(extent, conf));
}
@Test
public void rootTableExtentEmptyConf() {
- KeyExtent extent = new KeyExtent(new Text(RootTable.ID), null, null);
+ KeyExtent extent = new KeyExtent(RootTable.ID, null, null);
Assert.assertFalse("The root table should never be replicated",
ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
}
@Test
public void metadataTableExtentEmptyConf() {
- KeyExtent extent = new KeyExtent(new Text(MetadataTable.ID), null, null);
+ KeyExtent extent = new KeyExtent(MetadataTable.ID, null, null);
Assert.assertFalse("The metadata table should never be replicated",
ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
}
@Test
public void regularTable() {
- KeyExtent extent = new KeyExtent(new Text("1"), new Text("b"), new Text("a"));
+ KeyExtent extent = new KeyExtent("1", new Text("b"), new Text("a"));
Assert.assertTrue("Table should be replicated", ReplicationConfigurationUtil.isEnabled(extent, conf));
}
@Test
public void regularNonEnabledTable() {
- KeyExtent extent = new KeyExtent(new Text("1"), new Text("b"), new Text("a"));
+ KeyExtent extent = new KeyExtent("1", new Text("b"), new Text("a"));
Assert.assertFalse("Table should not be replicated", ReplicationConfigurationUtil.isEnabled(extent, new ConfigurationCopy(new HashMap<String,String>())));
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/replication/ReplicationSchemaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationSchemaTest.java b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationSchemaTest.java
index 3822641..ca5eaa4 100644
--- a/core/src/test/java/org/apache/accumulo/core/replication/ReplicationSchemaTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/replication/ReplicationSchemaTest.java
@@ -61,18 +61,16 @@ public class ReplicationSchemaTest {
@Test
public void extractTableId() {
- Text tableId = new Text("1");
- Key k = new Key(new Text("foo"), StatusSection.NAME, tableId);
- Assert.assertEquals(tableId.toString(), StatusSection.getTableId(k));
+ String tableId = "1";
+ Key k = new Key(new Text("foo"), StatusSection.NAME, new Text(tableId));
+ Assert.assertEquals(tableId, StatusSection.getTableId(k));
}
@Test
public void extractTableIdUsingText() {
- Text tableId = new Text("1");
- Key k = new Key(new Text("foo"), StatusSection.NAME, tableId);
- Text buffer = new Text();
- StatusSection.getTableId(k, buffer);
- Assert.assertEquals(tableId.toString(), buffer.toString());
+ String tableId = "1";
+ Key k = new Key(new Text("foo"), StatusSection.NAME, new Text(tableId));
+ Assert.assertEquals(tableId, StatusSection.getTableId(k));
}
@Test(expected = NullPointerException.class)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
index 5b0dc55..6fe240a 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
@@ -43,7 +43,7 @@ public class MergeTest {
end = null;
else
end = new Text(String.format("%05d", tablets.size()));
- KeyExtent extent = new KeyExtent(new Text("table"), end, start);
+ KeyExtent extent = new KeyExtent("table", end, start);
start = end;
tablets.add(new Size(extent, size));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/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 05a737f..610eb5c 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
@@ -158,10 +158,11 @@ public class RandomBatchWriter {
if (e.getSecurityErrorCodes().size() > 0) {
HashMap<String,Set<SecurityErrorCode>> tables = new HashMap<String,Set<SecurityErrorCode>>();
for (Entry<TabletId,Set<SecurityErrorCode>> ke : e.getSecurityErrorCodes().entrySet()) {
- Set<SecurityErrorCode> secCodes = tables.get(ke.getKey().getTableId().toString());
+ String tableId = ke.getKey().getTableId().toString();
+ Set<SecurityErrorCode> secCodes = tables.get(tableId);
if (secCodes == null) {
secCodes = new HashSet<SecurityErrorCode>();
- tables.put(ke.getKey().getTableId().toString(), secCodes);
+ tables.put(tableId, secCodes);
}
secCodes.addAll(ke.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index d0898f0..007619d 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -48,7 +48,7 @@ public class RowOperations {
private static final Logger log = LoggerFactory.getLogger(RowOperations.class);
private static Connector connector;
- private static String table = "example";
+ private static String tableName = "example";
private static BatchWriter bw;
public static void main(String[] args) throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException,
@@ -63,7 +63,7 @@ public class RowOperations {
connector = opts.getConnector();
// lets create an example table
- connector.tableOperations().create(table);
+ connector.tableOperations().create(tableName);
// lets create 3 rows of information
Text row1 = new Text("row1");
@@ -98,7 +98,7 @@ public class RowOperations {
mut3.put(new Text("column"), col4, System.currentTimeMillis(), new Value("This is the value for this key".getBytes(UTF_8)));
// Now we'll make a Batch Writer
- bw = connector.createBatchWriter(table, bwOpts.getBatchWriterConfig());
+ bw = connector.createBatchWriter(tableName, bwOpts.getBatchWriterConfig());
// And add the mutations
bw.addMutation(mut1);
@@ -160,7 +160,7 @@ public class RowOperations {
bw.close();
// and lets clean up our mess
- connector.tableOperations().delete(table);
+ connector.tableOperations().delete(tableName);
// fin~
@@ -204,7 +204,7 @@ public class RowOperations {
*/
private static Scanner getRow(ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
// Create a scanner
- Scanner scanner = connector.createScanner(table, Authorizations.EMPTY);
+ Scanner scanner = connector.createScanner(tableName, Authorizations.EMPTY);
scanner.setBatchSize(scanOpts.scanBatchSize);
// Say start key is the one with key of row
// and end key is the one that immediately follows the row
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/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 b535513..1005df4 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
@@ -225,7 +225,7 @@ public class TeraSortIngest extends Configured implements Tool {
* The Mapper class that given a row number, will generate the appropriate output line.
*/
public static class SortGenMapper extends Mapper<LongWritable,NullWritable,Text,Mutation> {
- private Text table = null;
+ private Text tableName = null;
private int minkeylength = 0;
private int maxkeylength = 0;
private int minvaluelength = 0;
@@ -329,7 +329,7 @@ public class TeraSortIngest extends Configured implements Tool {
new Value(value.toString().getBytes())); // data
context.setStatus("About to add to accumulo");
- context.write(table, m);
+ context.write(tableName, m);
context.setStatus("Added to accumulo " + key.toString());
}
@@ -339,7 +339,7 @@ public class TeraSortIngest extends Configured implements Tool {
maxkeylength = job.getConfiguration().getInt("cloudgen.maxkeylength", 0);
minvaluelength = job.getConfiguration().getInt("cloudgen.minvaluelength", 0);
maxvaluelength = job.getConfiguration().getInt("cloudgen.maxvaluelength", 0);
- table = new Text(job.getConfiguration().get("cloudgen.tablename"));
+ tableName = new Text(job.getConfiguration().get("cloudgen.tablename"));
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
index 00ec5a3..6f0ceac 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shard/ContinuousQuery.java
@@ -49,7 +49,7 @@ public class ContinuousQuery {
static class Opts extends ClientOpts {
@Parameter(names = "--shardTable", required = true, description = "name of the shard table")
- String table = null;
+ String tableName = null;
@Parameter(names = "--doc2Term", required = true, description = "name of the doc2Term table")
String doc2Term;
@Parameter(names = "--terms", required = true, description = "the number of terms in the query")
@@ -69,7 +69,7 @@ public class ContinuousQuery {
Random rand = new Random();
- BatchScanner bs = conn.createBatchScanner(opts.table, opts.auths, bsOpts.scanThreads);
+ BatchScanner bs = conn.createBatchScanner(opts.tableName, opts.auths, bsOpts.scanThreads);
bs.setTimeout(bsOpts.scanTimeout, TimeUnit.MILLISECONDS);
for (long i = 0; i < opts.iterations; i += 1) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
index 7b1bfde..2656d4b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
@@ -129,7 +129,7 @@ public class BulkImporter {
final Map<Path,List<KeyExtent>> completeFailures = Collections.synchronizedSortedMap(new TreeMap<Path,List<KeyExtent>>());
ClientService.Client client = null;
- final TabletLocator locator = TabletLocator.getLocator(context, new Text(tableId));
+ final TabletLocator locator = TabletLocator.getLocator(context, tableId);
try {
final Map<Path,List<TabletLocation>> assignments = Collections.synchronizedSortedMap(new TreeMap<Path,List<TabletLocation>>());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
index 6976bab..2995fc8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java
@@ -177,7 +177,7 @@ public class ServerConfigurationFactory extends ServerConfiguration {
@Override
public TableConfiguration getTableConfiguration(KeyExtent extent) {
- return getTableConfiguration(extent.getTableId().toString());
+ return getTableConfiguration(extent.getTableId());
}
public NamespaceConfiguration getNamespaceConfigurationForTable(String tableId) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index 915122b..d4712b9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -42,11 +42,11 @@ public class TableConfiguration extends ObservableConfiguration {
private final NamespaceConfiguration parent;
private ZooCacheFactory zcf = new ZooCacheFactory();
- private final String table;
+ private final String tableId;
- public TableConfiguration(Instance instance, String table, NamespaceConfiguration parent) {
+ public TableConfiguration(Instance instance, String tableId, NamespaceConfiguration parent) {
this.instance = instance;
- this.table = table;
+ this.tableId = tableId;
this.parent = parent;
}
@@ -57,7 +57,7 @@ public class TableConfiguration extends ObservableConfiguration {
private synchronized ZooCachePropertyAccessor getPropCacheAccessor() {
if (propCacheAccessor == null) {
synchronized (propCaches) {
- PropCacheKey key = new PropCacheKey(instance.getInstanceID(), table);
+ PropCacheKey key = new PropCacheKey(instance.getInstanceID(), tableId);
ZooCache propCache = propCaches.get(key);
if (propCache == null) {
propCache = zcf.getZooCache(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut(), new TableConfWatcher(instance));
@@ -71,7 +71,7 @@ public class TableConfiguration extends ObservableConfiguration {
@Override
public void addObserver(ConfigurationObserver co) {
- if (table == null) {
+ if (tableId == null) {
String err = "Attempt to add observer for non-table configuration";
log.error(err);
throw new RuntimeException(err);
@@ -82,7 +82,7 @@ public class TableConfiguration extends ObservableConfiguration {
@Override
public void removeObserver(ConfigurationObserver co) {
- if (table == null) {
+ if (tableId == null) {
String err = "Attempt to remove observer for non-table configuration";
log.error(err);
throw new RuntimeException(err);
@@ -91,7 +91,7 @@ public class TableConfiguration extends ObservableConfiguration {
}
private String getPath() {
- return ZooUtil.getRoot(instance.getInstanceID()) + Constants.ZTABLES + "/" + table + Constants.ZTABLE_CONF;
+ return ZooUtil.getRoot(instance.getInstanceID()) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_CONF;
}
@Override
@@ -105,7 +105,7 @@ public class TableConfiguration extends ObservableConfiguration {
}
public String getTableId() {
- return table;
+ return tableId;
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 427d2c9..0c3092b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -264,7 +264,7 @@ public class VolumeUtil {
throw new IllegalArgumentException("Unexpected table dir " + dir);
}
- Path newDir = new Path(vm.choose(Optional.of(extent.getTableId().toString()), ServerConstants.getBaseUris()) + Path.SEPARATOR + ServerConstants.TABLE_DIR
+ Path newDir = new Path(vm.choose(Optional.of(extent.getTableId()), ServerConstants.getBaseUris()) + Path.SEPARATOR + ServerConstants.TABLE_DIR
+ Path.SEPARATOR + dir.getParent().getName() + Path.SEPARATOR + dir.getName());
log.info("Updating directory for " + extent + " from " + dir + " to " + newDir);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 78fc66d..4378f2c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -477,7 +477,7 @@ public class Initialize implements KeywordExecutable {
private static void createEntriesForTablet(TreeMap<Key,Value> map, Tablet tablet) {
Value EMPTY_SIZE = new DataFileValue(0, 0).encodeAsValue();
- Text extent = new Text(KeyExtent.getMetadataEntry(new Text(tablet.tableId), tablet.endRow));
+ Text extent = new Text(KeyExtent.getMetadataEntry(tablet.tableId, tablet.endRow));
addEntry(map, extent, DIRECTORY_COLUMN, new Value(tablet.dir.getBytes(UTF_8)));
addEntry(map, extent, TIME_COLUMN, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(UTF_8)));
addEntry(map, extent, PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(tablet.prevEndRow));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
index 2ea8e71..b2b2ed5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/GroupBalancer.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.master.state.TabletMigration;
import org.apache.commons.lang.mutable.MutableInt;
-import org.apache.hadoop.io.Text;
import com.google.common.base.Function;
import com.google.common.collect.HashBasedTable;
@@ -72,7 +71,6 @@ import com.google.common.collect.Table;
public abstract class GroupBalancer extends TabletBalancer {
private final String tableId;
- private final Text textTableId;
private long lastRun = 0;
/**
@@ -82,7 +80,6 @@ public abstract class GroupBalancer extends TabletBalancer {
public GroupBalancer(String tableId) {
this.tableId = tableId;
- this.textTableId = new Text(tableId);
}
protected Iterable<Pair<KeyExtent,Location>> getLocationProvider() {
@@ -113,7 +110,7 @@ public abstract class GroupBalancer extends TabletBalancer {
}
for (KeyExtent keyExtent : migrations) {
- if (keyExtent.getTableId().equals(textTableId)) {
+ if (keyExtent.getTableId().equals(tableId)) {
return false;
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
index 7d76572..4bae545 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TableLoadBalancer.java
@@ -116,10 +116,10 @@ public class TableLoadBalancer extends TabletBalancer {
// separate the unassigned into tables
Map<String,Map<KeyExtent,TServerInstance>> groupedUnassigned = new HashMap<String,Map<KeyExtent,TServerInstance>>();
for (Entry<KeyExtent,TServerInstance> e : unassigned.entrySet()) {
- Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId().toString());
+ Map<KeyExtent,TServerInstance> tableUnassigned = groupedUnassigned.get(e.getKey().getTableId());
if (tableUnassigned == null) {
tableUnassigned = new HashMap<KeyExtent,TServerInstance>();
- groupedUnassigned.put(e.getKey().getTableId().toString(), tableUnassigned);
+ groupedUnassigned.put(e.getKey().getTableId(), tableUnassigned);
}
tableUnassigned.put(e.getKey(), e.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index 236b602..26d98a8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@ -42,7 +42,6 @@ import org.apache.accumulo.core.util.Base64;
import org.apache.accumulo.server.master.state.TabletLocationState.BadLocationStateException;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +60,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
private Set<TServerInstance> current;
private Set<String> onlineTables;
- private Map<Text,MergeInfo> merges;
+ private Map<String,MergeInfo> merges;
private boolean debug = false;
private Set<KeyExtent> migrations;
private MasterState masterState = MasterState.NORMAL;
@@ -133,11 +132,11 @@ public class TabletStateChangeIterator extends SkippingIterator {
return result;
}
- private Map<Text,MergeInfo> parseMerges(String merges) {
+ private Map<String,MergeInfo> parseMerges(String merges) {
if (merges == null)
return null;
try {
- Map<Text,MergeInfo> result = new HashMap<Text,MergeInfo>();
+ Map<String,MergeInfo> result = new HashMap<String,MergeInfo>();
DataInputBuffer buffer = new DataInputBuffer();
byte[] data = Base64.decodeBase64(merges.getBytes(UTF_8));
buffer.reset(data, data.length);
@@ -182,7 +181,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
}
// is the table supposed to be online or offline?
- boolean shouldBeOnline = onlineTables.contains(tls.extent.getTableId().toString());
+ boolean shouldBeOnline = onlineTables.contains(tls.extent.getTableId());
if (debug) {
log.debug(tls.extent + " is " + tls.getState(current) + " and should be " + (shouldBeOnline ? "on" : "off") + "line");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 4dc1eed..8685034 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@ -44,18 +44,18 @@ import org.apache.hadoop.io.Text;
import org.apache.zookeeper.KeeperException;
public class ProblemReport {
- private String tableName;
+ private String tableId;
private ProblemType problemType;
private String resource;
private String exception;
private String server;
private long creationTime;
- public ProblemReport(String table, ProblemType problemType, String resource, String server, Throwable e, long creationTime) {
- requireNonNull(table, "table is null");
+ public ProblemReport(String tableId, ProblemType problemType, String resource, String server, Throwable e, long creationTime) {
+ requireNonNull(tableId, "tableId is null");
requireNonNull(problemType, "problemType is null");
requireNonNull(resource, "resource is null");
- this.tableName = table;
+ this.tableId = tableId;
this.problemType = problemType;
this.resource = resource;
@@ -76,19 +76,19 @@ public class ProblemReport {
this.creationTime = creationTime;
}
- public ProblemReport(String table, ProblemType problemType, String resource, String server, Throwable e) {
- this(table, problemType, resource, server, e, System.currentTimeMillis());
+ public ProblemReport(String tableId, ProblemType problemType, String resource, String server, Throwable e) {
+ this(tableId, problemType, resource, server, e, System.currentTimeMillis());
}
- public ProblemReport(String table, ProblemType problemType, String resource, Throwable e) {
- this(table, problemType, resource, null, e);
+ public ProblemReport(String tableId, ProblemType problemType, String resource, Throwable e) {
+ this(tableId, problemType, resource, null, e);
}
private ProblemReport(String table, ProblemType problemType, String resource, byte enc[]) throws IOException {
requireNonNull(table, "table is null");
requireNonNull(problemType, "problemType is null");
requireNonNull(resource, "resource is null");
- this.tableName = table;
+ this.tableId = table;
this.problemType = problemType;
this.resource = resource;
@@ -137,13 +137,13 @@ public class ProblemReport {
}
void removeFromMetadataTable(AccumuloServerContext context) throws Exception {
- Mutation m = new Mutation(new Text("~err_" + tableName));
+ Mutation m = new Mutation(new Text("~err_" + tableId));
m.putDelete(new Text(problemType.name()), new Text(resource));
MetadataTableUtil.getMetadataTable(context).update(m);
}
void saveToMetadataTable(AccumuloServerContext context) throws Exception {
- Mutation m = new Mutation(new Text("~err_" + tableName));
+ Mutation m = new Mutation(new Text("~err_" + tableId));
m.put(new Text(problemType.name()), new Text(resource), new Value(encode()));
MetadataTableUtil.getMetadataTable(context).update(m);
}
@@ -188,27 +188,27 @@ public class ProblemReport {
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
DataInputStream dis = new DataInputStream(bais);
- String tableName = dis.readUTF();
+ String tableId = dis.readUTF();
String problemType = dis.readUTF();
String resource = dis.readUTF();
String zpath = ZooUtil.getRoot(instance) + Constants.ZPROBLEMS + "/" + node;
byte[] enc = zoorw.getData(zpath, null);
- return new ProblemReport(tableName, ProblemType.valueOf(problemType), resource, enc);
+ return new ProblemReport(tableId, ProblemType.valueOf(problemType), resource, enc);
}
public static ProblemReport decodeMetadataEntry(Entry<Key,Value> entry) throws IOException {
- String tableName = entry.getKey().getRow().toString().substring("~err_".length());
+ String tableId = entry.getKey().getRow().toString().substring("~err_".length());
String problemType = entry.getKey().getColumnFamily().toString();
String resource = entry.getKey().getColumnQualifier().toString();
- return new ProblemReport(tableName, ProblemType.valueOf(problemType), resource, entry.getValue().get());
+ return new ProblemReport(tableId, ProblemType.valueOf(problemType), resource, entry.getValue().get());
}
public String getTableName() {
- return tableName;
+ return tableId;
}
public ProblemType getProblemType() {
@@ -233,14 +233,14 @@ public class ProblemReport {
@Override
public int hashCode() {
- return tableName.hashCode() + problemType.hashCode() + resource.hashCode();
+ return tableId.hashCode() + problemType.hashCode() + resource.hashCode();
}
@Override
public boolean equals(Object o) {
if (o instanceof ProblemReport) {
ProblemReport opr = (ProblemReport) o;
- return tableName.equals(opr.tableName) && problemType.equals(opr.problemType) && resource.equals(opr.resource);
+ return tableId.equals(opr.tableId) && problemType.equals(opr.problemType) && resource.equals(opr.resource);
}
return false;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
index 349ed20..83b4615 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReportingIterator.java
@@ -35,13 +35,13 @@ public class ProblemReportingIterator implements InterruptibleIterator {
private boolean sawError = false;
private boolean continueOnError;
private String resource;
- private String table;
+ private String tableId;
private final AccumuloServerContext context;
- public ProblemReportingIterator(AccumuloServerContext context, String table, String resource, boolean continueOnError,
+ public ProblemReportingIterator(AccumuloServerContext context, String tableId, String resource, boolean continueOnError,
SortedKeyValueIterator<Key,Value> source) {
this.context = context;
- this.table = table;
+ this.tableId = tableId;
this.resource = resource;
this.continueOnError = continueOnError;
this.source = source;
@@ -49,7 +49,7 @@ public class ProblemReportingIterator implements InterruptibleIterator {
@Override
public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) {
- return new ProblemReportingIterator(context, table, resource, continueOnError, source.deepCopy(env));
+ return new ProblemReportingIterator(context, tableId, resource, continueOnError, source.deepCopy(env));
}
@Override
@@ -81,7 +81,7 @@ public class ProblemReportingIterator implements InterruptibleIterator {
source.next();
} catch (IOException ioe) {
sawError = true;
- ProblemReports.getInstance(context).report(new ProblemReport(table, ProblemType.FILE_READ, resource, ioe));
+ ProblemReports.getInstance(context).report(new ProblemReport(tableId, ProblemType.FILE_READ, resource, ioe));
if (!continueOnError) {
throw ioe;
}
@@ -98,7 +98,7 @@ public class ProblemReportingIterator implements InterruptibleIterator {
source.seek(range, columnFamilies, inclusive);
} catch (IOException ioe) {
sawError = true;
- ProblemReports.getInstance(context).report(new ProblemReport(table, ProblemType.FILE_READ, resource, ioe));
+ ProblemReports.getInstance(context).report(new ProblemReport(tableId, ProblemType.FILE_READ, resource, ioe));
if (!continueOnError) {
throw ioe;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index e49e1af..176b247 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -28,7 +28,6 @@ import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.server.conf.ServerConfiguration;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +51,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
// The fraction of memory that needs to be used before we begin flushing.
private double compactionThreshold;
private long maxObserved;
- private final HashMap<Text,Long> mincIdleThresholds = new HashMap<Text,Long>();
+ private final HashMap<String,Long> mincIdleThresholds = new HashMap<String,Long>();
private ServerConfiguration config = null;
private static class TabletInfo {
@@ -140,9 +139,9 @@ public class LargestFirstMemoryManager implements MemoryManager {
}
protected long getMinCIdleThreshold(KeyExtent extent) {
- Text tableId = extent.getTableId();
+ String tableId = extent.getTableId();
if (!mincIdleThresholds.containsKey(tableId))
- mincIdleThresholds.put(tableId, config.getTableConfiguration(tableId.toString()).getTimeInMillis(Property.TABLE_MINC_COMPACT_IDLETIME));
+ mincIdleThresholds.put(tableId, config.getTableConfiguration(tableId).getTimeInMillis(Property.TABLE_MINC_COMPACT_IDLETIME));
return mincIdleThresholds.get(tableId);
}
@@ -173,7 +172,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
// find the largest and most idle tablets
for (TabletState ts : tablets) {
// Make sure that the table still exists
- if (!tableExists(instance, ts.getExtent().getTableId().toString())) {
+ if (!tableExists(instance, ts.getExtent().getTableId())) {
log.trace("Ignoring extent for deleted table: {}", ts.getExtent());
continue;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index 9a8f6ed..d43ce92 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -105,7 +105,7 @@ public class Admin implements KeywordExecutable {
boolean fixFiles = false;
@Parameter(names = {"-t", "--table"}, description = "Table to check, if not set checks all tables")
- String table = null;
+ String tableName = null;
}
@Parameters(commandDescription = "stop the master")
@@ -147,7 +147,7 @@ public class Admin implements KeywordExecutable {
@Parameters(commandDescription = "redistribute tablet directories across the current volume list")
static class RandomizeVolumesCommand {
@Parameter(names = {"-t"}, description = "table to update", required = true)
- String table = null;
+ String tableName = null;
}
public static void main(String[] args) {
@@ -231,14 +231,14 @@ public class Admin implements KeywordExecutable {
rc = 4;
} else if (cl.getParsedCommand().equals("checkTablets")) {
System.out.println("\n*** Looking for offline tablets ***\n");
- if (FindOfflineTablets.findOffline(context, checkTabletsCommand.table) != 0)
+ if (FindOfflineTablets.findOffline(context, checkTabletsCommand.tableName) != 0)
rc = 5;
System.out.println("\n*** Looking for missing files ***\n");
- if (checkTabletsCommand.table == null) {
+ if (checkTabletsCommand.tableName == null) {
if (RemoveEntriesForMissingFiles.checkAllTables(context, checkTabletsCommand.fixFiles) != 0)
rc = 6;
} else {
- if (RemoveEntriesForMissingFiles.checkTable(context, checkTabletsCommand.table, checkTabletsCommand.fixFiles) != 0)
+ if (RemoveEntriesForMissingFiles.checkTable(context, checkTabletsCommand.tableName, checkTabletsCommand.fixFiles) != 0)
rc = 6;
}
@@ -249,7 +249,7 @@ public class Admin implements KeywordExecutable {
} else if (cl.getParsedCommand().equals("volumes")) {
ListVolumesUsed.listVolumes(context);
} else if (cl.getParsedCommand().equals("randomizeVolumes")) {
- rc = RandomizeVolumes.randomize(context.getConnector(), randomizeVolumesOpts.table);
+ rc = RandomizeVolumes.randomize(context.getConnector(), randomizeVolumesOpts.tableName);
} else {
everything = cl.getParsedCommand().equals("stopAll");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index b081a60..867cd67 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -112,7 +112,7 @@ public class CheckForMetadataProblems {
count++;
- String tableName = (new KeyExtent(entry.getKey().getRow(), (Text) null)).getTableId().toString();
+ String tableName = (new KeyExtent(entry.getKey().getRow(), (Text) null)).getTableId();
TreeSet<KeyExtent> tablets = tables.get(tableName);
if (tablets == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java b/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
index 1db53a4..98101ec 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
@@ -42,7 +42,6 @@ import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.server.master.state.TabletState;
import org.apache.accumulo.server.master.state.ZooTabletStateStore;
import org.apache.accumulo.server.tables.TableManager;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,7 +100,7 @@ public class FindOfflineTablets {
Range range = MetadataSchema.TabletsSection.getRange();
if (tableName != null) {
String tableId = Tables.getTableId(context.getInstance(), tableName);
- range = new KeyExtent(new Text(tableId), null, null).toMetadataRange();
+ range = new KeyExtent(tableId, null, null).toMetadataRange();
}
MetaDataTableScanner metaScanner = new MetaDataTableScanner(context, range, MetadataTable.NAME);
@@ -118,8 +117,7 @@ public class FindOfflineTablets {
while (scanner.hasNext() && !System.out.checkError()) {
TabletLocationState locationState = scanner.next();
TabletState state = locationState.getState(tservers.getCurrentServers());
- if (state != null && state != TabletState.HOSTED
- && TableManager.getInstance().getTableState(locationState.extent.getTableId().toString()) != TableState.OFFLINE) {
+ if (state != null && state != TabletState.HOSTED && TableManager.getInstance().getTableState(locationState.extent.getTableId()) != TableState.OFFLINE) {
System.out.println(locationState + " is " + state + " #walogs:" + locationState.walogs.size());
offline++;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index 5d84ee4..b9e52e3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -136,12 +136,12 @@ public class MasterMetadataUtil {
Text metadataPrevEndRow = KeyExtent.decodePrevEndRow(prevEndRowIBW);
- Text table = (new KeyExtent(metadataEntry, (Text) null)).getTableId();
+ String table = (new KeyExtent(metadataEntry, (Text) null)).getTableId();
return fixSplit(context, table, metadataEntry, metadataPrevEndRow, oper, splitRatio, tserver, time.toString(), initFlushID, initCompactID, lock);
}
- private static KeyExtent fixSplit(ClientContext context, Text table, Text metadataEntry, Text metadataPrevEndRow, Value oper, double splitRatio,
+ private static KeyExtent fixSplit(ClientContext context, String table, Text metadataEntry, Text metadataPrevEndRow, Value oper, double splitRatio,
TServerInstance tserver, String time, long initFlushID, long initCompactID, ZooLock lock) throws AccumuloException, IOException {
if (metadataPrevEndRow == null)
// something is wrong, this should not happen... if a tablet is split, it will always have a
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 4b88c5b..5081a9c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -343,7 +343,7 @@ public class MetadataTableUtil {
public static void addDeleteEntries(KeyExtent extent, Set<FileRef> datafilesToDelete, ClientContext context) throws IOException {
- String tableId = extent.getTableId().toString();
+ String tableId = extent.getTableId();
// TODO could use batch writer,would need to handle failure and retry like update does - ACCUMULO-1294
for (FileRef pathToRemove : datafilesToDelete) {
@@ -352,7 +352,7 @@ public class MetadataTableUtil {
}
public static void addDeleteEntry(AccumuloServerContext context, String tableId, String path) throws IOException {
- update(context, createDeleteMutation(tableId, path), new KeyExtent(new Text(tableId), null, null));
+ update(context, createDeleteMutation(tableId, path), new KeyExtent(tableId, null, null));
}
public static Mutation createDeleteMutation(String tableId, String pathToRemove) throws IOException {
@@ -371,7 +371,7 @@ public class MetadataTableUtil {
update(context, zooLock, m, extent);
}
- public static void splitDatafiles(Text table, Text midRow, double splitRatio, Map<FileRef,FileUtil.FileInfo> firstAndLastRows,
+ public static void splitDatafiles(String tableId, Text midRow, double splitRatio, Map<FileRef,FileUtil.FileInfo> firstAndLastRows,
SortedMap<FileRef,DataFileValue> datafiles, SortedMap<FileRef,DataFileValue> lowDatafileSizes, SortedMap<FileRef,DataFileValue> highDatafileSizes,
List<FileRef> highDatafilesToRemove) {
@@ -416,13 +416,12 @@ public class MetadataTableUtil {
public static void deleteTable(String tableId, boolean insertDeletes, ClientContext context, ZooLock lock) throws AccumuloException, IOException {
Scanner ms = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY);
- Text tableIdText = new Text(tableId);
BatchWriter bw = new BatchWriterImpl(context, MetadataTable.ID, new BatchWriterConfig().setMaxMemory(1000000).setMaxLatency(120000l, TimeUnit.MILLISECONDS)
.setMaxWriteThreads(2));
// scan metadata for our table and delete everything we find
Mutation m = null;
- ms.setRange(new KeyExtent(tableIdText, null, null).toMetadataRange());
+ ms.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
// insert deletes before deleting data from metadata... this makes the code fault tolerant
if (insertDeletes) {
@@ -612,7 +611,7 @@ public class MetadataTableUtil {
LogEntryIterator(ClientContext context) throws IOException, KeeperException, InterruptedException {
zookeeperEntries = getLogEntries(context, RootTable.EXTENT).iterator();
- rootTableEntries = getLogEntries(context, new KeyExtent(new Text(MetadataTable.ID), null, null)).iterator();
+ rootTableEntries = getLogEntries(context, new KeyExtent(MetadataTable.ID, null, null)).iterator();
try {
Scanner scanner = context.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
log.info("Setting range to " + MetadataSchema.TabletsSection.getRange());
@@ -688,7 +687,7 @@ public class MetadataTableUtil {
private static Mutation createCloneMutation(String srcTableId, String tableId, Map<Key,Value> tablet) {
KeyExtent ke = new KeyExtent(tablet.keySet().iterator().next().getRow(), (Text) null);
- Mutation m = new Mutation(KeyExtent.getMetadataEntry(new Text(tableId), ke.getEndRow()));
+ Mutation m = new Mutation(KeyExtent.getMetadataEntry(tableId, ke.getEndRow()));
for (Entry<Key,Value> entry : tablet.entrySet()) {
if (entry.getKey().getColumnFamily().equals(DataFileColumnFamily.NAME)) {
@@ -709,7 +708,7 @@ public class MetadataTableUtil {
private static Scanner createCloneScanner(String tableName, String tableId, Connector conn) throws TableNotFoundException {
Scanner mscanner = new IsolatedScanner(conn.createScanner(tableName, Authorizations.EMPTY));
- mscanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ mscanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
mscanner.fetchColumnFamily(DataFileColumnFamily.NAME);
mscanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
mscanner.fetchColumnFamily(TabletsSection.LastLocationColumnFamily.NAME);
@@ -726,7 +725,7 @@ public class MetadataTableUtil {
if (srcTableId.equals(MetadataTable.ID))
ti = new TabletIterator(createCloneScanner(tableName, srcTableId, conn), new Range(), true, true);
else
- ti = new TabletIterator(createCloneScanner(tableName, srcTableId, conn), new KeyExtent(new Text(srcTableId), null, null).toMetadataRange(), true, true);
+ ti = new TabletIterator(createCloneScanner(tableName, srcTableId, conn), new KeyExtent(srcTableId, null, null).toMetadataRange(), true, true);
if (!ti.hasNext())
throw new RuntimeException(" table deleted during clone? srcTableId = " + srcTableId);
@@ -738,16 +737,16 @@ public class MetadataTableUtil {
}
private static int compareEndRows(Text endRow1, Text endRow2) {
- return new KeyExtent(new Text("0"), endRow1, null).compareTo(new KeyExtent(new Text("0"), endRow2, null));
+ return new KeyExtent("0", endRow1, null).compareTo(new KeyExtent("0", endRow2, null));
}
@VisibleForTesting
public static int checkClone(String tableName, String srcTableId, String tableId, Connector conn, BatchWriter bw) throws TableNotFoundException,
MutationsRejectedException {
- TabletIterator srcIter = new TabletIterator(createCloneScanner(tableName, srcTableId, conn),
- new KeyExtent(new Text(srcTableId), null, null).toMetadataRange(), true, true);
- TabletIterator cloneIter = new TabletIterator(createCloneScanner(tableName, tableId, conn), new KeyExtent(new Text(tableId), null, null).toMetadataRange(),
- true, true);
+ TabletIterator srcIter = new TabletIterator(createCloneScanner(tableName, srcTableId, conn), new KeyExtent(srcTableId, null, null).toMetadataRange(), true,
+ true);
+ TabletIterator cloneIter = new TabletIterator(createCloneScanner(tableName, tableId, conn), new KeyExtent(tableId, null, null).toMetadataRange(), true,
+ true);
if (!cloneIter.hasNext() || !srcIter.hasNext())
throw new RuntimeException(" table deleted during clone? srcTableId = " + srcTableId + " tableId=" + tableId);
@@ -863,7 +862,7 @@ public class MetadataTableUtil {
// delete the clone markers and create directory entries
Scanner mscanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- mscanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ mscanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
mscanner.fetchColumnFamily(ClonedColumnFamily.NAME);
int dirCount = 0;
@@ -891,7 +890,7 @@ public class MetadataTableUtil {
public static void removeBulkLoadEntries(Connector conn, String tableId, long tid) throws Exception {
Scanner mscanner = new IsolatedScanner(conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
- mscanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ mscanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
mscanner.fetchColumnFamily(TabletsSection.BulkFileColumnFamily.NAME);
BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
for (Entry<Key,Value> entry : mscanner) {
@@ -951,7 +950,7 @@ public class MetadataTableUtil {
// new KeyExtent is only added to force update to write to the metadata table, not the root table
// because bulk loads aren't supported to the metadata table
- update(context, m, new KeyExtent(new Text("anythingNotMetadata"), null, null));
+ update(context, m, new KeyExtent("anythingNotMetadata", null, null));
}
public static void removeBulkLoadInProgressFlag(AccumuloServerContext context, String path) {
@@ -961,7 +960,7 @@ public class MetadataTableUtil {
// new KeyExtent is only added to force update to write to the metadata table, not the root table
// because bulk loads aren't supported to the metadata table
- update(context, m, new KeyExtent(new Text("anythingNotMetadata"), null, null));
+ update(context, m, new KeyExtent("anythingNotMetadata", null, null));
}
/**
@@ -971,7 +970,7 @@ public class MetadataTableUtil {
String dir = VolumeManagerImpl.get().choose(Optional.of(ReplicationTable.ID), ServerConstants.getBaseUris()) + Constants.HDFS_TABLES_DIR + Path.SEPARATOR
+ ReplicationTable.ID + Constants.DEFAULT_TABLET_LOCATION;
- Mutation m = new Mutation(new Text(KeyExtent.getMetadataEntry(new Text(ReplicationTable.ID), null)));
+ Mutation m = new Mutation(new Text(KeyExtent.getMetadataEntry(ReplicationTable.ID, null)));
m.put(DIRECTORY_COLUMN.getColumnFamily(), DIRECTORY_COLUMN.getColumnQualifier(), 0, new Value(dir.getBytes(UTF_8)));
m.put(TIME_COLUMN.getColumnFamily(), TIME_COLUMN.getColumnQualifier(), 0, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(UTF_8)));
m.put(PREV_ROW_COLUMN.getColumnFamily(), PREV_ROW_COLUMN.getColumnQualifier(), 0, KeyExtent.encodePrevEndRow(null));
@@ -1000,7 +999,7 @@ public class MetadataTableUtil {
public static void moveMetaDeleteMarkersFrom14(ClientContext context) {
// new KeyExtent is only added to force update to write to the metadata table, not the root table
- KeyExtent notMetadata = new KeyExtent(new Text("anythingNotMetadata"), null, null);
+ KeyExtent notMetadata = new KeyExtent("anythingNotMetadata", null, null);
// move delete markers from the normal delete keyspace to the root tablet delete keyspace if the files are for the !METADATA table
Scanner scanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
index c9d4dd5..ae59164 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
@@ -51,7 +51,6 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.commons.collections.map.LRUMap;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import com.beust.jcommander.Parameter;
@@ -199,7 +198,7 @@ public class RemoveEntriesForMissingFiles {
return checkTable(context, RootTable.NAME, MetadataSchema.TabletsSection.getRange(), fix);
} else {
String tableId = Tables.getTableId(context.getInstance(), tableName);
- Range range = new KeyExtent(new Text(tableId), null, null).toMetadataRange();
+ Range range = new KeyExtent(tableId, null, null).toMetadataRange();
return checkTable(context, MetadataTable.NAME, range, fix);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
index b57affe..a400e4f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.server.util;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
@@ -52,8 +54,6 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-
/**
* provides a reference to the replication table for updates by tablet servers
*/
@@ -194,7 +194,7 @@ public class ReplicationTableUtil {
private static Mutation createUpdateMutation(Text row, Value v, KeyExtent extent) {
Mutation m = new Mutation(row);
- m.put(MetadataSchema.ReplicationSection.COLF, extent.getTableId(), v);
+ m.put(MetadataSchema.ReplicationSection.COLF, new Text(extent.getTableId()), v);
return m;
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
index 235286b..1a630a9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -178,7 +177,7 @@ public class TableDiskUsage {
throw new RuntimeException(e);
}
mdScanner.fetchColumnFamily(DataFileColumnFamily.NAME);
- mdScanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ mdScanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
if (!mdScanner.iterator().hasNext()) {
emptyTableIds.add(tableId);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
index d6864c1..43345f2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.server.util;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -38,7 +40,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterators;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
/**
* This class iterates over the metadata table returning all key values for a tablet in one chunk. As it scans the metadata table it checks the correctness of
@@ -118,8 +119,8 @@ public class TabletIterator implements Iterator<Map<Key,Value>> {
lastEndRow = new KeyExtent(lastTablet, (Text) null).getEndRow();
// do table transition sanity check
- String lastTable = new KeyExtent(lastTablet, (Text) null).getTableId().toString();
- String currentTable = new KeyExtent(prevEndRowKey.getRow(), (Text) null).getTableId().toString();
+ String lastTable = new KeyExtent(lastTablet, (Text) null).getTableId();
+ String currentTable = new KeyExtent(prevEndRowKey.getRow(), (Text) null).getTableId();
if (!lastTable.equals(currentTable) && (per != null || lastEndRow != null)) {
log.info("Metadata inconsistency on table transition : " + lastTable + " " + currentTable + " " + per + " " + lastEndRow);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
index 50b996d..0116101 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/client/BulkImporterTest.java
@@ -52,7 +52,8 @@ import org.junit.Test;
public class BulkImporterTest {
static final SortedSet<KeyExtent> fakeMetaData = new TreeSet<KeyExtent>();
- static final Text tableId = new Text("1");
+ static final String tableId = "1";
+
static {
fakeMetaData.add(new KeyExtent(tableId, new Text("a"), null));
for (String part : new String[] {"b", "bm", "c", "cm", "d", "dm", "e", "em", "f", "g", "h", "i", "j", "k", "l"}) {
@@ -161,19 +162,19 @@ public class BulkImporterTest {
// a correct startRow so that findOverlappingTablets works as intended.
// 1;2;1
- KeyExtent extent = new KeyExtent(new Text("1"), new Text("2"), new Text("1"));
+ KeyExtent extent = new KeyExtent("1", new Text("2"), new Text("1"));
Assert.assertEquals(new Text("1\0"), BulkImporter.getStartRowForExtent(extent));
// 1;2<
- extent = new KeyExtent(new Text("1"), new Text("2"), null);
+ extent = new KeyExtent("1", new Text("2"), null);
Assert.assertEquals(null, BulkImporter.getStartRowForExtent(extent));
// 1<<
- extent = new KeyExtent(new Text("1"), null, null);
+ extent = new KeyExtent("1", null, null);
Assert.assertEquals(null, BulkImporter.getStartRowForExtent(extent));
// 1;8;7777777
- extent = new KeyExtent(new Text("1"), new Text("8"), new Text("7777777"));
+ extent = new KeyExtent("1", new Text("8"), new Text("7777777"));
Assert.assertEquals(new Text("7777777\0"), BulkImporter.getStartRowForExtent(extent));
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
index 0fb9182..7101910 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
@@ -50,7 +50,7 @@ public class ChaoticLoadBalancerTest {
TabletServerStatus result = new TabletServerStatus();
result.tableMap = new HashMap<String,TableInfo>();
for (KeyExtent extent : extents) {
- String table = extent.getTableId().toString();
+ String table = extent.getTableId();
TableInfo info = result.tableMap.get(table);
if (info == null)
result.tableMap.put(table, info = new TableInfo());
@@ -71,7 +71,7 @@ public class ChaoticLoadBalancerTest {
public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException {
List<TabletStats> result = new ArrayList<TabletStats>();
for (KeyExtent extent : servers.get(tserver).extents) {
- if (extent.getTableId().toString().equals(table)) {
+ if (extent.getTableId().equals(table)) {
result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
}
}
@@ -154,7 +154,7 @@ public class ChaoticLoadBalancerTest {
}
private static KeyExtent makeExtent(String table, String end, String prev) {
- return new KeyExtent(new Text(table), toText(end), toText(prev));
+ return new KeyExtent(table, toText(end), toText(prev));
}
private static Text toText(String value) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
index aee1795..20d85fe 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java
@@ -54,7 +54,7 @@ public class DefaultLoadBalancerTest {
TabletServerStatus result = new TabletServerStatus();
result.tableMap = new HashMap<String,TableInfo>();
for (KeyExtent extent : extents) {
- String table = extent.getTableId().toString();
+ String table = extent.getTableId();
TableInfo info = result.tableMap.get(table);
if (info == null)
result.tableMap.put(table, info = new TableInfo());
@@ -76,7 +76,7 @@ public class DefaultLoadBalancerTest {
public List<TabletStats> getOnlineTabletsForTable(TServerInstance tserver, String table) throws ThriftSecurityException, TException {
List<TabletStats> result = new ArrayList<TabletStats>();
for (KeyExtent extent : servers.get(tserver).extents) {
- if (extent.getTableId().toString().equals(table)) {
+ if (extent.getTableId().equals(table)) {
result.add(new TabletStats(extent.toThrift(), null, null, null, 0l, 0., 0., 0));
}
}
@@ -169,7 +169,7 @@ public class DefaultLoadBalancerTest {
public void testUnevenAssignment() {
for (char c : "abcdefghijklmnopqrstuvwxyz".toCharArray()) {
String cString = Character.toString(c);
- HostAndPort fakeAddress = HostAndPort.fromParts("127.0.0.1", (int) c);
+ HostAndPort fakeAddress = HostAndPort.fromParts("127.0.0.1", c);
String fakeInstance = cString;
TServerInstance tsi = new TServerInstance(fakeAddress, fakeInstance);
FakeTServer fakeTServer = new FakeTServer();
@@ -210,7 +210,7 @@ public class DefaultLoadBalancerTest {
// make 26 servers
for (char c : "abcdefghijklmnopqrstuvwxyz".toCharArray()) {
String cString = Character.toString(c);
- HostAndPort fakeAddress = HostAndPort.fromParts("127.0.0.1", (int) c);
+ HostAndPort fakeAddress = HostAndPort.fromParts("127.0.0.1", c);
String fakeInstance = cString;
TServerInstance tsi = new TServerInstance(fakeAddress, fakeInstance);
FakeTServer fakeTServer = new FakeTServer();
@@ -266,7 +266,7 @@ public class DefaultLoadBalancerTest {
for (FakeTServer server : servers.values()) {
Map<String,Integer> counts = new HashMap<String,Integer>();
for (KeyExtent extent : server.extents) {
- String t = extent.getTableId().toString();
+ String t = extent.getTableId();
if (counts.get(t) == null)
counts.put(t, 0);
counts.put(t, counts.get(t) + 1);
@@ -279,7 +279,7 @@ public class DefaultLoadBalancerTest {
}
private static KeyExtent makeExtent(String table, String end, String prev) {
- return new KeyExtent(new Text(table), toText(end), toText(prev));
+ return new KeyExtent(table, toText(end), toText(prev));
}
private static Text toText(String value) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
index 5de4923..65b43cc 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
@@ -67,7 +67,7 @@ public class GroupBalancerTest {
public void addTablet(String er, String location) {
TServerInstance tsi = new TServerInstance(location, 6);
- tabletLocs.put(new KeyExtent(new Text("b"), er == null ? null : new Text(er), null), new TServerInstance(location, 6));
+ tabletLocs.put(new KeyExtent("b", er == null ? null : new Text(er), null), new TServerInstance(location, 6));
tservers.add(tsi);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
index de853d5..7caa60b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java
@@ -82,8 +82,8 @@ public class TableLoadBalancerTest {
// generate some fake tablets
for (int i = 0; i < tableInfo.tableMap.get(tableId).onlineTablets; i++) {
TabletStats stats = new TabletStats();
- stats.extent = new KeyExtent(new Text(tableId), new Text(tserver.host() + String.format("%03d", i + 1)), new Text(tserver.host()
- + String.format("%03d", i))).toThrift();
+ stats.extent = new KeyExtent(tableId, new Text(tserver.host() + String.format("%03d", i + 1)), new Text(tserver.host() + String.format("%03d", i)))
+ .toThrift();
result.add(stats);
}
return result;
@@ -178,7 +178,7 @@ public class TableLoadBalancerTest {
for (TabletMigration migration : migrationsOut) {
if (migration.oldServer.equals(svr))
count++;
- String key = migration.tablet.getTableId().toString();
+ String key = migration.tablet.getTableId();
movedByTable.put(key, movedByTable.get(key) + 1);
}
Assert.assertEquals(15, count);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
index 1ce5dd8..ae06e53 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
@@ -68,7 +68,7 @@ public class MergeInfoTest {
@Test
public void testSerialization() throws Exception {
- Text table = new Text("table");
+ String table = "table";
Text endRow = new Text("end");
Text prevEndRow = new Text("begin");
keyExtent = new KeyExtent(table, endRow, prevEndRow);
@@ -88,10 +88,10 @@ public class MergeInfoTest {
@Test
public void testNeedsToBeChopped_DifferentTables() {
- expect(keyExtent.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent.getTableId()).andReturn("table1");
replay(keyExtent);
KeyExtent keyExtent2 = createMock(KeyExtent.class);
- expect(keyExtent2.getTableId()).andReturn(new Text("table2"));
+ expect(keyExtent2.getTableId()).andReturn("table2");
replay(keyExtent2);
mi = new MergeInfo(keyExtent, MergeInfo.Operation.MERGE);
assertFalse(mi.needsToBeChopped(keyExtent2));
@@ -99,9 +99,9 @@ public class MergeInfoTest {
@Test
public void testNeedsToBeChopped_NotDelete() {
- expect(keyExtent.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent.getTableId()).andReturn("table1");
KeyExtent keyExtent2 = createMock(KeyExtent.class);
- expect(keyExtent2.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent2.getTableId()).andReturn("table1");
replay(keyExtent2);
expect(keyExtent.overlaps(keyExtent2)).andReturn(true);
replay(keyExtent);
@@ -125,11 +125,11 @@ public class MergeInfoTest {
}
private void testNeedsToBeChopped_Delete(String prevEndRow, boolean expected) {
- expect(keyExtent.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent.getTableId()).andReturn("table1");
expect(keyExtent.getEndRow()).andReturn(new Text("prev"));
replay(keyExtent);
KeyExtent keyExtent2 = createMock(KeyExtent.class);
- expect(keyExtent2.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent2.getTableId()).andReturn("table1");
expect(keyExtent2.getPrevEndRow()).andReturn(prevEndRow != null ? new Text(prevEndRow) : null);
expectLastCall().anyTimes();
replay(keyExtent2);
@@ -150,9 +150,9 @@ public class MergeInfoTest {
public void testOverlaps_DoesNotNeedChopping() {
KeyExtent keyExtent2 = createMock(KeyExtent.class);
expect(keyExtent.overlaps(keyExtent2)).andReturn(false);
- expect(keyExtent.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent.getTableId()).andReturn("table1");
replay(keyExtent);
- expect(keyExtent2.getTableId()).andReturn(new Text("table2"));
+ expect(keyExtent2.getTableId()).andReturn("table2");
replay(keyExtent2);
mi = new MergeInfo(keyExtent, MergeInfo.Operation.MERGE);
assertFalse(mi.overlaps(keyExtent2));
@@ -162,10 +162,10 @@ public class MergeInfoTest {
public void testOverlaps_NeedsChopping() {
KeyExtent keyExtent2 = createMock(KeyExtent.class);
expect(keyExtent.overlaps(keyExtent2)).andReturn(false);
- expect(keyExtent.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent.getTableId()).andReturn("table1");
expect(keyExtent.getEndRow()).andReturn(new Text("prev"));
replay(keyExtent);
- expect(keyExtent2.getTableId()).andReturn(new Text("table1"));
+ expect(keyExtent2.getTableId()).andReturn("table1");
expect(keyExtent2.getPrevEndRow()).andReturn(new Text("prev"));
expectLastCall().anyTimes();
replay(keyExtent2);
@@ -187,7 +187,7 @@ public class MergeInfoTest {
}
private static KeyExtent ke(String tableId, String endRow, String prevEndRow) {
- return new KeyExtent(new Text(tableId), endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow));
+ return new KeyExtent(tableId, endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow));
}
@Test
[2/5] accumulo git commit: ACCUMULO-4145 Eliminate Text wrapping of
tableIDs
Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
index b809a35..51e14df 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
@@ -24,7 +24,6 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.tserver.TabletServerResourceManager.AssignmentWatcher;
-import org.apache.hadoop.io.Text;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +49,7 @@ public class AssignmentWatcherTest {
RunnableStartedAt run = new RunnableStartedAt(task, System.currentTimeMillis());
EasyMock.expect(conf.getTimeInMillis(Property.TSERV_ASSIGNMENT_DURATION_WARNING)).andReturn(0l);
- assignments.put(new KeyExtent(new Text("1"), null, null), run);
+ assignments.put(new KeyExtent("1", null, null), run);
EasyMock.expect(task.getException()).andReturn(new Exception("Assignment warning happened"));
EasyMock.expect(timer.schedule(watcher, 5000l)).andReturn(null);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
index 8c00ece..27da12b 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/CheckTabletMetadataTest.java
@@ -70,7 +70,7 @@ public class CheckTabletMetadataTest {
@Test
public void testBadTabletMetadata() throws Exception {
- KeyExtent ke = new KeyExtent(new Text("1"), null, null);
+ KeyExtent ke = new KeyExtent("1", null, null);
TreeMap<Key,Value> tabletMeta = new TreeMap<Key,Value>();
@@ -89,9 +89,9 @@ public class CheckTabletMetadataTest {
assertFail(tabletMeta, ke, new TServerInstance("127.0.0.2:9997", 4));
assertFail(tabletMeta, ke, new TServerInstance("127.0.0.2:9997", 5));
- assertFail(tabletMeta, new KeyExtent(new Text("1"), null, new Text("m")), tsi);
+ assertFail(tabletMeta, new KeyExtent("1", null, new Text("m")), tsi);
- assertFail(tabletMeta, new KeyExtent(new Text("1"), new Text("r"), new Text("m")), tsi);
+ assertFail(tabletMeta, new KeyExtent("1", new Text("r"), new Text("m")), tsi);
assertFail(tabletMeta, ke, tsi, nk("1<", TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
index e0dc0c0..82ec8ec 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java
@@ -214,7 +214,7 @@ public class LargestFirstMemoryManagerTest {
mgr.init(config);
MemoryManagementActions result;
// one tablet is really big and the other is for a nonexistent table
- KeyExtent extent = new KeyExtent(new Text("2"), new Text("j"), null);
+ KeyExtent extent = new KeyExtent("2", new Text("j"), null);
result = mgr.getMemoryManagementActions(tablets(t(extent, ZERO, ONE_GIG, 0), t(k("j"), ZERO, ONE_GIG, 0)));
assertEquals(1, result.tabletsToMinorCompact.size());
assertEquals(extent, result.tabletsToMinorCompact.get(0));
@@ -256,7 +256,7 @@ public class LargestFirstMemoryManagerTest {
}
private static KeyExtent k(String endRow) {
- return new KeyExtent(new Text("1"), new Text(endRow), null);
+ return new KeyExtent("1", new Text(endRow), null);
}
private static class TestTabletState implements TabletState {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
index 0388c1f..dd18584 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java
@@ -60,6 +60,7 @@ public class DefaultCompactionStrategyTest {
}
static final Map<String,Pair<Key,Key>> fakeFiles = new HashMap<String,Pair<Key,Key>>();
+
static {
fakeFiles.put("file1", keys("b", "m"));
fakeFiles.put("file2", keys("n", "z"));
@@ -157,7 +158,7 @@ public class DefaultCompactionStrategyTest {
}
private MajorCompactionRequest createRequest(MajorCompactionReason reason, Object... objs) throws IOException {
- return createRequest(new KeyExtent(new Text("0"), null, null), reason, objs);
+ return createRequest(new KeyExtent("0", null, null), reason, objs);
}
private MajorCompactionRequest createRequest(KeyExtent extent, MajorCompactionReason reason, Object... objs) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
index e5cdd72..a66715e 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
import org.apache.accumulo.server.fs.FileRef;
-import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
@@ -51,7 +50,7 @@ public class SizeLimitCompactionStrategyTest {
slcs.init(opts);
- KeyExtent ke = new KeyExtent(new Text("0"), null, null);
+ KeyExtent ke = new KeyExtent("0", null, null);
MajorCompactionRequest mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, null, AccumuloConfiguration.getDefaultConfiguration());
mcr.setFiles(nfl("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G"));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
index 62962db..d2a1fe4 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java
@@ -28,7 +28,6 @@ import org.apache.accumulo.server.fs.FileRef;
import org.apache.accumulo.tserver.compaction.CompactionPlan;
import org.apache.accumulo.tserver.compaction.MajorCompactionReason;
import org.apache.accumulo.tserver.compaction.MajorCompactionRequest;
-import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
@@ -38,7 +37,7 @@ public class ConfigurableCompactionStrategyTest {
@Test
public void testOutputOptions() throws Exception {
- MajorCompactionRequest mcr = new MajorCompactionRequest(new KeyExtent(new Text("1"), null, null), MajorCompactionReason.USER, null, null);
+ MajorCompactionRequest mcr = new MajorCompactionRequest(new KeyExtent("1", null, null), MajorCompactionReason.USER, null, null);
Map<FileRef,DataFileValue> files = new HashMap<>();
files.put(new FileRef("hdfs://nn1/accumulo/tables/1/t-009/F00001.rf"), new DataFileValue(50000, 400));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LogEntryTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LogEntryTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LogEntryTest.java
index ee3c621..2edcaa9 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LogEntryTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LogEntryTest.java
@@ -29,7 +29,7 @@ public class LogEntryTest {
@Test
public void test() throws Exception {
- KeyExtent extent = new KeyExtent(new Text("1"), null, new Text(""));
+ KeyExtent extent = new KeyExtent("1", null, new Text(""));
long ts = 12345678L;
String server = "localhost:1234";
String filename = "default/foo";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
index b47b376..882aed7 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java
@@ -56,7 +56,7 @@ import org.junit.rules.TemporaryFolder;
public class SortedLogRecoveryTest {
- static final KeyExtent extent = new KeyExtent(new Text("table"), null, null);
+ static final KeyExtent extent = new KeyExtent("table", null, null);
static final Text cf = new Text("cf");
static final Text cq = new Text("cq");
static final Value value = new Value("value".getBytes());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
index 06fe1d5..582d6df 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
@@ -80,7 +80,7 @@ public class LogFileTest {
assertEquals(key.seq, 3);
assertEquals(key.tid, 4);
assertEquals(key.filename, "some file");
- KeyExtent tablet = new KeyExtent(new Text("table"), new Text("bbbb"), new Text("aaaa"));
+ KeyExtent tablet = new KeyExtent("table", new Text("bbbb"), new Text("aaaa"));
readWrite(DEFINE_TABLET, 5, 6, null, tablet, null, key, value);
assertEquals(key.event, DEFINE_TABLET);
assertEquals(key.seq, 5);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
index 76c8bdf..71d8c50 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystemTest.java
@@ -77,7 +77,7 @@ public class AccumuloReplicaSystemTest {
* look like in a WAL. They are solely for testing that each LogEvents is handled, order is not important.
*/
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("1"), null, null);
+ key.tablet = new KeyExtent("1", null, null);
key.tid = 1;
key.write(dos);
@@ -92,7 +92,7 @@ public class AccumuloReplicaSystemTest {
value.write(dos);
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("2"), null, null);
+ key.tablet = new KeyExtent("2", null, null);
key.tid = 2;
value.mutations = Collections.emptyList();
@@ -123,7 +123,7 @@ public class AccumuloReplicaSystemTest {
value.write(dos);
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("1"), null, null);
+ key.tablet = new KeyExtent("1", null, null);
key.tid = 3;
value.mutations = Collections.emptyList();
@@ -183,7 +183,7 @@ public class AccumuloReplicaSystemTest {
* look like in a WAL. They are solely for testing that each LogEvents is handled, order is not important.
*/
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("1"), null, null);
+ key.tablet = new KeyExtent("1", null, null);
key.tid = 1;
key.write(dos);
@@ -198,7 +198,7 @@ public class AccumuloReplicaSystemTest {
value.write(dos);
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("2"), null, null);
+ key.tablet = new KeyExtent("2", null, null);
key.tid = 2;
value.mutations = Collections.emptyList();
@@ -229,7 +229,7 @@ public class AccumuloReplicaSystemTest {
value.write(dos);
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("1"), null, null);
+ key.tablet = new KeyExtent("1", null, null);
key.tid = 3;
value.mutations = Collections.emptyList();
@@ -380,7 +380,7 @@ public class AccumuloReplicaSystemTest {
* look like in a WAL. They are solely for testing that each LogEvents is handled, order is not important.
*/
key.event = LogEvents.DEFINE_TABLET;
- key.tablet = new KeyExtent(new Text("1"), null, null);
+ key.tablet = new KeyExtent("1", null, null);
key.tid = 1;
key.write(dos);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/CloneIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/CloneIT.java b/test/src/main/java/org/apache/accumulo/test/CloneIT.java
index 441e924..cd59ce4 100644
--- a/test/src/main/java/org/apache/accumulo/test/CloneIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CloneIT.java
@@ -48,7 +48,7 @@ public class CloneIT extends AccumuloClusterHarness {
String tableName = getUniqueNames(1)[0];
conn.tableOperations().create(tableName);
- KeyExtent ke = new KeyExtent(new Text("0"), null, null);
+ KeyExtent ke = new KeyExtent("0", null, null);
Mutation mut = ke.getPrevRowUpdateMutation();
TabletsSection.ServerColumnFamily.TIME_COLUMN.put(mut, new Value("M0".getBytes()));
@@ -78,7 +78,7 @@ public class CloneIT extends AccumuloClusterHarness {
String tableName = getUniqueNames(1)[0];
conn.tableOperations().create(tableName);
- KeyExtent ke = new KeyExtent(new Text("0"), null, null);
+ KeyExtent ke = new KeyExtent("0", null, null);
Mutation mut = ke.getPrevRowUpdateMutation();
TabletsSection.ServerColumnFamily.TIME_COLUMN.put(mut, new Value("M0".getBytes()));
@@ -111,7 +111,7 @@ public class CloneIT extends AccumuloClusterHarness {
assertEquals(0, rc);
Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
- scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
HashSet<String> files = new HashSet<String>();
@@ -152,7 +152,7 @@ public class CloneIT extends AccumuloClusterHarness {
assertEquals(0, rc);
Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
- scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
HashSet<String> files = new HashSet<String>();
@@ -202,7 +202,7 @@ public class CloneIT extends AccumuloClusterHarness {
assertEquals(0, rc);
Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
- scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
HashSet<String> files = new HashSet<String>();
@@ -221,7 +221,7 @@ public class CloneIT extends AccumuloClusterHarness {
}
private static Mutation deleteTablet(String tid, String endRow, String prevRow, String dir, String file) throws Exception {
- KeyExtent ke = new KeyExtent(new Text(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow));
+ KeyExtent ke = new KeyExtent(tid, endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow));
Mutation mut = new Mutation(ke.getMetadataEntry());
TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.putDelete(mut);
TabletsSection.ServerColumnFamily.TIME_COLUMN.putDelete(mut);
@@ -232,7 +232,7 @@ public class CloneIT extends AccumuloClusterHarness {
}
private static Mutation createTablet(String tid, String endRow, String prevRow, String dir, String file) throws Exception {
- KeyExtent ke = new KeyExtent(new Text(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow));
+ KeyExtent ke = new KeyExtent(tid, endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow));
Mutation mut = ke.getPrevRowUpdateMutation();
TabletsSection.ServerColumnFamily.TIME_COLUMN.put(mut, new Value("M0".getBytes()));
@@ -272,7 +272,7 @@ public class CloneIT extends AccumuloClusterHarness {
assertEquals(0, rc);
Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
- scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
HashSet<String> files = new HashSet<String>();
@@ -337,7 +337,7 @@ public class CloneIT extends AccumuloClusterHarness {
assertEquals(0, rc);
Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
- scanner.setRange(new KeyExtent(new Text("1"), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent("1", null, null).toMetadataRange());
HashSet<String> files = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
index e1ce0e9..4018d78 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1057,14 +1057,14 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
}
private static class MutatorTask implements Runnable {
- String table;
+ String tableName;
ArrayList<ByteSequence> rows;
ConditionalWriter cw;
Connector conn;
AtomicBoolean failed;
- public MutatorTask(String table, Connector conn, ArrayList<ByteSequence> rows, ConditionalWriter cw, AtomicBoolean failed) {
- this.table = table;
+ public MutatorTask(String tableName, Connector conn, ArrayList<ByteSequence> rows, ConditionalWriter cw, AtomicBoolean failed) {
+ this.tableName = tableName;
this.rows = rows;
this.conn = conn;
this.cw = cw;
@@ -1076,7 +1076,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
try {
Random rand = new Random();
- Scanner scanner = new IsolatedScanner(conn.createScanner(table, Authorizations.EMPTY));
+ Scanner scanner = new IsolatedScanner(conn.createScanner(tableName, Authorizations.EMPTY));
for (int i = 0; i < 20; i++) {
int numRows = rand.nextInt(10) + 1;
@@ -1119,23 +1119,23 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
public void testThreads() throws Exception {
// test multiple threads using a single conditional writer
- String table = getUniqueNames(1)[0];
+ String tableName = getUniqueNames(1)[0];
Connector conn = getConnector();
- conn.tableOperations().create(table);
+ conn.tableOperations().create(tableName);
Random rand = new Random();
switch (rand.nextInt(3)) {
case 1:
- conn.tableOperations().addSplits(table, nss("4"));
+ conn.tableOperations().addSplits(tableName, nss("4"));
break;
case 2:
- conn.tableOperations().addSplits(table, nss("3", "5"));
+ conn.tableOperations().addSplits(tableName, nss("3", "5"));
break;
}
- ConditionalWriter cw = conn.createConditionalWriter(table, new ConditionalWriterConfig());
+ ConditionalWriter cw = conn.createConditionalWriter(tableName, new ConditionalWriterConfig());
ArrayList<ByteSequence> rows = new ArrayList<ByteSequence>();
@@ -1165,7 +1165,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
ExecutorService tp = Executors.newFixedThreadPool(5);
for (int i = 0; i < 5; i++) {
- tp.submit(new MutatorTask(table, conn, rows, cw, failed));
+ tp.submit(new MutatorTask(tableName, conn, rows, cw, failed));
}
tp.shutdown();
@@ -1176,7 +1176,7 @@ public class ConditionalWriterIT extends AccumuloClusterHarness {
Assert.assertFalse("A MutatorTask failed with an exception", failed.get());
- Scanner scanner = conn.createScanner(table, Authorizations.EMPTY);
+ Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY);
RowIterator rowIter = new RowIterator(scanner);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
index 193d0d4..b7b8a48 100644
--- a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
@@ -70,7 +70,7 @@ public class LocatorIT extends AccumuloClusterHarness {
}
private static TabletId newTabletId(String tableId, String endRow, String prevRow) {
- return new TabletIdImpl(new KeyExtent(new Text(tableId), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)));
+ return new TabletIdImpl(new KeyExtent(tableId, endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)));
}
@Test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index e54e451..f2ad475 100644
--- a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -109,7 +109,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase {
for (TabletLocationState tls : store) {
if (tls != null && tls.current != null) {
states.add(tls.current);
- } else if (tls != null && tls.extent.equals(new KeyExtent(new Text(ReplicationTable.ID), null, null))) {
+ } else if (tls != null && tls.extent.equals(new KeyExtent(ReplicationTable.ID, null, null))) {
replStates.add(tls.current);
} else {
allAssigned = false;
@@ -139,7 +139,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase {
waitForCleanStore(store);
// now jam up the metadata table
bw = c.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
- assignment = new Mutation(new KeyExtent(new Text(MetadataTable.ID), null, null).getMetadataEntry());
+ assignment = new Mutation(new KeyExtent(MetadataTable.ID, null, null).getMetadataEntry());
moved.current.putLocation(assignment);
bw.addMutation(assignment);
bw.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
index 727859f..468b41a 100644
--- a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.server.util.MetadataTableUtil;
-import org.apache.hadoop.io.Text;
import org.junit.Test;
public class MetaConstraintRetryIT extends AccumuloClusterHarness {
@@ -46,7 +45,7 @@ public class MetaConstraintRetryIT extends AccumuloClusterHarness {
Credentials credentials = new Credentials(getAdminPrincipal(), getAdminToken());
ClientContext context = new ClientContext(getConnector().getInstance(), credentials, cluster.getClientConfig());
Writer w = new Writer(context, MetadataTable.ID);
- KeyExtent extent = new KeyExtent(new Text("5"), null, null);
+ KeyExtent extent = new KeyExtent("5", null, null);
Mutation m = new Mutation(extent.getMetadataEntry());
// unknown columns should cause contraint violation
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
index b3bf196..c04201d 100644
--- a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java
@@ -127,14 +127,14 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase {
String tableId = conn.tableOperations().tableIdMap().get(tableName);
Assert.assertNotNull("Table ID was null", tableId);
- LogEntry logEntry = new LogEntry(new KeyExtent(new Text(tableId), null, null), 0, "127.0.0.1:12345", emptyWalog.toURI().toString());
+ LogEntry logEntry = new LogEntry(new KeyExtent(tableId, null, null), 0, "127.0.0.1:12345", emptyWalog.toURI().toString());
log.info("Taking {} offline", tableName);
conn.tableOperations().offline(tableName, true);
log.info("{} is offline", tableName);
- Text row = MetadataSchema.TabletsSection.getRow(new Text(tableId), null);
+ Text row = MetadataSchema.TabletsSection.getRow(tableId, null);
Mutation m = new Mutation(row);
m.put(logEntry.getColumnFamily(), logEntry.getColumnQualifier(), logEntry.getValue());
@@ -189,7 +189,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase {
log.info("{} is offline", tableName);
- Text row = MetadataSchema.TabletsSection.getRow(new Text(tableId), null);
+ Text row = MetadataSchema.TabletsSection.getRow(tableId, null);
Mutation m = new Mutation(row);
m.put(logEntry.getColumnFamily(), logEntry.getColumnQualifier(), logEntry.getValue());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
index dd58cc8..469f4e0 100644
--- a/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
+++ b/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
@@ -104,7 +104,7 @@ public class QueryMetadataTable {
Connector connector = opts.getConnector();
Scanner scanner = connector.createScanner(MetadataTable.NAME, opts.auths);
scanner.setBatchSize(scanOpts.scanBatchSize);
- Text mdrow = new Text(KeyExtent.getMetadataEntry(new Text(MetadataTable.ID), null));
+ Text mdrow = new Text(KeyExtent.getMetadataEntry(MetadataTable.ID, null));
HashSet<Text> rowSet = new HashSet<Text>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java
index 3f8c30c..4f5d8e9 100644
--- a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java
@@ -88,7 +88,7 @@ public class SplitRecoveryIT extends AccumuloClusterHarness {
connector.securityOperations().grantTablePermission(getAdminPrincipal(), MetadataTable.NAME, TablePermission.WRITE);
String tableId = connector.tableOperations().tableIdMap().get(tableName);
- KeyExtent extent = new KeyExtent(new Text(tableId), null, new Text("b"));
+ KeyExtent extent = new KeyExtent(tableId, null, new Text("b"));
Mutation m = extent.getPrevRowUpdateMutation();
TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN.put(m, new Value(Double.toString(0.5).getBytes()));
@@ -104,7 +104,7 @@ public class SplitRecoveryIT extends AccumuloClusterHarness {
scanner.setRange(extent.toMetadataRange());
scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
- KeyExtent extent2 = new KeyExtent(new Text(tableId), new Text("b"), null);
+ KeyExtent extent2 = new KeyExtent(tableId, new Text("b"), null);
m = extent2.getPrevRowUpdateMutation();
TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value("/t2".getBytes()));
TabletsSection.ServerColumnFamily.TIME_COLUMN.put(m, new Value("M0".getBytes()));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
index 0a06fdf..5cacfdd 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java
@@ -228,7 +228,7 @@ public class VolumeIT extends ConfigurableMacBase {
Scanner metaScanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
metaScanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
- metaScanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ metaScanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
BatchWriter mbw = connector.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
@@ -405,7 +405,7 @@ public class VolumeIT extends ConfigurableMacBase {
Scanner metaScanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(metaScanner);
metaScanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
- metaScanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ metaScanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
int counts[] = new int[paths.length];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java b/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
index 6a01e8c..a8fc439 100644
--- a/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java
@@ -63,7 +63,7 @@ public class WrongTabletTest {
Mutation mutation = new Mutation(new Text("row_0003750001"));
mutation.putDelete(new Text("colf"), new Text("colq"));
- client.update(Tracer.traceInfo(), context.rpcCreds(), new KeyExtent(new Text("!!"), null, new Text("row_0003750000")).toThrift(), mutation.toThrift(),
+ client.update(Tracer.traceInfo(), context.rpcCreds(), new KeyExtent("!!", null, new Text("row_0003750000")).toThrift(), mutation.toThrift(),
TDurability.DEFAULT);
} catch (Exception e) {
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/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 cf4e3c1..c0f46df 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
@@ -52,7 +52,6 @@ import org.apache.accumulo.server.util.TableInfoUtil;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.ClusterStatus;
import org.apache.hadoop.mapred.JobClient;
import org.slf4j.Logger;
@@ -99,7 +98,7 @@ public class ContinuousStatsCollector {
scanner.setBatchSize(scanBatchSize);
scanner.fetchColumnFamily(DataFileColumnFamily.NAME);
scanner.addScanIterator(new IteratorSetting(1000, "cfc", ColumnFamilyCounter.class.getName()));
- scanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
Stat s = new Stat();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index ee181df..e5fecf8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RawLocalFileSystem;
+import org.apache.hadoop.io.Text;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -177,8 +178,8 @@ public class CompactionIT extends AccumuloClusterHarness {
private int countFiles(Connector c) throws Exception {
Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- s.fetchColumnFamily(MetadataSchema.TabletsSection.TabletColumnFamily.NAME);
- s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
+ s.fetchColumnFamily(new Text(MetadataSchema.TabletsSection.TabletColumnFamily.NAME));
+ s.fetchColumnFamily(new Text(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME));
return Iterators.size(s.iterator());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
index 72f8ce7..7745a0f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java
@@ -35,7 +35,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.server.master.state.MetaDataTableScanner;
import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.hadoop.io.Text;
import org.junit.Test;
public class MasterAssignmentIT extends AccumuloClusterHarness {
@@ -92,7 +91,7 @@ public class MasterAssignmentIT extends AccumuloClusterHarness {
private TabletLocationState getTabletLocationState(Connector c, String tableId) throws FileNotFoundException, ConfigurationException {
Credentials creds = new Credentials(getAdminPrincipal(), getAdminToken());
ClientContext context = new ClientContext(c.getInstance(), creds, getCluster().getClientConfig());
- MetaDataTableScanner s = new MetaDataTableScanner(context, new Range(KeyExtent.getMetadataEntry(new Text(tableId), null)));
+ MetaDataTableScanner s = new MetaDataTableScanner(context, new Range(KeyExtent.getMetadataEntry(tableId, null)));
TabletLocationState tlState = s.next();
s.close();
return tlState;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
index 4652c33..c5a4afb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -218,7 +218,7 @@ public class MergeIT extends AccumuloClusterHarness {
protected void resetScanner() {
try {
Scanner ds = conn.createScanner(metadataTableName, Authorizations.EMPTY);
- Text tablet = new KeyExtent(new Text("0"), new Text("m"), null).getMetadataEntry();
+ Text tablet = new KeyExtent("0", new Text("m"), null).getMetadataEntry();
ds.setRange(new Range(tablet, true, tablet, true));
Mutation m = new Mutation(tablet);
@@ -249,11 +249,11 @@ public class MergeIT extends AccumuloClusterHarness {
String metadataTableName = getUniqueNames(1)[0];
getConnector().tableOperations().create(metadataTableName);
- KeyExtent ke1 = new KeyExtent(new Text("0"), new Text("m"), null);
+ KeyExtent ke1 = new KeyExtent("0", new Text("m"), null);
Mutation mut1 = ke1.getPrevRowUpdateMutation();
TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(mut1, new Value("/d1".getBytes()));
- KeyExtent ke2 = new KeyExtent(new Text("0"), null, null);
+ KeyExtent ke2 = new KeyExtent("0", null, null);
Mutation mut2 = ke2.getPrevRowUpdateMutation();
TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(mut2, new Value("/d2".getBytes()));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
index 25896ba..d8eff6f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
@@ -49,7 +49,6 @@ import org.apache.accumulo.server.util.CheckForMetadataProblems;
import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.Text;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
@@ -150,7 +149,7 @@ public class SplitIT extends AccumuloClusterHarness {
}
String id = c.tableOperations().tableIdMap().get(table);
Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- KeyExtent extent = new KeyExtent(new Text(id), null, null);
+ KeyExtent extent = new KeyExtent(id, null, null);
s.setRange(extent.toMetadataRange());
MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(s);
int count = 0;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
index 2026c37..c48b1ed 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -77,7 +77,7 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
}
private KeyExtent nke(String table, String endRow, String prevEndRow) {
- return new KeyExtent(new Text(table), endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow));
+ return new KeyExtent(table, endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow));
}
private void run() throws Exception {
@@ -138,7 +138,7 @@ public class SplitRecoveryIT extends ConfigurableMacBase {
for (int i = 0; i < extents.length; i++) {
KeyExtent extent = extents[i];
- String tdir = ServerConstants.getTablesDirs()[0] + "/" + extent.getTableId().toString() + "/dir_" + i;
+ String tdir = ServerConstants.getTablesDirs()[0] + "/" + extent.getTableId() + "/dir_" + i;
MetadataTableUtil.addTablet(extent, tdir, context, TabletTime.LOGICAL_TIME_ID, zl);
SortedMap<FileRef,DataFileValue> mapFiles = new TreeMap<FileRef,DataFileValue>();
mapFiles.put(new FileRef(tdir + "/" + RFile.EXTENSION + "_000_000"), new DataFileValue(1000017 + i, 10000 + i));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
index a4678a7..504a5d9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java
@@ -40,7 +40,6 @@ import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import org.hamcrest.CoreMatchers;
import org.junit.Assume;
import org.junit.Test;
@@ -85,7 +84,7 @@ public class TableIT extends AccumuloClusterHarness {
VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
String id = to.tableIdMap().get(tableName);
Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- s.setRange(new KeyExtent(new Text(id), null, null).toMetadataRange());
+ s.setRange(new KeyExtent(id, null, null).toMetadataRange());
s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME);
assertTrue(Iterators.size(s.iterator()) > 0);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
index cd44774..b56b4a5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java
@@ -108,7 +108,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
@Override
public Collection<MergeInfo> merges() {
String tableIdToModify = getConnector().tableOperations().tableIdMap().get(t3);
- return Collections.singletonList(new MergeInfo(new KeyExtent(new Text(tableIdToModify), null, null), MergeInfo.Operation.MERGE));
+ return Collections.singletonList(new MergeInfo(new KeyExtent(tableIdToModify, null, null), MergeInfo.Operation.MERGE));
}
};
assertEquals("Should have 2 tablets that need to be chopped or unassigned", 1, findTabletsNeedingAttention(cloned, state));
@@ -125,7 +125,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
private void addDuplicateLocation(String table, String tableNameToModify) throws TableNotFoundException, MutationsRejectedException {
String tableIdToModify = getConnector().tableOperations().tableIdMap().get(tableNameToModify);
- Mutation m = new Mutation(new KeyExtent(new Text(tableIdToModify), null, null).getMetadataEntry());
+ Mutation m = new Mutation(new KeyExtent(tableIdToModify, null, null).getMetadataEntry());
m.put(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME, new Text("1234567"), new Value("fake:9005".getBytes(UTF_8)));
BatchWriter bw = getConnector().createBatchWriter(table, null);
bw.addMutation(m);
@@ -135,7 +135,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
private void reassignLocation(String table, String tableNameToModify) throws TableNotFoundException, MutationsRejectedException {
String tableIdToModify = getConnector().tableOperations().tableIdMap().get(tableNameToModify);
Scanner scanner = getConnector().createScanner(table, Authorizations.EMPTY);
- scanner.setRange(new KeyExtent(new Text(tableIdToModify), null, null).toMetadataRange());
+ scanner.setRange(new KeyExtent(tableIdToModify, null, null).toMetadataRange());
scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
Entry<Key,Value> entry = scanner.iterator().next();
Mutation m = new Mutation(entry.getKey().getRow());
@@ -150,7 +150,7 @@ public class TabletStateChangeIteratorIT extends SharedMiniClusterBase {
private void removeLocation(String table, String tableNameToModify) throws TableNotFoundException, MutationsRejectedException {
String tableIdToModify = getConnector().tableOperations().tableIdMap().get(tableNameToModify);
BatchDeleter deleter = getConnector().createBatchDeleter(table, Authorizations.EMPTY, 1, new BatchWriterConfig());
- deleter.setRanges(Collections.singleton(new KeyExtent(new Text(tableIdToModify), null, null).toMetadataRange()));
+ deleter.setRanges(Collections.singleton(new KeyExtent(tableIdToModify, null, null).toMetadataRange()));
deleter.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME);
deleter.delete();
deleter.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
index 6475e11..5af9ebe 100644
--- a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
@@ -169,7 +169,7 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase {
Set<String> wals = Collections.singleton(file);
BatchWriter bw = ReplicationTable.getBatchWriter(conn);
Mutation m = new Mutation(file);
- StatusSection.add(m, new Text("1"), ProtobufUtil.toValue(StatusUtil.ingestedUntil(1000)));
+ StatusSection.add(m, "1", ProtobufUtil.toValue(StatusUtil.ingestedUntil(1000)));
bw.addMutation(m);
bw.close();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
index 5ead27d..30584a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
@@ -113,7 +113,7 @@ public class MergeStateIT extends ConfigurableMacBase {
// Create a fake METADATA table with these splits
String splits[] = {"a", "e", "j", "o", "t", "z"};
// create metadata for a table "t" with the splits above
- Text tableId = new Text("t");
+ String tableId = "t";
Text pr = null;
for (String s : splits) {
Text split = new Text(s);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index 1c7ce67..e74aa88 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -77,7 +77,7 @@ public class MetadataBatchScanTest {
splits.add((r.nextLong() & 0x7fffffffffffffffl) % 1000000000000l);
}
- Text tid = new Text("8");
+ String tid = "8";
Text per = null;
ArrayList<KeyExtent> extents = new ArrayList<KeyExtent>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/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 97fbf59..f829b73 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
@@ -482,7 +482,7 @@ public class CollectTabletStats {
List<IterInfo> emptyIterinfo = Collections.emptyList();
Map<String,Map<String,String>> emptySsio = Collections.emptyMap();
- TableConfiguration tconf = aconf.getTableConfiguration(ke.getTableId().toString());
+ TableConfiguration tconf = aconf.getTableConfiguration(ke.getTableId());
reader = createScanIterator(ke, readers, auths, new byte[] {}, new HashSet<Column>(), emptyIterinfo, emptySsio, useTableIterators, tconf);
HashSet<ByteSequence> columnSet = createColumnBSS(columns);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
index 618d720..978110e 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
@@ -73,7 +73,6 @@ import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.server.rpc.TServerUtils;
import org.apache.accumulo.server.rpc.ThriftServerType;
import org.apache.accumulo.server.zookeeper.TransactionWatcher;
-import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import com.beust.jcommander.Parameter;
@@ -267,7 +266,7 @@ public class NullTserver {
String tableId = Tables.getTableId(zki, opts.tableName);
// read the locations for the table
- Range tableRange = new KeyExtent(new Text(tableId), null, null).toMetadataRange();
+ Range tableRange = new KeyExtent(tableId, null, null).toMetadataRange();
MetaDataTableScanner s = new MetaDataTableScanner(context, tableRange);
long randomSessionID = opts.port;
TServerInstance instance = new TServerInstance(addr, randomSessionID);
[3/5] accumulo git commit: ACCUMULO-4145 Eliminate Text wrapping of
tableIDs
Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
index 1ca3e8d..3a9cbc0 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportTest.java
@@ -43,7 +43,7 @@ import org.junit.Before;
import org.junit.Test;
public class ProblemReportTest {
- private static final String TABLE = "table";
+ private static final String TABLE_ID = "table";
private static final String RESOURCE = "resource";
private static final String SERVER = "server";
@@ -63,8 +63,8 @@ public class ProblemReportTest {
@Test
public void testGetters() {
long now = System.currentTimeMillis();
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null, now);
- assertEquals(TABLE, r.getTableName());
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null, now);
+ assertEquals(TABLE_ID, r.getTableName());
assertSame(ProblemType.FILE_READ, r.getProblemType());
assertEquals(RESOURCE, r.getResource());
assertEquals(SERVER, r.getServer());
@@ -75,43 +75,43 @@ public class ProblemReportTest {
@Test
public void testWithException() {
Exception e = new IllegalArgumentException("Oh noes");
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, e);
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, e);
assertEquals("Oh noes", r.getException());
}
@Test
public void testEquals() {
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null);
assertTrue(r.equals(r));
- ProblemReport r2 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ ProblemReport r2 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null);
assertTrue(r.equals(r2));
assertTrue(r2.equals(r));
- ProblemReport rx1 = new ProblemReport(TABLE + "x", ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ ProblemReport rx1 = new ProblemReport(TABLE_ID + "x", ProblemType.FILE_READ, RESOURCE, SERVER, null);
assertFalse(r.equals(rx1));
- ProblemReport rx2 = new ProblemReport(TABLE, ProblemType.FILE_WRITE, RESOURCE, SERVER, null);
+ ProblemReport rx2 = new ProblemReport(TABLE_ID, ProblemType.FILE_WRITE, RESOURCE, SERVER, null);
assertFalse(r.equals(rx2));
- ProblemReport rx3 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE + "x", SERVER, null);
+ ProblemReport rx3 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE + "x", SERVER, null);
assertFalse(r.equals(rx3));
- ProblemReport re1 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER + "x", null);
+ ProblemReport re1 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER + "x", null);
assertTrue(r.equals(re1));
- ProblemReport re2 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, new IllegalArgumentException("yikes"));
+ ProblemReport re2 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, new IllegalArgumentException("yikes"));
assertTrue(r.equals(re2));
}
@Test
public void testEqualsNull() {
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null);
assertFalse(r.equals(null));
}
@Test
public void testHashCode() {
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null);
- ProblemReport r2 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ ProblemReport r2 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null);
assertEquals(r.hashCode(), r2.hashCode());
- ProblemReport re1 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER + "x", null);
+ ProblemReport re1 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER + "x", null);
assertEquals(r.hashCode(), re1.hashCode());
- ProblemReport re2 = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, new IllegalArgumentException("yikes"));
+ ProblemReport re2 = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, new IllegalArgumentException("yikes"));
assertEquals(r.hashCode(), re2.hashCode());
}
@@ -143,8 +143,8 @@ public class ProblemReportTest {
@Test
public void testRemoveFromZooKeeper() throws Exception {
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null);
- byte[] zpathFileName = makeZPathFileName(TABLE, ProblemType.FILE_READ, RESOURCE);
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null);
+ byte[] zpathFileName = makeZPathFileName(TABLE_ID, ProblemType.FILE_READ, RESOURCE);
String path = ZooUtil.getRoot("instance") + Constants.ZPROBLEMS + "/" + Encoding.encodeAsBase64FileName(new Text(zpathFileName));
zoorw.recursiveDelete(path, NodeMissingPolicy.SKIP);
replay(zoorw);
@@ -156,8 +156,8 @@ public class ProblemReportTest {
@Test
public void testSaveToZooKeeper() throws Exception {
long now = System.currentTimeMillis();
- r = new ProblemReport(TABLE, ProblemType.FILE_READ, RESOURCE, SERVER, null, now);
- byte[] zpathFileName = makeZPathFileName(TABLE, ProblemType.FILE_READ, RESOURCE);
+ r = new ProblemReport(TABLE_ID, ProblemType.FILE_READ, RESOURCE, SERVER, null, now);
+ byte[] zpathFileName = makeZPathFileName(TABLE_ID, ProblemType.FILE_READ, RESOURCE);
String path = ZooUtil.getRoot("instance") + Constants.ZPROBLEMS + "/" + Encoding.encodeAsBase64FileName(new Text(zpathFileName));
byte[] encoded = encodeReportData(now, SERVER, null);
expect(zoorw.putPersistentData(eq(path), aryEq(encoded), eq(NodeExistsPolicy.OVERWRITE))).andReturn(true);
@@ -169,7 +169,7 @@ public class ProblemReportTest {
@Test
public void testDecodeZooKeeperEntry() throws Exception {
- byte[] zpathFileName = makeZPathFileName(TABLE, ProblemType.FILE_READ, RESOURCE);
+ byte[] zpathFileName = makeZPathFileName(TABLE_ID, ProblemType.FILE_READ, RESOURCE);
String node = Encoding.encodeAsBase64FileName(new Text(zpathFileName));
long now = System.currentTimeMillis();
byte[] encoded = encodeReportData(now, SERVER, "excmsg");
@@ -178,7 +178,7 @@ public class ProblemReportTest {
replay(zoorw);
r = ProblemReport.decodeZooKeeperEntry(node, zoorw, instance);
- assertEquals(TABLE, r.getTableName());
+ assertEquals(TABLE_ID, r.getTableName());
assertSame(ProblemType.FILE_READ, r.getProblemType());
assertEquals(RESOURCE, r.getResource());
assertEquals(SERVER, r.getServer());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
index 76d0171..1bcf165 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
@@ -37,7 +37,7 @@ import org.junit.Before;
import org.junit.Test;
public class ProblemReportingIteratorTest {
- private static final String TABLE = "table";
+ private static final String TABLE_ID = "table";
private static final String RESOURCE = "resource";
private InterruptibleIterator ii;
@@ -46,7 +46,7 @@ public class ProblemReportingIteratorTest {
@Before
public void setUp() throws Exception {
ii = EasyMock.createMock(InterruptibleIterator.class);
- pri = new ProblemReportingIterator(null, TABLE, RESOURCE, false, ii);
+ pri = new ProblemReportingIterator(null, TABLE_ID, RESOURCE, false, ii);
}
@Test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
index ab799ec..7a665b3 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
@@ -39,7 +39,7 @@ public class AdminCommandsTest {
public void testCheckTabletsCommand() {
Admin.CheckTabletsCommand cmd = new Admin.CheckTabletsCommand();
assertFalse(cmd.fixFiles);
- assertNull(cmd.table);
+ assertNull(cmd.tableName);
}
@Test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
index 59720e9..828732d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/ReplicationTableUtilTest.java
@@ -91,7 +91,7 @@ public class ReplicationTableUtilTest {
String myFile = "file:////home/user/accumulo/wal/server+port/" + uuid;
long createdTime = System.currentTimeMillis();
- ReplicationTableUtil.updateFiles(context, new KeyExtent(new Text("1"), null, null), myFile, StatusUtil.fileCreated(createdTime));
+ ReplicationTableUtil.updateFiles(context, new KeyExtent("1", null, null), myFile, StatusUtil.fileCreated(createdTime));
verify(writer);
@@ -116,7 +116,7 @@ public class ReplicationTableUtilTest {
String file = "file:///accumulo/wal/127.0.0.1+9997" + UUID.randomUUID();
Path filePath = new Path(file);
Text row = new Text(filePath.toString());
- KeyExtent extent = new KeyExtent(new Text("1"), new Text("b"), new Text("a"));
+ KeyExtent extent = new KeyExtent("1", new Text("b"), new Text("a"));
Mutation m = ReplicationTableUtil.createUpdateMutation(filePath, ProtobufUtil.toValue(stat), extent);
@@ -125,7 +125,7 @@ public class ReplicationTableUtilTest {
ColumnUpdate col = m.getUpdates().get(0);
Assert.assertEquals(MetadataSchema.ReplicationSection.COLF, new Text(col.getColumnFamily()));
- Assert.assertEquals(extent.getTableId(), new Text(col.getColumnQualifier()));
+ Assert.assertEquals(extent.getTableId(), new Text(col.getColumnQualifier()).toString());
Assert.assertEquals(0, col.getColumnVisibility().length);
Assert.assertArrayEquals(stat.toByteArray(), col.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
index 1548fa1..14933fb 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java
@@ -92,7 +92,7 @@ public class GarbageCollectionTest {
}
public Key newFileReferenceKey(String tableId, String endRow, String file) {
- String row = new KeyExtent(new Text(tableId), endRow == null ? null : new Text(endRow), null).getMetadataEntry().toString();
+ String row = new KeyExtent(tableId, endRow == null ? null : new Text(endRow), null).getMetadataEntry().toString();
String cf = MetadataSchema.TabletsSection.DataFileColumnFamily.NAME.toString();
String cq = file;
Key key = new Key(row, cf, cq);
@@ -110,7 +110,7 @@ public class GarbageCollectionTest {
}
Key newDirReferenceKey(String tableId, String endRow) {
- String row = new KeyExtent(new Text(tableId), endRow == null ? null : new Text(endRow), null).getMetadataEntry().toString();
+ String row = new KeyExtent(tableId, endRow == null ? null : new Text(endRow), null).getMetadataEntry().toString();
String cf = MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily().toString();
String cq = MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnQualifier().toString();
Key key = new Key(row, cf, cq);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index f719748..acc1d4e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -149,7 +149,6 @@ import org.apache.accumulo.start.classloader.vfs.ContextManager;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
-import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TTransportException;
@@ -174,8 +173,6 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
final static Logger log = LoggerFactory.getLogger(Master.class);
final static int ONE_SECOND = 1000;
- final private static Text METADATA_TABLE_ID = new Text(MetadataTable.ID);
- final private static Text ROOT_TABLE_ID = new Text(RootTable.ID);
final static long TIME_TO_WAIT_BETWEEN_SCANS = 60 * ONE_SECOND;
final private static long TIME_BETWEEN_MIGRATION_CLEANUPS = 5 * 60 * ONE_SECOND;
final static long WAIT_BETWEEN_ERRORS = ONE_SECOND;
@@ -509,7 +506,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
}
}
- private int assignedOrHosted(Text tableId) {
+ private int assignedOrHosted(String tableId) {
int result = 0;
for (TabletGroupWatcher watcher : watchers) {
TableCounts count = watcher.getStats(tableId);
@@ -529,7 +526,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
}
private int nonMetaDataTabletsAssignedOrHosted() {
- return totalAssignedOrHosted() - assignedOrHosted(new Text(MetadataTable.ID)) - assignedOrHosted(new Text(RootTable.ID));
+ return totalAssignedOrHosted() - assignedOrHosted(MetadataTable.ID) - assignedOrHosted(RootTable.ID);
}
private int notHosted() {
@@ -550,10 +547,10 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
// Count offline tablets for online tables
for (TabletGroupWatcher watcher : watchers) {
TableManager manager = TableManager.getInstance();
- for (Entry<Text,TableCounts> entry : watcher.getStats().entrySet()) {
- Text tableId = entry.getKey();
+ for (Entry<String,TableCounts> entry : watcher.getStats().entrySet()) {
+ String tableId = entry.getKey();
TableCounts counts = entry.getValue();
- TableState tableState = manager.getTableState(tableId.toString());
+ TableState tableState = manager.getTableState(tableId);
if (tableState != null && tableState.equals(TableState.ONLINE)) {
result += counts.unassigned() + counts.assignedToDeadServers() + counts.assigned();
}
@@ -563,13 +560,13 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
case SAFE_MODE:
// Count offline tablets for the metadata table
for (TabletGroupWatcher watcher : watchers) {
- result += watcher.getStats(METADATA_TABLE_ID).unassigned();
+ result += watcher.getStats(MetadataTable.ID).unassigned();
}
break;
case UNLOAD_METADATA_TABLETS:
case UNLOAD_ROOT_TABLET:
for (TabletGroupWatcher watcher : watchers) {
- result += watcher.getStats(METADATA_TABLE_ID).unassigned();
+ result += watcher.getStats(MetadataTable.ID).unassigned();
}
break;
default:
@@ -635,10 +632,10 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
return tserverSet.getConnection(server);
}
- public MergeInfo getMergeInfo(Text tableId) {
+ public MergeInfo getMergeInfo(String tableId) {
synchronized (mergeLock) {
try {
- String path = ZooUtil.getRoot(getInstance().getInstanceID()) + Constants.ZTABLES + "/" + tableId.toString() + "/merge";
+ String path = ZooUtil.getRoot(getInstance().getInstanceID()) + Constants.ZTABLES + "/" + tableId + "/merge";
if (!ZooReaderWriter.getInstance().exists(path))
return new MergeInfo();
byte[] data = ZooReaderWriter.getInstance().getData(path, new Stat());
@@ -659,7 +656,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
public void setMergeState(MergeInfo info, MergeState state) throws IOException, KeeperException, InterruptedException {
synchronized (mergeLock) {
- String path = ZooUtil.getRoot(getInstance().getInstanceID()) + Constants.ZTABLES + "/" + info.getExtent().getTableId().toString() + "/merge";
+ String path = ZooUtil.getRoot(getInstance().getInstanceID()) + Constants.ZTABLES + "/" + info.getExtent().getTableId() + "/merge";
info.setState(state);
if (state.equals(MergeState.NONE)) {
ZooReaderWriter.getInstance().recursiveDelete(path, NodeMissingPolicy.SKIP);
@@ -678,9 +675,9 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
nextEvent.event("Merge state of %s set to %s", info.getExtent(), state);
}
- public void clearMergeState(Text tableId) throws IOException, KeeperException, InterruptedException {
+ public void clearMergeState(String tableId) throws IOException, KeeperException, InterruptedException {
synchronized (mergeLock) {
- String path = ZooUtil.getRoot(getInstance().getInstanceID()) + Constants.ZTABLES + "/" + tableId.toString() + "/merge";
+ String path = ZooUtil.getRoot(getInstance().getInstanceID()) + Constants.ZTABLES + "/" + tableId + "/merge";
ZooReaderWriter.getInstance().recursiveDelete(path, NodeMissingPolicy.SKIP);
mergeLock.notifyAll();
}
@@ -721,7 +718,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
Iterator<KeyExtent> iterator = migrations.keySet().iterator();
while (iterator.hasNext()) {
KeyExtent extent = iterator.next();
- if (extent.getTableId().toString().equals(tableId)) {
+ if (extent.getTableId().equals(tableId)) {
iterator.remove();
}
}
@@ -756,7 +753,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
}
TabletGoalState getTableGoalState(KeyExtent extent) {
- TableState tableState = TableManager.getInstance().getTableState(extent.getTableId().toString());
+ TableState tableState = TableManager.getInstance().getTableState(extent.getTableId());
if (tableState == null)
return TabletGoalState.DELETED;
switch (tableState) {
@@ -925,19 +922,19 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
}
break;
case UNLOAD_METADATA_TABLETS: {
- int count = assignedOrHosted(METADATA_TABLE_ID);
+ int count = assignedOrHosted(MetadataTable.ID);
log.debug(String.format("There are %d metadata tablets assigned or hosted", count));
if (count == 0 && goodStats())
setMasterState(MasterState.UNLOAD_ROOT_TABLET);
}
break;
case UNLOAD_ROOT_TABLET: {
- int count = assignedOrHosted(METADATA_TABLE_ID);
+ int count = assignedOrHosted(MetadataTable.ID);
if (count > 0 && goodStats()) {
log.debug(String.format("%d metadata tablets online", count));
setMasterState(MasterState.UNLOAD_ROOT_TABLET);
}
- int root_count = assignedOrHosted(ROOT_TABLE_ID);
+ int root_count = assignedOrHosted(RootTable.ID);
if (root_count > 0 && goodStats())
log.debug("The root tablet is still assigned or hosted");
if (count + root_count == 0 && goodStats()) {
@@ -1501,7 +1498,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
public Collection<MergeInfo> merges() {
List<MergeInfo> result = new ArrayList<MergeInfo>();
for (String tableId : Tables.getIdToNameMap(getInstance()).keySet()) {
- result.add(getMergeInfo(new Text(tableId)));
+ result.add(getMergeInfo(tableId));
}
return result;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index ad70b96..590f483 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -177,7 +177,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma
scanner.setRange(MetadataSchema.TabletsSection.getRange());
} else {
scanner = new IsolatedScanner(conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
- Range range = new KeyExtent(new Text(tableId), null, ByteBufferUtil.toText(startRow)).toMetadataRange();
+ Range range = new KeyExtent(tableId, null, ByteBufferUtil.toText(startRow)).toMetadataRange();
scanner.setRange(range.clip(MetadataSchema.TabletsSection.getRange()));
}
TabletsSection.ServerColumnFamily.FLUSH_COLUMN.fetch(scanner);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index d1272e8..e8df759 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.master;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import static java.lang.Math.min;
import java.io.IOException;
@@ -91,7 +92,6 @@ import org.apache.thrift.TException;
import com.google.common.base.Optional;
import com.google.common.collect.Iterators;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
class TabletGroupWatcher extends Daemon {
// Constants used to make sure assignment logging isn't excessive in quantity or size
@@ -111,7 +111,7 @@ class TabletGroupWatcher extends Daemon {
this.dependentWatcher = dependentWatcher;
}
- Map<Text,TableCounts> getStats() {
+ Map<String,TableCounts> getStats() {
return stats.getLast();
}
@@ -120,7 +120,7 @@ class TabletGroupWatcher extends Daemon {
return masterState;
}
- TableCounts getStats(Text tableId) {
+ TableCounts getStats(String tableId) {
return stats.getLast(tableId);
}
@@ -142,8 +142,8 @@ class TabletGroupWatcher extends Daemon {
int unloaded = 0;
ClosableIterator<TabletLocationState> iter = null;
try {
- Map<Text,MergeStats> mergeStatsCache = new HashMap<Text,MergeStats>();
- Map<Text,MergeStats> currentMerges = new HashMap<Text,MergeStats>();
+ Map<String,MergeStats> mergeStatsCache = new HashMap<String,MergeStats>();
+ Map<String,MergeStats> currentMerges = new HashMap<String,MergeStats>();
for (MergeInfo merge : master.merges()) {
if (merge.getExtent() != null) {
currentMerges.put(merge.getExtent().getTableId(), new MergeStats(merge));
@@ -184,7 +184,7 @@ class TabletGroupWatcher extends Daemon {
}
Master.log.debug(store.name() + " location State: " + tls);
// ignore entries for tables that do not exist in zookeeper
- if (TableManager.getInstance().getTableState(tls.extent.getTableId().toString()) == null)
+ if (TableManager.getInstance().getTableState(tls.extent.getTableId()) == null)
continue;
if (Master.log.isTraceEnabled())
@@ -200,7 +200,7 @@ class TabletGroupWatcher extends Daemon {
unloaded = 0;
eventListener.waitForEvents(Master.TIME_TO_WAIT_BETWEEN_SCANS);
}
- Text tableId = tls.extent.getTableId();
+ String tableId = tls.extent.getTableId();
MergeStats mergeStats = mergeStatsCache.get(tableId);
if (mergeStats == null) {
mergeStats = currentMerges.get(tableId);
@@ -278,7 +278,7 @@ class TabletGroupWatcher extends Daemon {
switch (state) {
case UNASSIGNED:
TServerInstance dest = this.master.migrations.get(tls.extent);
- TableState tableState = TableManager.getInstance().getTableState(tls.extent.getTableId().toString());
+ TableState tableState = TableManager.getInstance().getTableState(tls.extent.getTableId());
if (dest != null && tableState == TableState.OFFLINE) {
this.master.migrations.remove(tls.extent);
}
@@ -478,7 +478,7 @@ class TabletGroupWatcher extends Daemon {
}
}
- private void updateMergeState(Map<Text,MergeStats> mergeStatsCache) {
+ private void updateMergeState(Map<String,MergeStats> mergeStatsCache) {
for (MergeStats stats : mergeStatsCache.values()) {
try {
MergeState update = stats.nextMergeState(this.master.getConnector(), this.master);
@@ -587,7 +587,7 @@ class TabletGroupWatcher extends Daemon {
} else {
// Recreate the default tablet to hold the end of the table
Master.log.debug("Recreating the last tablet to point to " + extent.getPrevEndRow());
- String tdir = master.getFileSystem().choose(Optional.of(extent.getTableId().toString()), ServerConstants.getBaseUris()) + Constants.HDFS_TABLES_DIR
+ String tdir = master.getFileSystem().choose(Optional.of(extent.getTableId()), ServerConstants.getBaseUris()) + Constants.HDFS_TABLES_DIR
+ Path.SEPARATOR + extent.getTableId() + Constants.DEFAULT_TABLET_LOCATION;
MetadataTableUtil.addTablet(new KeyExtent(extent.getTableId(), null, extent.getPrevEndRow()), tdir, master, timeType, this.master.masterLock);
}
@@ -639,7 +639,7 @@ class TabletGroupWatcher extends Daemon {
} else if (TabletsSection.ServerColumnFamily.TIME_COLUMN.hasColumns(key)) {
maxLogicalTime = TabletTime.maxMetadataTime(maxLogicalTime, value.toString());
} else if (TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.hasColumns(key)) {
- bw.addMutation(MetadataTableUtil.createDeleteMutation(range.getTableId().toString(), entry.getValue().toString()));
+ bw.addMutation(MetadataTableUtil.createDeleteMutation(range.getTableId(), entry.getValue().toString()));
}
}
@@ -739,7 +739,7 @@ class TabletGroupWatcher extends Daemon {
}
Entry<Key,Value> entry = iterator.next();
KeyExtent highTablet = new KeyExtent(entry.getKey().getRow(), KeyExtent.decodePrevEndRow(entry.getValue()));
- if (highTablet.getTableId() != range.getTableId()) {
+ if (!highTablet.getTableId().equals(range.getTableId())) {
throw new AccumuloException("No last tablet for merge " + range + " " + highTablet);
}
return highTablet;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java b/server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java
index c40743e..e394b57 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/FinishedWorkUpdater.java
@@ -145,10 +145,10 @@ public class FinishedWorkUpdater implements Runnable {
Value serializedUpdatedStatus = ProtobufUtil.toValue(updatedStatus);
// Pull the sourceTableId into a Text
- buffer.set(entry.getKey());
+ String srcTableId = entry.getKey();
// Make the mutation
- StatusSection.add(replMutation, buffer, serializedUpdatedStatus);
+ StatusSection.add(replMutation, srcTableId, serializedUpdatedStatus);
log.debug("Updating replication status entry for {} with {}", serializedRow.getKey().getRow(), ProtobufUtil.toString(updatedStatus));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java b/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
index 1ebe65f..4a0ed52 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
@@ -90,7 +90,7 @@ public class StatusMaker {
s.fetchColumnFamily(ReplicationSection.COLF);
s.setRange(ReplicationSection.getRange());
- Text file = new Text(), tableId = new Text();
+ Text file = new Text();
for (Entry<Key,Value> entry : s) {
// Get a writer to the replication table
if (null == replicationWriter) {
@@ -106,7 +106,7 @@ public class StatusMaker {
}
// Extract the useful bits from the status key
MetadataSchema.ReplicationSection.getFile(entry.getKey(), file);
- MetadataSchema.ReplicationSection.getTableId(entry.getKey(), tableId);
+ String tableId = MetadataSchema.ReplicationSection.getTableId(entry.getKey());
Status status;
try {
@@ -158,10 +158,10 @@ public class StatusMaker {
/**
* Create a status record in the replication table
*/
- protected boolean addStatusRecord(Text file, Text tableId, Value v) {
+ protected boolean addStatusRecord(Text file, String tableId, Value v) {
try {
Mutation m = new Mutation(file);
- m.put(StatusSection.NAME, tableId, v);
+ m.put(StatusSection.NAME, new Text(tableId), v);
try {
replicationWriter.addMutation(m);
@@ -194,7 +194,7 @@ public class StatusMaker {
* @param value
* Serialized version of the Status msg
*/
- protected boolean addOrderRecord(Text file, Text tableId, Status stat, Value value) {
+ protected boolean addOrderRecord(Text file, String tableId, Status stat, Value value) {
try {
if (!stat.hasCreatedTime()) {
log.error("Status record ({}) for {} in table {} was written to metadata table which lacked createdTime", ProtobufUtil.toString(stat), file, tableId);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
index 6fbd949..6c5645d 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java
@@ -89,11 +89,11 @@ public class WorkMaker {
TableConfiguration tableConf;
- Text file = new Text(), tableId = new Text();
+ Text file = new Text();
for (Entry<Key,Value> entry : s) {
// Extract the useful bits from the status key
ReplicationSchema.StatusSection.getFile(entry.getKey(), file);
- ReplicationSchema.StatusSection.getTableId(entry.getKey(), tableId);
+ String tableId = ReplicationSchema.StatusSection.getTableId(entry.getKey());
log.info("Processing replication status record for " + file + " on table " + tableId);
Status status;
@@ -112,7 +112,7 @@ public class WorkMaker {
}
// Get the table configuration for the table specified by the status record
- tableConf = context.getServerConfigurationFactory().getTableConfiguration(tableId.toString());
+ tableConf = context.getServerConfigurationFactory().getTableConfiguration(tableId);
// getTableConfiguration(String) returns null if the table no longer exists
if (null == tableConf) {
@@ -129,7 +129,7 @@ public class WorkMaker {
if (!replicationTargets.isEmpty()) {
Span workSpan = Trace.start("createWorkMutations");
try {
- addWorkRecord(file, entry.getValue(), replicationTargets, tableId.toString());
+ addWorkRecord(file, entry.getValue(), replicationTargets, tableId);
} finally {
workSpan.stop();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
index f1763be..a89100e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
@@ -185,7 +185,7 @@ public class MergeStats {
if (start == null) {
start = new Text();
}
- Text tableId = extent.getTableId();
+ String tableId = extent.getTableId();
Text first = KeyExtent.getMetadataEntry(tableId, start);
Range range = new Range(first, false, null, true);
scanner.setRange(range.clip(MetadataSchema.TabletsSection.getRange()));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
index 8d87896..1fe72a3 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/TableStats.java
@@ -21,21 +21,20 @@ import java.util.Map;
import org.apache.accumulo.core.master.thrift.MasterState;
import org.apache.accumulo.server.master.state.TabletState;
-import org.apache.hadoop.io.Text;
public class TableStats {
- private Map<Text,TableCounts> last = new HashMap<Text,TableCounts>();
- private Map<Text,TableCounts> next;
+ private Map<String,TableCounts> last = new HashMap<String,TableCounts>();
+ private Map<String,TableCounts> next;
private long startScan = 0;
private long endScan = 0;
private MasterState state;
public synchronized void begin() {
- next = new HashMap<Text,TableCounts>();
+ next = new HashMap<String,TableCounts>();
startScan = System.currentTimeMillis();
}
- public synchronized void update(Text tableId, TabletState state) {
+ public synchronized void update(String tableId, TabletState state) {
TableCounts counts = next.get(tableId);
if (counts == null) {
counts = new TableCounts();
@@ -51,7 +50,7 @@ public class TableStats {
this.state = state;
}
- public synchronized Map<Text,TableCounts> getLast() {
+ public synchronized Map<String,TableCounts> getLast() {
return last;
}
@@ -59,7 +58,7 @@ public class TableStats {
return state;
}
- public synchronized TableCounts getLast(Text tableId) {
+ public synchronized TableCounts getLast(String tableId) {
TableCounts result = last.get(tableId);
if (result == null)
return new TableCounts();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
index f221775..6685eaf 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CleanUp.java
@@ -52,7 +52,6 @@ import org.apache.accumulo.server.tables.TableManager;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +89,7 @@ class CleanUp extends MasterRepo {
}
boolean done = true;
- Range tableRange = new KeyExtent(new Text(tableId), null, null).toMetadataRange();
+ Range tableRange = new KeyExtent(tableId, null, null).toMetadataRange();
Scanner scanner = master.getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
MetaDataTableScanner.configureScanner(scanner, master);
scanner.setRange(tableRange);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
index f4fe037..2346ecc 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactionDriver.java
@@ -90,7 +90,7 @@ class CompactionDriver extends MasterRepo {
scanner.setRange(MetadataSchema.TabletsSection.getRange());
} else {
scanner = new IsolatedScanner(conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
- Range range = new KeyExtent(new Text(tableId), null, startRow == null ? null : new Text(startRow)).toMetadataRange();
+ Range range = new KeyExtent(tableId, null, startRow == null ? null : new Text(startRow)).toMetadataRange();
scanner.setRange(range);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
index e57a678..068aa81 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CopyFailed.java
@@ -44,7 +44,6 @@ import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,7 +112,7 @@ class CopyFailed extends MasterRepo {
// determine which failed files were loaded
Connector conn = master.getConnector();
Scanner mscanner = new IsolatedScanner(conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
- mscanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
+ mscanner.setRange(new KeyExtent(tableId, null, null).toMetadataRange());
mscanner.fetchColumnFamily(TabletsSection.BulkFileColumnFamily.NAME);
for (Entry<Key,Value> entry : mscanner) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
index 45a370d..564f6d0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadata.java
@@ -20,7 +20,6 @@ import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.master.Master;
import org.apache.accumulo.server.util.MetadataTableUtil;
-import org.apache.hadoop.io.Text;
class PopulateMetadata extends MasterRepo {
@@ -39,7 +38,7 @@ class PopulateMetadata extends MasterRepo {
@Override
public Repo<Master> call(long tid, Master environment) throws Exception {
- KeyExtent extent = new KeyExtent(new Text(tableInfo.tableId), null, null);
+ KeyExtent extent = new KeyExtent(tableInfo.tableId, null, null);
MetadataTableUtil.addTablet(extent, tableInfo.dir, environment, tableInfo.timeType, environment.getMasterLock());
return new FinishCreateTable(tableInfo);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
index 6e19b61..9e596f8 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/PopulateMetadataTable.java
@@ -125,7 +125,7 @@ class PopulateMetadataTable extends MasterRepo {
val.readFields(in);
Text endRow = new KeyExtent(key.getRow(), (Text) null).getEndRow();
- Text metadataRow = new KeyExtent(new Text(tableInfo.tableId), endRow, null).getMetadataEntry();
+ Text metadataRow = new KeyExtent(tableInfo.tableId, endRow, null).getMetadataEntry();
Text cq;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java
index ca8a171..e2e7018 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOp.java
@@ -65,7 +65,6 @@ public class TableRangeOp extends MasterRepo {
Text start = startRow.length == 0 ? null : new Text(startRow);
Text end = endRow.length == 0 ? null : new Text(endRow);
- Text tableIdText = new Text(tableId);
if (start != null && end != null)
if (start.compareTo(end) >= 0)
@@ -74,10 +73,10 @@ public class TableRangeOp extends MasterRepo {
env.mustBeOnline(tableId);
- MergeInfo info = env.getMergeInfo(tableIdText);
+ MergeInfo info = env.getMergeInfo(tableId);
if (info.getState() == MergeState.NONE) {
- KeyExtent range = new KeyExtent(tableIdText, end, start);
+ KeyExtent range = new KeyExtent(tableId, end, start);
env.setMergeState(new MergeInfo(range, op), MergeState.STARTED);
}
@@ -88,11 +87,10 @@ public class TableRangeOp extends MasterRepo {
public void undo(long tid, Master env) throws Exception {
String namespaceId = Tables.getNamespaceId(env.getInstance(), tableId);
// Not sure this is a good thing to do. The Master state engine should be the one to remove it.
- Text tableIdText = new Text(tableId);
- MergeInfo mergeInfo = env.getMergeInfo(tableIdText);
+ MergeInfo mergeInfo = env.getMergeInfo(tableId);
if (mergeInfo.getState() != MergeState.NONE)
log.info("removing merge information " + mergeInfo);
- env.clearMergeState(tableIdText);
+ env.clearMergeState(tableId);
Utils.unreserveNamespace(namespaceId, tid, false);
Utils.unreserveTable(tableId, tid, true);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java
index 668c790..a7c82b1 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/TableRangeOpWait.java
@@ -21,7 +21,6 @@ import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.master.Master;
import org.apache.accumulo.server.master.state.MergeInfo;
import org.apache.accumulo.server.master.state.MergeState;
-import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,8 +49,7 @@ class TableRangeOpWait extends MasterRepo {
@Override
public long isReady(long tid, Master env) throws Exception {
- Text tableIdText = new Text(tableId);
- if (!env.getMergeInfo(tableIdText).getState().equals(MergeState.NONE)) {
+ if (!env.getMergeInfo(tableId).getState().equals(MergeState.NONE)) {
return 50;
}
return 0;
@@ -60,10 +58,9 @@ class TableRangeOpWait extends MasterRepo {
@Override
public Repo<Master> call(long tid, Master master) throws Exception {
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
- Text tableIdText = new Text(tableId);
- MergeInfo mergeInfo = master.getMergeInfo(tableIdText);
+ MergeInfo mergeInfo = master.getMergeInfo(tableId);
log.info("removing merge information " + mergeInfo);
- master.clearMergeState(tableIdText);
+ master.clearMergeState(tableId);
Utils.unreserveNamespace(namespaceId, tid, false);
Utils.unreserveTable(tableId, tid, true);
return null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
index 78ed2c0..3ea2767 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java
@@ -59,7 +59,6 @@ import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
class WriteExportFiles extends MasterRepo {
@@ -93,7 +92,7 @@ class WriteExportFiles extends MasterRepo {
checkOffline(conn);
Scanner metaScanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
- metaScanner.setRange(new KeyExtent(new Text(tableInfo.tableID), null, null).toMetadataRange());
+ metaScanner.setRange(new KeyExtent(tableInfo.tableID, null, null).toMetadataRange());
// scan for locations
metaScanner.fetchColumnFamily(TabletsSection.CurrentLocationColumnFamily.NAME);
@@ -209,7 +208,7 @@ class WriteExportFiles extends MasterRepo {
metaScanner.fetchColumnFamily(DataFileColumnFamily.NAME);
TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(metaScanner);
TabletsSection.ServerColumnFamily.TIME_COLUMN.fetch(metaScanner);
- metaScanner.setRange(new KeyExtent(new Text(tableID), null, null).toMetadataRange());
+ metaScanner.setRange(new KeyExtent(tableID, null, null).toMetadataRange());
for (Entry<Key,Value> entry : metaScanner) {
entry.getKey().write(dataOut);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
index 4002da5..0a78d59 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/state/RootTabletStateStoreTest.java
@@ -36,7 +36,6 @@ import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.server.master.state.TabletLocationState.BadLocationStateException;
import org.apache.accumulo.server.master.state.ZooTabletStateStore;
-import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
@@ -191,7 +190,7 @@ public class RootTabletStateStoreTest {
}
assertEquals(count, 1);
- KeyExtent notRoot = new KeyExtent(new Text("0"), null, null);
+ KeyExtent notRoot = new KeyExtent("0", null, null);
try {
tstore.setLocations(Collections.singletonList(new Assignment(notRoot, server)));
Assert.fail("should not get here");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
index 16b05d4..c01a6a9 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
@@ -166,7 +166,7 @@ public class TServersServlet extends BasicServlet {
ActionStatsUpdator.update(total.majors, info.majors);
KeyExtent extent = new KeyExtent(info.extent);
- String tableId = extent.getTableId().toString();
+ String tableId = extent.getTableId();
MessageDigest digester = MessageDigest.getInstance("MD5");
if (extent.getEndRow() != null && extent.getEndRow().getLength() > 0) {
digester.update(extent.getEndRow().getBytes(), 0, extent.getEndRow().getLength());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index cb177ac..1431698 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -150,8 +150,8 @@ public class TablesServlet extends BasicServlet {
locs.add(instance.getRootTabletLocation());
} else {
String systemTableName = MetadataTable.ID.equals(tableId) ? RootTable.NAME : MetadataTable.NAME;
- MetaDataTableScanner scanner = new MetaDataTableScanner(Monitor.getContext(), new Range(KeyExtent.getMetadataEntry(new Text(tableId), new Text()),
- KeyExtent.getMetadataEntry(new Text(tableId), null)), systemTableName);
+ MetaDataTableScanner scanner = new MetaDataTableScanner(Monitor.getContext(), new Range(KeyExtent.getMetadataEntry(tableId, new Text()),
+ KeyExtent.getMetadataEntry(tableId, null)), systemTableName);
while (scanner.hasNext()) {
TabletLocationState state = scanner.next();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index 522ebb6..caf70a1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -26,7 +26,7 @@ import org.apache.accumulo.monitor.util.celltypes.CellType;
import org.apache.accumulo.monitor.util.celltypes.StringType;
public class Table {
- private String table;
+ private String tableName;
private String caption;
private String captionclass;
private String subcaption;
@@ -39,7 +39,7 @@ public class Table {
}
public Table(String tableName, String caption, String captionClass) {
- this.table = tableName;
+ this.tableName = tableName;
this.caption = caption;
this.captionclass = captionClass;
this.subcaption = null;
@@ -109,8 +109,8 @@ public class Table {
if (row.size() != columns.size())
throw new RuntimeException("Each row must have the same number of columns");
- boolean sortAscending = !"false".equals(BasicServlet.getCookieValue(req, "tableSort." + BasicServlet.encode(page) + "." + BasicServlet.encode(table) + "."
- + "sortAsc"));
+ boolean sortAscending = !"false".equals(BasicServlet.getCookieValue(req, "tableSort." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName)
+ + "." + "sortAsc"));
int sortCol = -1; // set to first sortable column by default
int numLegends = 0;
@@ -124,7 +124,7 @@ public class Table {
// only get cookie if there is a possibility that it is sortable
if (sortCol >= 0) {
- String sortColStr = BasicServlet.getCookieValue(req, "tableSort." + BasicServlet.encode(page) + "." + BasicServlet.encode(table) + "." + "sortCol");
+ String sortColStr = BasicServlet.getCookieValue(req, "tableSort." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "." + "sortCol");
if (sortColStr != null) {
try {
int col = Integer.parseInt(sortColStr);
@@ -139,13 +139,13 @@ public class Table {
boolean showLegend = false;
if (numLegends > 0) {
- String showStr = BasicServlet.getCookieValue(req, "tableLegend." + BasicServlet.encode(page) + "." + BasicServlet.encode(table) + "." + "show");
+ String showStr = BasicServlet.getCookieValue(req, "tableLegend." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "." + "show");
showLegend = showStr != null && Boolean.parseBoolean(showStr);
}
sb.append("<div>\n");
- sb.append("<a name='").append(table).append("'> </a>\n");
- sb.append("<table id='").append(table).append("' class='sortable'>\n");
+ sb.append("<a name='").append(tableName).append("'> </a>\n");
+ sb.append("<table id='").append(tableName).append("' class='sortable'>\n");
sb.append("<caption");
if (captionclass != null && !captionclass.isEmpty())
sb.append(" class='").append(captionclass).append("'");
@@ -157,7 +157,7 @@ public class Table {
String redir = BasicServlet.currentPage(req);
if (numLegends > 0) {
- String legendUrl = String.format("/op?action=toggleLegend&redir=%s&page=%s&table=%s&show=%s", redir, page, table, !showLegend);
+ String legendUrl = String.format("/op?action=toggleLegend&redir=%s&page=%s&table=%s&show=%s", redir, page, tableName, !showLegend);
sb.append("<a href='").append(legendUrl).append("'>").append(showLegend ? "Hide" : "Show").append(" Legend</a>\n");
if (showLegend)
sb.append("<div class='left show'><dl>\n");
@@ -166,7 +166,7 @@ public class Table {
TableColumn<?> col = columns.get(i);
String title = col.getTitle();
if (rows.size() > 1 && col.getCellType().isSortable()) {
- String url = String.format("/op?action=sortTable&redir=%s&page=%s&table=%s&%s=%s", redir, page, table, sortCol == i ? "asc" : "col",
+ String url = String.format("/op?action=sortTable&redir=%s&page=%s&table=%s&%s=%s", redir, page, tableName, sortCol == i ? "asc" : "col",
sortCol == i ? !sortAscending : i);
String img = "";
if (sortCol == i)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index db963a9..f4a99f8 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -86,7 +86,7 @@ public class TraceServer implements Watcher {
final private TServer server;
final private AtomicReference<BatchWriter> writer;
final private Connector connector;
- final String table;
+ final String tableName;
final private static int BATCH_WRITER_MAX_LATENCY = 5;
final private static long SCHEDULE_PERIOD = 1000;
final private static long SCHEDULE_DELAY = 1000;
@@ -182,7 +182,7 @@ public class TraceServer implements Watcher {
log.info("Version " + Constants.VERSION);
log.info("Instance " + serverConfiguration.getInstance().getInstanceID());
AccumuloConfiguration conf = serverConfiguration.getConfiguration();
- table = conf.get(Property.TRACE_TABLE);
+ tableName = conf.get(Property.TRACE_TABLE);
Connector connector = null;
while (true) {
try {
@@ -214,13 +214,13 @@ public class TraceServer implements Watcher {
}
connector = serverConfiguration.getInstance().getConnector(principal, at);
- if (!connector.tableOperations().exists(table)) {
- connector.tableOperations().create(table);
+ if (!connector.tableOperations().exists(tableName)) {
+ connector.tableOperations().create(tableName);
IteratorSetting setting = new IteratorSetting(10, "ageoff", AgeOffFilter.class.getName());
AgeOffFilter.setTTL(setting, 7 * 24 * 60 * 60 * 1000l);
- connector.tableOperations().attachIterator(table, setting);
+ connector.tableOperations().attachIterator(tableName, setting);
}
- connector.tableOperations().setProperty(table, Property.TABLE_FORMATTER_CLASS.getKey(), TraceFormatter.class.getName());
+ connector.tableOperations().setProperty(tableName, Property.TABLE_FORMATTER_CLASS.getKey(), TraceFormatter.class.getName());
break;
} catch (RuntimeException ex) {
log.info("Waiting to checking/create the trace table.", ex);
@@ -240,7 +240,7 @@ public class TraceServer implements Watcher {
options.processor(new Processor<Iface>(new Receiver()));
server = new TThreadPoolServer(options);
registerInZooKeeper(sock.getInetAddress().getHostAddress() + ":" + sock.getLocalPort(), conf.get(Property.TRACE_ZK_PATH));
- writer = new AtomicReference<BatchWriter>(this.connector.createBatchWriter(table,
+ writer = new AtomicReference<BatchWriter>(this.connector.createBatchWriter(tableName,
new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS)));
}
@@ -261,7 +261,7 @@ public class TraceServer implements Watcher {
writer.flush();
} else {
// We don't have a writer. If the table exists, try to make a new writer.
- if (connector.tableOperations().exists(table)) {
+ if (connector.tableOperations().exists(tableName)) {
resetWriter();
}
}
@@ -280,7 +280,7 @@ public class TraceServer implements Watcher {
private void resetWriter() {
BatchWriter writer = null;
try {
- writer = connector.createBatchWriter(table, new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS));
+ writer = connector.createBatchWriter(tableName, new BatchWriterConfig().setMaxLatency(BATCH_WRITER_MAX_LATENCY, TimeUnit.SECONDS));
} catch (Exception ex) {
log.warn("Unable to create a batch writer, will retry. Set log level to DEBUG to see stacktrace. cause: " + ex);
log.debug("batch writer creation failed with exception.", ex);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
index 2227b25..2928418 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java
@@ -322,7 +322,7 @@ public class FileManager {
readersReserved.put(reader, file);
} catch (Exception e) {
- ProblemReports.getInstance(context).report(new ProblemReport(tablet.getTableId().toString(), ProblemType.FILE_READ, file, e));
+ ProblemReports.getInstance(context).report(new ProblemReport(tablet.getTableId(), ProblemType.FILE_READ, file, e));
if (continueOnFailure) {
// release the permit for the file that failed to open
@@ -526,9 +526,9 @@ public class FileManager {
FileDataSource fds = new FileDataSource(filename, source);
dataSources.add(fds);
SourceSwitchingIterator ssi = new SourceSwitchingIterator(fds);
- iter = new ProblemReportingIterator(context, tablet.getTableId().toString(), filename, continueOnFailure, ssi);
+ iter = new ProblemReportingIterator(context, tablet.getTableId(), filename, continueOnFailure, ssi);
} else {
- iter = new ProblemReportingIterator(context, tablet.getTableId().toString(), filename, continueOnFailure, source);
+ iter = new ProblemReportingIterator(context, tablet.getTableId(), filename, continueOnFailure, source);
}
DataFileValue value = files.get(new FileRef(filename));
if (value.isTimeSet()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 1b09841..b854a53 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -598,8 +598,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
if (ss != null) {
long t2 = System.currentTimeMillis();
- log.debug(String.format("ScanSess tid %s %s %,d entries in %.2f secs, nbTimes = [%s] ", TServerUtils.clientAddress.get(), ss.extent.getTableId()
- .toString(), ss.entriesReturned, (t2 - ss.startTime) / 1000.0, ss.nbTimes.toString()));
+ log.debug(String.format("ScanSess tid %s %s %,d entries in %.2f secs, nbTimes = [%s] ", TServerUtils.clientAddress.get(), ss.extent.getTableId(),
+ ss.entriesReturned, (t2 - ss.startTime) / 1000.0, ss.nbTimes.toString()));
if (scanMetrics.isEnabled()) {
scanMetrics.add(TabletServerScanMetrics.SCAN, t2 - ss.startTime);
scanMetrics.add(TabletServerScanMetrics.RESULT_SIZE, ss.entriesReturned);
@@ -754,7 +754,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
// if user has no permission to write to this table, add it to
// the failures list
boolean sameTable = us.currentTablet != null && (us.currentTablet.getExtent().getTableId().equals(keyExtent.getTableId()));
- String tableId = keyExtent.getTableId().toString();
+ String tableId = keyExtent.getTableId();
if (sameTable || security.canWrite(us.getCredentials(), tableId, Tables.getNamespaceId(getInstance(), tableId))) {
long t2 = System.currentTimeMillis();
us.authTimes.addStat(t2 - t1);
@@ -1301,7 +1301,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
}
- Text tid = new Text(cs.tableId);
+ String tid = cs.tableId;
long opid = writeTracker.startWrite(TabletType.type(new KeyExtent(tid, null, null)));
try {
@@ -1395,7 +1395,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
onlineTabletsCopy = new TreeMap<KeyExtent,Tablet>(onlineTablets);
}
List<TabletStats> result = new ArrayList<TabletStats>();
- Text text = new Text(tableId);
+ String text = tableId;
KeyExtent start = new KeyExtent(text, new Text(), null);
for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.tailMap(start).entrySet()) {
KeyExtent ke = entry.getKey();
@@ -1570,7 +1570,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
ArrayList<Tablet> tabletsToFlush = new ArrayList<Tablet>();
- KeyExtent ke = new KeyExtent(new Text(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
+ KeyExtent ke = new KeyExtent(tableId, ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
synchronized (onlineTablets) {
for (Tablet tablet : onlineTablets.values())
@@ -1688,7 +1688,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
throw new RuntimeException(e);
}
- KeyExtent ke = new KeyExtent(new Text(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
+ KeyExtent ke = new KeyExtent(tableId, ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow));
ArrayList<Tablet> tabletsToCompact = new ArrayList<Tablet>();
synchronized (onlineTablets) {
@@ -2160,8 +2160,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
log.warn("{}", e.getMessage());
}
- String table = extent.getTableId().toString();
- ProblemReports.getInstance(TabletServer.this).report(new ProblemReport(table, TABLET_LOAD, extent.getUUID().toString(), getClientAddressString(), e));
+ String tableId = extent.getTableId();
+ ProblemReports.getInstance(TabletServer.this).report(new ProblemReport(tableId, TABLET_LOAD, extent.getUUID().toString(), getClientAddressString(), e));
} finally {
releaseRecoveryMemory(extent);
}
@@ -2759,7 +2759,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
extents = new ArrayList<KeyExtent>(onlineTablets.keySet());
}
- Set<Text> tables = new HashSet<Text>();
+ Set<String> tables = new HashSet<String>();
for (KeyExtent keyExtent : extents) {
tables.add(keyExtent.getTableId());
@@ -2767,7 +2767,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
HashSet<String> contexts = new HashSet<String>();
- for (Text tableid : tables) {
+ for (String tableid : tables) {
String context = getTableConfiguration(new KeyExtent(tableid, null, null)).get(Property.TABLE_CLASSPATH);
if (!context.equals("")) {
contexts.add(context);
@@ -2825,7 +2825,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
Map<String,TableInfo> tables = new HashMap<String,TableInfo>();
for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.entrySet()) {
- String tableId = entry.getKey().getTableId().toString();
+ String tableId = entry.getKey().getTableId();
TableInfo table = tables.get(tableId);
if (table == null) {
table = new TableInfo();
@@ -2878,7 +2878,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
for (KeyExtent extent : offlineTabletsCopy) {
- String tableId = extent.getTableId().toString();
+ String tableId = extent.getTableId();
TableInfo table = tables.get(tableId);
if (table == null) {
table = new TableInfo();
@@ -2984,7 +2984,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
}
public TableConfiguration getTableConfiguration(KeyExtent extent) {
- return confFactory.getTableConfiguration(extent.getTableId().toString());
+ return confFactory.getTableConfiguration(extent.getTableId());
}
public DfsLogger.ServerResources getServerConfig() {
@@ -3035,6 +3035,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable {
// avoid unnecessary redundant markings to meta
final ConcurrentHashMap<DfsLogger,EnumSet<TabletLevel>> metadataTableLogs = new ConcurrentHashMap<>();
final Object levelLocks[] = new Object[TabletLevel.values().length];
+
{
for (int i = 0; i < levelLocks.length; i++) {
levelLocks[i] = new Object();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
index c6733f8..26b1b12 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
@@ -56,15 +56,6 @@ public class MajorCompactionRequest implements Cloneable {
this.files = mcr.files;
}
- /**
- * @return org.apache.accumulo.core.data.KeyExtent
- * @deprecated since 1.7. Use {@link #getTabletId()} instead.
- */
- @Deprecated
- public org.apache.accumulo.core.data.KeyExtent getExtent() {
- return new org.apache.accumulo.core.data.KeyExtent(extent.getTableId(), extent.getEndRow(), extent.getPrevEndRow());
- }
-
public TabletId getTabletId() {
return new TabletIdImpl(extent);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index 6ceba5a..01db8aa 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -84,7 +84,7 @@ public class LogReader {
row = new Text(opts.row);
if (opts.extent != null) {
String sa[] = opts.extent.split(";");
- ke = new KeyExtent(new Text(sa[0]), new Text(sa[1]), new Text(sa[2]));
+ ke = new KeyExtent(sa[0], new Text(sa[1]), new Text(sa[2]));
}
if (opts.regexp != null) {
Pattern pattern = Pattern.compile(opts.regexp);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 328c591..0bd467c 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.tserver.replication;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import static java.util.Objects.requireNonNull;
import java.io.ByteArrayOutputStream;
@@ -82,7 +83,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.net.HostAndPort;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
public class AccumuloReplicaSystem implements ReplicaSystem {
private static final Logger log = LoggerFactory.getLogger(AccumuloReplicaSystem.class);
@@ -671,7 +671,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
switch (key.event) {
case DEFINE_TABLET:
- if (target.getSourceTableId().equals(key.tablet.getTableId().toString())) {
+ if (target.getSourceTableId().equals(key.tablet.getTableId())) {
desiredTids.add(key.tid);
}
break;
@@ -716,7 +716,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
switch (key.event) {
case DEFINE_TABLET:
// For new DEFINE_TABLETs, we also need to record the new tids we see
- if (target.getSourceTableId().equals(key.tablet.getTableId().toString())) {
+ if (target.getSourceTableId().equals(key.tablet.getTableId())) {
desiredTids.add(key.tid);
}
break;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 5fbd1c3..1d9c2f7 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -253,11 +253,11 @@ public class SessionManager {
if (session instanceof ScanSession) {
ScanSession ss = (ScanSession) session;
nbt = ss.nextBatchTask;
- tableID = ss.extent.getTableId().toString();
+ tableID = ss.extent.getTableId();
} else if (session instanceof MultiScanSession) {
MultiScanSession mss = (MultiScanSession) session;
nbt = mss.lookupTask;
- tableID = mss.threadPoolExtent.getTableId().toString();
+ tableID = mss.threadPoolExtent.getTableId();
}
if (nbt == null)
@@ -320,9 +320,8 @@ public class SessionManager {
}
}
- ActiveScan activeScan = new ActiveScan(ss.client, ss.getUser(), ss.extent.getTableId().toString(), ct - ss.startTime, ct - ss.lastAccessTime,
- ScanType.SINGLE, state, ss.extent.toThrift(), Translator.translate(ss.columnSet, Translators.CT), ss.ssiList, ss.ssio,
- ss.auths.getAuthorizationsBB(), ss.context);
+ ActiveScan activeScan = new ActiveScan(ss.client, ss.getUser(), ss.extent.getTableId(), ct - ss.startTime, ct - ss.lastAccessTime, ScanType.SINGLE,
+ state, ss.extent.toThrift(), Translator.translate(ss.columnSet, Translators.CT), ss.ssiList, ss.ssio, ss.auths.getAuthorizationsBB(), ss.context);
// scanId added by ACCUMULO-2641 is an optional thrift argument and not available in ActiveScan constructor
activeScan.setScanId(entry.getKey());
@@ -351,7 +350,7 @@ public class SessionManager {
}
}
- activeScans.add(new ActiveScan(mss.client, mss.getUser(), mss.threadPoolExtent.getTableId().toString(), ct - mss.startTime, ct - mss.lastAccessTime,
+ activeScans.add(new ActiveScan(mss.client, mss.getUser(), mss.threadPoolExtent.getTableId(), ct - mss.startTime, ct - mss.lastAccessTime,
ScanType.BATCH, state, mss.threadPoolExtent.toThrift(), Translator.translate(mss.columnSet, Translators.CT), mss.ssiList, mss.ssio, mss.auths
.getAuthorizationsBB(), mss.context));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
index d8d726b..2ef4a34 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Compactor.java
@@ -284,7 +284,7 @@ public class Compactor implements Callable<CompactionStats> {
readers.add(reader);
- SortedKeyValueIterator<Key,Value> iter = new ProblemReportingIterator(context, extent.getTableId().toString(), mapFile.path().toString(), false, reader);
+ SortedKeyValueIterator<Key,Value> iter = new ProblemReportingIterator(context, extent.getTableId(), mapFile.path().toString(), false, reader);
if (filesToCompact.get(mapFile).isTimeSet()) {
iter = new TimeSettingIterator(iter, filesToCompact.get(mapFile).getTime());
@@ -294,7 +294,7 @@ public class Compactor implements Callable<CompactionStats> {
} catch (Throwable e) {
- ProblemReports.getInstance(context).report(new ProblemReport(extent.getTableId().toString(), ProblemType.FILE_READ, mapFile.path().toString(), e));
+ ProblemReports.getInstance(context).report(new ProblemReport(extent.getTableId(), ProblemType.FILE_READ, mapFile.path().toString(), e));
log.warn("Some problem opening map file {} {}", mapFile, e.getMessage(), e);
// failed to open some map file... close the ones that were opened
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index 6b19b26..fd1ea33 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.tserver.tablet;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
@@ -51,8 +53,6 @@ import org.apache.accumulo.tserver.TLevel;
import org.apache.hadoop.fs.Path;
import org.apache.log4j.Logger;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-
class DatafileManager {
private final Logger log = Logger.getLogger(DatafileManager.class);
// access to datafilesizes needs to be synchronized: see CompactionRunner#getNumFiles
@@ -218,7 +218,7 @@ class DatafileManager {
boolean inTheRightDirectory = false;
Path parent = tpath.path().getParent().getParent();
for (String tablesDir : ServerConstants.getTablesDirs()) {
- if (parent.equals(new Path(tablesDir, tablet.getExtent().getTableId().toString()))) {
+ if (parent.equals(new Path(tablesDir, tablet.getExtent().getTableId()))) {
inTheRightDirectory = true;
break;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
index c1ed720..e3f8193 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.tserver.tablet;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
@@ -39,8 +41,6 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-
public class MinorCompactor extends Compactor {
private static final Logger log = LoggerFactory.getLogger(MinorCompactor.class);
@@ -75,7 +75,7 @@ public class MinorCompactor extends Compactor {
private boolean isTableDeleting() {
try {
- return Tables.getTableState(tabletServer.getInstance(), extent.getTableId().toString()) == TableState.DELETING;
+ return Tables.getTableState(tabletServer.getInstance(), extent.getTableId()) == TableState.DELETING;
} catch (Exception e) {
log.warn("Failed to determine if table " + extent.getTableId() + " was deleting ", e);
return false; // can not get positive confirmation that its deleting.
@@ -103,19 +103,19 @@ public class MinorCompactor extends Compactor {
// (int)(map.size()/((t2 - t1)/1000.0)), (t2 - t1)/1000.0, estimatedSizeInBytes()));
if (reportedProblem) {
- ProblemReports.getInstance(tabletServer).deleteProblemReport(getExtent().getTableId().toString(), ProblemType.FILE_WRITE, outputFileName);
+ ProblemReports.getInstance(tabletServer).deleteProblemReport(getExtent().getTableId(), ProblemType.FILE_WRITE, outputFileName);
}
return ret;
} catch (IOException e) {
log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(), outputFileName);
- ProblemReports.getInstance(tabletServer).report(new ProblemReport(getExtent().getTableId().toString(), ProblemType.FILE_WRITE, outputFileName, e));
+ ProblemReports.getInstance(tabletServer).report(new ProblemReport(getExtent().getTableId(), ProblemType.FILE_WRITE, outputFileName, e));
reportedProblem = true;
} catch (RuntimeException e) {
// if this is coming from a user iterator, it is possible that the user could change the iterator config and that the
// minor compaction would succeed
log.warn("MinC failed ({}) to create {} retrying ...", e.getMessage(), outputFileName, e);
- ProblemReports.getInstance(tabletServer).report(new ProblemReport(getExtent().getTableId().toString(), ProblemType.FILE_WRITE, outputFileName, e));
+ ProblemReports.getInstance(tabletServer).report(new ProblemReport(getExtent().getTableId(), ProblemType.FILE_WRITE, outputFileName, e));
reportedProblem = true;
} catch (CompactionCanceledException e) {
throw new IllegalStateException(e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a14bc292/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 90fba75..cf99dbd 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -327,7 +327,7 @@ public class Tablet implements TabletCommitter {
if (null == tblConf) {
Tables.clearCache(tabletServer.getInstance());
tblConf = tabletServer.getTableConfiguration(extent);
- requireNonNull(tblConf, "Could not get table configuration for " + extent.getTableId().toString());
+ requireNonNull(tblConf, "Could not get table configuration for " + extent.getTableId());
}
this.tableConfiguration = tblConf;
@@ -343,7 +343,7 @@ public class Tablet implements TabletCommitter {
if (tabletPaths.dir.contains(":")) {
locationPath = new Path(tabletPaths.dir);
} else {
- locationPath = tabletServer.getFileSystem().getFullPath(FileType.TABLE, extent.getTableId().toString() + tabletPaths.dir);
+ locationPath = tabletServer.getFileSystem().getFullPath(FileType.TABLE, extent.getTableId() + tabletPaths.dir);
}
this.location = locationPath;
this.tabletDirectory = tabletPaths.dir;
@@ -1322,8 +1322,7 @@ public class Tablet implements TabletCommitter {
}
}
if (err != null) {
- ProblemReports.getInstance(tabletServer)
- .report(new ProblemReport(extent.getTableId().toString(), ProblemType.TABLET_LOAD, this.extent.toString(), err));
+ ProblemReports.getInstance(tabletServer).report(new ProblemReport(extent.getTableId(), ProblemType.TABLET_LOAD, this.extent.toString(), err));
log.error("Tablet closed consistency check has failed for " + this.extent + " giving up and closing");
}
}
@@ -2108,7 +2107,7 @@ public class Tablet implements TabletCommitter {
KeyExtent low = new KeyExtent(extent.getTableId(), midRow, extent.getPrevEndRow());
KeyExtent high = new KeyExtent(extent.getTableId(), extent.getEndRow(), midRow);
- String lowDirectory = createTabletDirectory(getTabletServer().getFileSystem(), extent.getTableId().toString(), midRow);
+ String lowDirectory = createTabletDirectory(getTabletServer().getFileSystem(), extent.getTableId(), midRow);
// write new tablet information to MetadataTable
SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();