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:36 UTC
[2/5] accumulo git commit: ACCUMULO-4145 Eliminate Text wrapping of
tableIDs
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);