http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java b/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java index 6b033d9..65b3dce 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java +++ b/server/base/src/main/java/org/apache/accumulo/server/replication/DistributedWorkQueueWorkAssignerHelper.java @@ -73,6 +73,6 @@ public class DistributedWorkQueueWorkAssignerHelper { } return Maps.immutableEntry(filename, new ReplicationTarget(queueKey.substring(index + 1, secondIndex), queueKey.substring(secondIndex + 1, thirdIndex), - new Table.ID(queueKey.substring(thirdIndex + 1)))); + Table.ID.of(queueKey.substring(thirdIndex + 1)))); } }
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java index 7c9509c..bea9487 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java @@ -172,7 +172,7 @@ public class TableManager { synchronized (tableStateCache) { for (String tableId : zooStateCache.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLES)) if (zooStateCache.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_STATE) != null) - updateTableStateCache(new Table.ID(tableId)); + updateTableStateCache(Table.ID.of(tableId)); } } @@ -252,7 +252,7 @@ public class TableManager { if (suffix.contains("/")) { String[] sa = suffix.split("/", 2); if (Constants.ZTABLE_STATE.equals("/" + sa[1])) - tableId = new Table.ID(sa[0]); + tableId = Table.ID.of(sa[0]); } if (tableId == null) { log.warn("Unknown path in " + event); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 5c719d9..01d036f 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 @@ -743,7 +743,7 @@ public class MetadataTableUtil { } private static int compareEndRows(Text endRow1, Text endRow2) { - return new KeyExtent(new Table.ID("0"), endRow1, null).compareTo(new KeyExtent(new Table.ID("0"), endRow2, null)); + return new KeyExtent(Table.ID.of("0"), endRow1, null).compareTo(new KeyExtent(Table.ID.of("0"), endRow2, null)); } @VisibleForTesting @@ -958,7 +958,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 Table.ID("anythingNotMetadata"), null, null)); + update(context, m, new KeyExtent(Table.ID.of("anythingNotMetadata"), null, null)); } public static void removeBulkLoadInProgressFlag(AccumuloServerContext context, String path) { @@ -968,7 +968,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 Table.ID("anythingNotMetadata"), null, null)); + update(context, m, new KeyExtent(Table.ID.of("anythingNotMetadata"), null, null)); } /** @@ -1010,7 +1010,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 Table.ID("anythingNotMetadata"), null, null); + KeyExtent notMetadata = new KeyExtent(Table.ID.of("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 try (Scanner scanner = new ScannerImpl(context, MetadataTable.ID, Authorizations.EMPTY)) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java index bd08b05..5230bd6 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java @@ -86,7 +86,7 @@ public class RandomizeVolumes { log.error("Could not determine the table ID for table " + tableName); return 2; } - Table.ID tableId = new Table.ID(tblStr); + Table.ID tableId = Table.ID.of(tblStr); TableState tableState = TableManager.getInstance().getTableState(tableId); if (TableState.OFFLINE != tableState) { log.info("Taking " + tableName + " offline"); @@ -105,7 +105,7 @@ public class RandomizeVolumes { String directory; if (oldLocation.contains(":")) { String[] parts = oldLocation.split(Path.SEPARATOR); - Table.ID tableIdEntry = new Table.ID(parts[parts.length - 2]); + Table.ID tableIdEntry = Table.ID.of(parts[parts.length - 2]); if (!tableIdEntry.equals(tableId)) { log.error("Unexpected table id found: " + tableIdEntry + ", expected " + tableId + "; skipping"); continue; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 774acf7..e1e52ae 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 @@ -178,7 +178,7 @@ public class TableDiskUsage { throw new RuntimeException(e); } mdScanner.fetchColumnFamily(DataFileColumnFamily.NAME); - mdScanner.setRange(new KeyExtent(new Table.ID(tableId), null, null).toMetadataRange()); + mdScanner.setRange(new KeyExtent(Table.ID.of(tableId), null, null).toMetadataRange()); if (!mdScanner.iterator().hasNext()) { emptyTableIds.add(tableId); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 5c69521..9cd861f 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 @@ -53,7 +53,7 @@ import org.junit.Test; public class BulkImporterTest { static final SortedSet<KeyExtent> fakeMetaData = new TreeSet<>(); - static final Table.ID tableId = new Table.ID("1"); + static final Table.ID tableId = Table.ID.of("1"); static { fakeMetaData.add(new KeyExtent(tableId, new Text("a"), null)); @@ -164,19 +164,19 @@ public class BulkImporterTest { // a correct startRow so that findOverlappingTablets works as intended. // 1;2;1 - KeyExtent extent = new KeyExtent(new Table.ID("1"), new Text("2"), new Text("1")); + KeyExtent extent = new KeyExtent(Table.ID.of("1"), new Text("2"), new Text("1")); Assert.assertEquals(new Text("1\0"), BulkImporter.getStartRowForExtent(extent)); // 1;2< - extent = new KeyExtent(new Table.ID("1"), new Text("2"), null); + extent = new KeyExtent(Table.ID.of("1"), new Text("2"), null); Assert.assertEquals(null, BulkImporter.getStartRowForExtent(extent)); // 1<< - extent = new KeyExtent(new Table.ID("1"), null, null); + extent = new KeyExtent(Table.ID.of("1"), null, null); Assert.assertEquals(null, BulkImporter.getStartRowForExtent(extent)); // 1;8;7777777 - extent = new KeyExtent(new Table.ID("1"), new Text("8"), new Text("7777777")); + extent = new KeyExtent(Table.ID.of("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/cc1cf734/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java index 107b43f..dffa7d8 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java @@ -47,7 +47,7 @@ import org.junit.Before; import org.junit.Test; public class NamespaceConfigurationTest { - private static final Namespace.ID NSID = new Namespace.ID("namespace"); + private static final Namespace.ID NSID = Namespace.ID.of("namespace"); private static final String ZOOKEEPERS = "localhost"; private static final int ZK_SESSION_TIMEOUT = 120000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java index 602f908..35bb69a 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java @@ -114,7 +114,7 @@ public class ServerConfigurationFactoryTest { assertNotNull(c); } - private static final Namespace.ID NSID = new Namespace.ID("NAMESPACE"); + private static final Namespace.ID NSID = Namespace.ID.of("NAMESPACE"); @Test public void testGetNamespaceConfiguration() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java index 54f72ab..9bf4ed5 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java @@ -44,7 +44,7 @@ import org.junit.Before; import org.junit.Test; public class TableConfigurationTest { - private static final Table.ID TID = new Table.ID("table"); + private static final Table.ID TID = Table.ID.of("table"); private static final String ZOOKEEPERS = "localhost"; private static final int ZK_SESSION_TIMEOUT = 120000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java index 832134f..13557bf 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/fs/VolumeManagerImplTest.java @@ -113,7 +113,7 @@ public class VolumeManagerImplTest { conf.set(Property.INSTANCE_VOLUMES, StringUtils.join(volumes, ",")); conf.set(Property.GENERAL_VOLUME_CHOOSER, WrongVolumeChooser.class.getName()); VolumeManager vm = VolumeManagerImpl.get(conf); - VolumeChooserEnvironment chooserEnv = new VolumeChooserEnvironment(Optional.of(new Table.ID("sometable"))); + VolumeChooserEnvironment chooserEnv = new VolumeChooserEnvironment(Optional.of(Table.ID.of("sometable"))); String choice = vm.choose(chooserEnv, volumes.toArray(new String[0])); Assert.assertTrue("shouldn't see invalid options from misbehaving chooser.", volumes.contains(choice)); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java index e6791f4..32d1a73 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java @@ -179,9 +179,9 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL } } - protected static final TestTable FOO = new TestTable("foo", new Table.ID("1")); - protected static final TestTable BAR = new TestTable("bar", new Table.ID("2")); - protected static final TestTable BAZ = new TestTable("baz", new Table.ID("3")); + protected static final TestTable FOO = new TestTable("foo", Table.ID.of("1")); + protected static final TestTable BAR = new TestTable("bar", Table.ID.of("2")); + protected static final TestTable BAZ = new TestTable("baz", Table.ID.of("3")); protected class TestDefaultBalancer extends DefaultLoadBalancer { @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 bd66e80..065e718 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 @@ -155,7 +155,7 @@ public class ChaoticLoadBalancerTest { } private static KeyExtent makeExtent(String table, String end, String prev) { - return new KeyExtent(new Table.ID(table), toText(end), toText(prev)); + return new KeyExtent(Table.ID.of(table), toText(end), toText(prev)); } private static Text toText(String value) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 98d7097..cf53060 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 @@ -280,7 +280,7 @@ public class DefaultLoadBalancerTest { } private static KeyExtent makeExtent(String table, String end, String prev) { - return new KeyExtent(new Table.ID(table), toText(end), toText(prev)); + return new KeyExtent(Table.ID.of(table), toText(end), toText(prev)); } private static Text toText(String value) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 e7ebe12..f58ab65 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 @@ -68,7 +68,7 @@ public class GroupBalancerTest { public void addTablet(String er, String location) { TServerInstance tsi = new TServerInstance(location, 6); - tabletLocs.put(new KeyExtent(new Table.ID("b"), er == null ? null : new Text(er), null), new TServerInstance(location, 6)); + tabletLocs.put(new KeyExtent(Table.ID.of("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/cc1cf734/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 065eecf..24fed0c 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 @@ -176,9 +176,9 @@ public class TableLoadBalancerTest { tls.balance(state, migrations, migrationsOut); int count = 0; Map<Table.ID,Integer> movedByTable = new HashMap<>(); - movedByTable.put(new Table.ID(t1Id), Integer.valueOf(0)); - movedByTable.put(new Table.ID(t2Id), Integer.valueOf(0)); - movedByTable.put(new Table.ID(t3Id), Integer.valueOf(0)); + movedByTable.put(Table.ID.of(t1Id), Integer.valueOf(0)); + movedByTable.put(Table.ID.of(t2Id), Integer.valueOf(0)); + movedByTable.put(Table.ID.of(t3Id), Integer.valueOf(0)); for (TabletMigration migration : migrationsOut) { if (migration.oldServer.equals(svr)) count++; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 9d8eb69..cf83711 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 @@ -72,7 +72,7 @@ public class MergeInfoTest { String table = "table"; Text endRow = new Text("end"); Text prevEndRow = new Text("begin"); - keyExtent = new KeyExtent(new Table.ID(table), endRow, prevEndRow); + keyExtent = new KeyExtent(Table.ID.of(table), endRow, prevEndRow); mi = new MergeInfo(keyExtent, MergeInfo.Operation.DELETE); mi.setState(MergeState.STARTED); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -89,10 +89,10 @@ public class MergeInfoTest { @Test public void testNeedsToBeChopped_DifferentTables() { - expect(keyExtent.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent.getTableId()).andReturn(Table.ID.of("table1")); replay(keyExtent); KeyExtent keyExtent2 = createMock(KeyExtent.class); - expect(keyExtent2.getTableId()).andReturn(new Table.ID("table2")); + expect(keyExtent2.getTableId()).andReturn(Table.ID.of("table2")); replay(keyExtent2); mi = new MergeInfo(keyExtent, MergeInfo.Operation.MERGE); assertFalse(mi.needsToBeChopped(keyExtent2)); @@ -100,9 +100,9 @@ public class MergeInfoTest { @Test public void testNeedsToBeChopped_NotDelete() { - expect(keyExtent.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent.getTableId()).andReturn(Table.ID.of("table1")); KeyExtent keyExtent2 = createMock(KeyExtent.class); - expect(keyExtent2.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent2.getTableId()).andReturn(Table.ID.of("table1")); replay(keyExtent2); expect(keyExtent.overlaps(keyExtent2)).andReturn(true); replay(keyExtent); @@ -126,11 +126,11 @@ public class MergeInfoTest { } private void testNeedsToBeChopped_Delete(String prevEndRow, boolean expected) { - expect(keyExtent.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent.getTableId()).andReturn(Table.ID.of("table1")); expect(keyExtent.getEndRow()).andReturn(new Text("prev")); replay(keyExtent); KeyExtent keyExtent2 = createMock(KeyExtent.class); - expect(keyExtent2.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent2.getTableId()).andReturn(Table.ID.of("table1")); expect(keyExtent2.getPrevEndRow()).andReturn(prevEndRow != null ? new Text(prevEndRow) : null); expectLastCall().anyTimes(); replay(keyExtent2); @@ -151,9 +151,9 @@ public class MergeInfoTest { public void testOverlaps_DoesNotNeedChopping() { KeyExtent keyExtent2 = createMock(KeyExtent.class); expect(keyExtent.overlaps(keyExtent2)).andReturn(false); - expect(keyExtent.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent.getTableId()).andReturn(Table.ID.of("table1")); replay(keyExtent); - expect(keyExtent2.getTableId()).andReturn(new Table.ID("table2")); + expect(keyExtent2.getTableId()).andReturn(Table.ID.of("table2")); replay(keyExtent2); mi = new MergeInfo(keyExtent, MergeInfo.Operation.MERGE); assertFalse(mi.overlaps(keyExtent2)); @@ -163,10 +163,10 @@ public class MergeInfoTest { public void testOverlaps_NeedsChopping() { KeyExtent keyExtent2 = createMock(KeyExtent.class); expect(keyExtent.overlaps(keyExtent2)).andReturn(false); - expect(keyExtent.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent.getTableId()).andReturn(Table.ID.of("table1")); expect(keyExtent.getEndRow()).andReturn(new Text("prev")); replay(keyExtent); - expect(keyExtent2.getTableId()).andReturn(new Table.ID("table1")); + expect(keyExtent2.getTableId()).andReturn(Table.ID.of("table1")); expect(keyExtent2.getPrevEndRow()).andReturn(new Text("prev")); expectLastCall().anyTimes(); replay(keyExtent2); @@ -188,7 +188,7 @@ public class MergeInfoTest { } private static KeyExtent ke(String tableId, String endRow, String prevEndRow) { - return new KeyExtent(new Table.ID(tableId), endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow)); + return new KeyExtent(Table.ID.of(tableId), endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow)); } @Test http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 ca1ced9..805e6bc 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 @@ -44,7 +44,7 @@ import org.junit.Before; import org.junit.Test; public class ProblemReportTest { - private static final Table.ID TABLE_ID = new Table.ID("table"); + private static final Table.ID TABLE_ID = Table.ID.of("table"); private static final String RESOURCE = "resource"; private static final String SERVER = "server"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 a066780..0d025c4 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 @@ -38,7 +38,7 @@ import org.junit.Before; import org.junit.Test; public class ProblemReportingIteratorTest { - private static final Table.ID TABLE_ID = new Table.ID("table"); + private static final Table.ID TABLE_ID = Table.ID.of("table"); private static final String RESOURCE = "resource"; private InterruptibleIterator ii; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 5d3d44e..ccb0a36 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 @@ -92,7 +92,7 @@ public class ReplicationTableUtilTest { String myFile = "file:////home/user/accumulo/wal/server+port/" + uuid; long createdTime = System.currentTimeMillis(); - ReplicationTableUtil.updateFiles(context, new KeyExtent(new Table.ID("1"), null, null), myFile, StatusUtil.fileCreated(createdTime)); + ReplicationTableUtil.updateFiles(context, new KeyExtent(Table.ID.of("1"), null, null), myFile, StatusUtil.fileCreated(createdTime)); verify(writer); @@ -117,7 +117,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 Table.ID("1"), new Text("b"), new Text("a")); + KeyExtent extent = new KeyExtent(Table.ID.of("1"), new Text("b"), new Text("a")); Mutation m = ReplicationTableUtil.createUpdateMutation(filePath, ProtobufUtil.toValue(stat), extent); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java index 7b087aa..17cc70e 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java @@ -251,7 +251,7 @@ public class GarbageCollectionAlgorithm { String[] tokens = delete.split("/"); if (tokens.length == 2) { // its a directory - Table.ID tableId = new Table.ID(delete.split("/")[0]); + Table.ID tableId = Table.ID.of(delete.split("/")[0]); tableIdsWithDeletes.add(tableId); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 92a5fa9..1edfa86 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -391,7 +391,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa } String parts[] = fullPath.toString().split(Constants.ZTABLES)[1].split("/"); if (parts.length > 2) { - Table.ID tableId = new Table.ID(parts[1]); + Table.ID tableId = Table.ID.of(parts[1]); String tabletDir = parts[2]; TableManager.getInstance().updateTableStateCache(tableId); TableState tableState = TableManager.getInstance().getTableState(tableId); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 eea0e76..dd8d9d1 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 @@ -93,7 +93,7 @@ public class GarbageCollectionTest { } public Key newFileReferenceKey(String tableId, String endRow, String file) { - String row = new KeyExtent(new Table.ID(tableId), endRow == null ? null : new Text(endRow), null).getMetadataEntry().toString(); + String row = new KeyExtent(Table.ID.of(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); @@ -111,7 +111,7 @@ public class GarbageCollectionTest { } Key newDirReferenceKey(String tableId, String endRow) { - String row = new KeyExtent(new Table.ID(tableId), endRow == null ? null : new Text(endRow), null).getMetadataEntry().toString(); + String row = new KeyExtent(Table.ID.of(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); @@ -534,7 +534,7 @@ public class GarbageCollectionTest { TestGCE gce = new TestGCE(); - gce.tableIds.add(new Table.ID("4")); + gce.tableIds.add(Table.ID.of("4")); gce.candidates.add("/4/t-0"); gce.candidates.add("/4/t-0/F002.rf"); @@ -547,8 +547,8 @@ public class GarbageCollectionTest { gca.collect(gce); HashSet<Table.ID> tids = new HashSet<>(); - tids.add(new Table.ID("5")); - tids.add(new Table.ID("6")); + tids.add(Table.ID.of("5")); + tids.add(Table.ID.of("6")); Assert.assertEquals(tids.size(), gce.tablesDirsToDelete.size()); Assert.assertTrue(tids.containsAll(gce.tablesDirsToDelete)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 e98064b..94e6c86 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 @@ -114,7 +114,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma @Override public long initiateFlush(TInfo tinfo, TCredentials c, String tableIdStr) throws ThriftSecurityException, ThriftTableOperationException { - Table.ID tableId = new Table.ID(tableIdStr); + Table.ID tableId = Table.ID.of(tableIdStr); Namespace.ID namespaceId = getNamespaceIdFromTableId(TableOperation.FLUSH, tableId); master.security.canFlush(c, tableId, namespaceId); @@ -143,7 +143,7 @@ public class MasterClientServiceHandler extends FateServiceHandler implements Ma @Override public void waitForFlush(TInfo tinfo, TCredentials c, String tableIdStr, ByteBuffer startRow, ByteBuffer endRow, long flushID, long maxLoops) throws ThriftSecurityException, ThriftTableOperationException { - Table.ID tableId = new Table.ID(tableIdStr); + Table.ID tableId = Table.ID.of(tableIdStr); Namespace.ID namespaceId = getNamespaceIdFromTableId(TableOperation.FLUSH, tableId); master.security.canFlush(c, tableId, namespaceId); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java index 68f7d96..d4827d8 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java @@ -174,7 +174,7 @@ public class RemoveCompleteReplicationRecords implements Runnable { Table.ID tableId; if (StatusSection.NAME.equals(colf)) { - tableId = new Table.ID(colq.toString()); + tableId = Table.ID.of(colq.toString()); } else if (WorkSection.NAME.equals(colf)) { ReplicationTarget target = ReplicationTarget.from(colq); tableId = target.getSourceTableId(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java index 04b55e2..ddc6a1f 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java @@ -53,7 +53,7 @@ public class CloneTable extends MasterRepo { Utils.idLock.lock(); try { - cloneInfo.tableId = Utils.getNextTableId(cloneInfo.tableName, environment.getInstance(), Table.ID.class); + cloneInfo.tableId = Utils.getNextId(cloneInfo.tableName, environment.getInstance(), Table.ID::of); return new ClonePermissions(cloneInfo); } finally { Utils.idLock.unlock(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java index 26ad897..e917659 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateNamespace.java @@ -43,7 +43,7 @@ public class CreateNamespace extends MasterRepo { public Repo<Master> call(long tid, Master master) throws Exception { Utils.idLock.lock(); try { - namespaceInfo.namespaceId = Utils.getNextTableId(namespaceInfo.namespaceName, master.getInstance(), Namespace.ID.class); + namespaceInfo.namespaceId = Utils.getNextId(namespaceInfo.namespaceName, master.getInstance(), Namespace.ID::of); return new SetupNamespacePermissions(namespaceInfo); } finally { Utils.idLock.unlock(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java index dcd9191..a448f9c 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CreateTable.java @@ -56,7 +56,7 @@ public class CreateTable extends MasterRepo { Utils.idLock.lock(); try { - tableInfo.tableId = Utils.getNextTableId(tableInfo.tableName, master.getInstance(), Table.ID.class); + tableInfo.tableId = Utils.getNextId(tableInfo.tableName, master.getInstance(), Table.ID::of); return new SetupPermissions(tableInfo); } finally { Utils.idLock.unlock(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java index 4c64f08..8f65bb6 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java @@ -72,7 +72,7 @@ public class ImportTable extends MasterRepo { Utils.idLock.lock(); try { Instance instance = env.getInstance(); - tableInfo.tableId = Utils.getNextTableId(tableInfo.tableName, instance, Table.ID.class); + tableInfo.tableId = Utils.getNextId(tableInfo.tableName, instance, Table.ID::of); return new ImportSetupPermissions(tableInfo); } finally { Utils.idLock.unlock(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java index 0719b1b..faa5efe 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java @@ -18,11 +18,11 @@ package org.apache.accumulo.master.tableOps; import static java.nio.charset.StandardCharsets.UTF_8; -import java.lang.reflect.Constructor; import java.math.BigInteger; import java.util.Base64; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Function; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Instance; @@ -37,7 +37,6 @@ import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; -import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.fate.zookeeper.ZooReservation; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.zookeeper.ZooQueueLock; @@ -59,24 +58,19 @@ public class Utils { throw new AcceptableThriftTableOperationException(null, tableName, operation, TableOperationExceptionType.EXISTS, null); } - static <T extends AbstractId> T getNextTableId(String tableName, Instance instance, Class<T> idClassType) throws AcceptableThriftTableOperationException { + static <T extends AbstractId> T getNextId(String name, Instance instance, Function<String,T> newIdFunction) throws AcceptableThriftTableOperationException { try { IZooReaderWriter zoo = ZooReaderWriter.getInstance(); final String ntp = ZooUtil.getRoot(instance) + Constants.ZTABLES; - byte[] nid = zoo.mutate(ntp, ZERO_BYTE, ZooUtil.PUBLIC, new Mutator() { - @Override - public byte[] mutate(byte[] currentValue) throws Exception { - BigInteger nextId = new BigInteger(new String(currentValue, UTF_8), Character.MAX_RADIX); - nextId = nextId.add(BigInteger.ONE); - return nextId.toString(Character.MAX_RADIX).getBytes(UTF_8); - } + byte[] nid = zoo.mutate(ntp, ZERO_BYTE, ZooUtil.PUBLIC, currentValue -> { + BigInteger nextId = new BigInteger(new String(currentValue, UTF_8), Character.MAX_RADIX); + nextId = nextId.add(BigInteger.ONE); + return nextId.toString(Character.MAX_RADIX).getBytes(UTF_8); }); - Constructor<T> constructor = idClassType.getConstructor(String.class); - return constructor.newInstance(new String(nid, UTF_8)); - // return idClassType.cast(new String(nid, UTF_8)); + return newIdFunction.apply(new String(nid, UTF_8)); } catch (Exception e1) { - log.error("Failed to assign tableId to " + tableName, e1); - throw new AcceptableThriftTableOperationException(null, tableName, TableOperation.CREATE, TableOperationExceptionType.OTHER, e1.getMessage()); + log.error("Failed to assign id to " + name, e1); + throw new AcceptableThriftTableOperationException(null, name, TableOperation.CREATE, TableOperationExceptionType.OTHER, e1.getMessage()); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java index a1c5e69..50828f1 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssignerHelperTest.java @@ -35,7 +35,7 @@ public class DistributedWorkQueueWorkAssignerHelperTest { @Test public void createsValidZKNodeName() { Path p = new Path("/accumulo/wals/tserver+port/" + UUID.randomUUID().toString()); - ReplicationTarget target = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); String key = DistributedWorkQueueWorkAssignerHelper.getQueueKey(p.toString(), target); @@ -45,7 +45,7 @@ public class DistributedWorkQueueWorkAssignerHelperTest { @Test public void queueKeySerialization() { Path p = new Path("/accumulo/wals/tserver+port/" + UUID.randomUUID().toString()); - ReplicationTarget target = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); String key = DistributedWorkQueueWorkAssignerHelper.getQueueKey(p.toString(), target); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java index 83f36f4..26a090a 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/replication/SequentialWorkAssignerTest.java @@ -60,8 +60,8 @@ public class SequentialWorkAssignerTest { Map<String,String> cluster1Work = new TreeMap<>(); // Two files for cluster1, one for table '1' and another for table '2' we havce assigned work for - cluster1Work.put("1", DistributedWorkQueueWorkAssignerHelper.getQueueKey("file1", new ReplicationTarget("cluster1", "1", new Table.ID("1")))); - cluster1Work.put("2", DistributedWorkQueueWorkAssignerHelper.getQueueKey("file2", new ReplicationTarget("cluster1", "2", new Table.ID("2")))); + cluster1Work.put("1", DistributedWorkQueueWorkAssignerHelper.getQueueKey("file1", new ReplicationTarget("cluster1", "1", Table.ID.of("1")))); + cluster1Work.put("2", DistributedWorkQueueWorkAssignerHelper.getQueueKey("file2", new ReplicationTarget("cluster1", "2", Table.ID.of("2")))); queuedWork.put("cluster1", cluster1Work); @@ -76,11 +76,11 @@ public class SequentialWorkAssignerTest { // file1 replicated expect( zooCache.get(ZooUtil.getRoot("instance") + ReplicationConstants.ZOO_WORK_QUEUE + "/" - + DistributedWorkQueueWorkAssignerHelper.getQueueKey("file1", new ReplicationTarget("cluster1", "1", new Table.ID("1"))))).andReturn(null); + + DistributedWorkQueueWorkAssignerHelper.getQueueKey("file1", new ReplicationTarget("cluster1", "1", Table.ID.of("1"))))).andReturn(null); // file2 still needs to replicate expect( zooCache.get(ZooUtil.getRoot("instance") + ReplicationConstants.ZOO_WORK_QUEUE + "/" - + DistributedWorkQueueWorkAssignerHelper.getQueueKey("file2", new ReplicationTarget("cluster1", "2", new Table.ID("2"))))).andReturn(new byte[0]); + + DistributedWorkQueueWorkAssignerHelper.getQueueKey("file2", new ReplicationTarget("cluster1", "2", Table.ID.of("2"))))).andReturn(new byte[0]); replay(workQueue, zooCache, conn, inst); @@ -89,7 +89,7 @@ public class SequentialWorkAssignerTest { verify(workQueue, zooCache, conn, inst); Assert.assertEquals(1, cluster1Work.size()); - Assert.assertEquals(DistributedWorkQueueWorkAssignerHelper.getQueueKey("file2", new ReplicationTarget("cluster1", "2", new Table.ID("2"))), + Assert.assertEquals(DistributedWorkQueueWorkAssignerHelper.getQueueKey("file2", new ReplicationTarget("cluster1", "2", Table.ID.of("2"))), cluster1Work.get("2")); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java b/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java index 40e3d9e..991bbf0 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/replication/UnorderedWorkAssignerTest.java @@ -58,7 +58,7 @@ public class UnorderedWorkAssignerTest { @Test public void workQueuedUsingFileName() throws Exception { - ReplicationTarget target = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); DistributedWorkQueue workQueue = createMock(DistributedWorkQueue.class); Set<String> queuedWork = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 fe7365d..cbd921f 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 @@ -191,7 +191,7 @@ public class RootTabletStateStoreTest { } assertEquals(count, 1); - KeyExtent notRoot = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent notRoot = new KeyExtent(Table.ID.of("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/cc1cf734/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java ---------------------------------------------------------------------- diff --git a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java index ee54820..3ff5604 100644 --- a/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java +++ b/server/master/src/test/java/org/apache/accumulo/master/tableOps/ImportTableTest.java @@ -36,7 +36,7 @@ public class ImportTableTest { Master master = EasyMock.createMock(Master.class); VolumeManager volumeManager = EasyMock.createMock(VolumeManager.class); ImportedTableInfo iti = new ImportedTableInfo(); - iti.tableId = new Table.ID("5"); + iti.tableId = Table.ID.of("5"); // Different volumes with different paths String[] tableDirs = new String[] {"hdfs://nn1:8020/apps/accumulo1/tables", "hdfs://nn2:8020/applications/accumulo/tables"}; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java index 08549a0..8c7fed7 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemsResource.java @@ -96,7 +96,7 @@ public class ProblemsResource { public void clearTableProblems(@QueryParam("s") String tableID) { Logger log = LoggerFactory.getLogger(Monitor.class); try { - ProblemReports.getInstance(Monitor.getContext()).deleteProblemReports(new Table.ID(tableID)); + ProblemReports.getInstance(Monitor.getContext()).deleteProblemReports(Table.ID.of(tableID)); } catch (Exception e) { log.error("Failed to delete problem reports for table " + tableID, e); } @@ -147,7 +147,7 @@ public class ProblemsResource { public void clearDetailsProblems(@QueryParam("table") String tableID, @QueryParam("resource") String resource, @QueryParam("ptype") String ptype) { Logger log = LoggerFactory.getLogger(Monitor.class); try { - ProblemReports.getInstance(Monitor.getContext()).deleteProblemReport(new Table.ID(tableID), ProblemType.valueOf(ptype), resource); + ProblemReports.getInstance(Monitor.getContext()).deleteProblemReport(Table.ID.of(tableID), ProblemType.valueOf(ptype), resource); } catch (Exception e) { log.error("Failed to delete problem reports for table " + tableID, e); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java index 11c8b49..8031931 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java @@ -103,7 +103,7 @@ public class TablesResource { if (Monitor.getMmi() != null && Monitor.getMmi().tableMap != null) for (Entry<String,TableInfo> te : Monitor.getMmi().tableMap.entrySet()) - tableStats.put(Tables.getPrintableTableInfoFromId(inst, new Table.ID(te.getKey())), te.getValue()); + tableStats.put(Tables.getPrintableTableInfoFromId(inst, Table.ID.of(te.getKey())), te.getValue()); Map<String,Double> compactingByTable = TableInfoUtil.summarizeTableStats(Monitor.getMmi()); TableManager tableManager = TableManager.getInstance(); List<TableInformation> tables = new ArrayList<>(); @@ -203,7 +203,7 @@ public class TablesResource { @GET public TabletServers getParticipatingTabletServers(@PathParam("tableId") String tableIdStr) throws Exception { Instance instance = Monitor.getContext().getInstance(); - Table.ID tableId = new Table.ID(tableIdStr); + Table.ID tableId = Table.ID.of(tableIdStr); TabletServers tabletServers = new TabletServers(Monitor.getMmi().tServerInfo.size()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java index 9bcc177..4f0c92d 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java @@ -237,7 +237,7 @@ public class WebViews { @Template(name = "/default.ftl") public Map<String,Object> getTables(@PathParam("tableID") String tableID) throws TableNotFoundException { - String tableName = Tables.getTableName(Monitor.getContext().getInstance(), new Table.ID(tableID)); + String tableName = Tables.getTableName(Monitor.getContext().getInstance(), Table.ID.of(tableID)); Map<String,Object> model = getModel(); model.put("title", "Table Status"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 b4cb43d..1506b0e 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 @@ -490,7 +490,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { long readaheadThreshold, TSamplerConfiguration tSamplerConfig, long batchTimeOut, String context) throws NotServingTabletException, ThriftSecurityException, org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException, TSampleNotPresentException { - Table.ID tableId = new Table.ID(new String(textent.getTable(), UTF_8)); + Table.ID tableId = Table.ID.of(new String(textent.getTable(), UTF_8)); Namespace.ID namespaceId; try { namespaceId = Tables.getNamespaceId(getInstance(), tableId); @@ -649,7 +649,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { // find all of the tables that need to be scanned final HashSet<Table.ID> tables = new HashSet<>(); for (TKeyExtent keyExtent : tbatch.keySet()) { - tables.add(new Table.ID(new String(keyExtent.getTable(), UTF_8))); + tables.add(Table.ID.of(new String(keyExtent.getTable(), UTF_8))); } if (tables.size() != 1) @@ -1084,7 +1084,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { public void update(TInfo tinfo, TCredentials credentials, TKeyExtent tkeyExtent, TMutation tmutation, TDurability tdurability) throws NotServingTabletException, ConstraintViolationException, ThriftSecurityException { - final Table.ID tableId = new Table.ID(new String(tkeyExtent.getTable(), UTF_8)); + final Table.ID tableId = Table.ID.of(new String(tkeyExtent.getTable(), UTF_8)); Namespace.ID namespaceId; try { namespaceId = Tables.getNamespaceId(getInstance(), tableId); @@ -1323,7 +1323,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { public TConditionalSession startConditionalUpdate(TInfo tinfo, TCredentials credentials, List<ByteBuffer> authorizations, String tableIdStr, TDurability tdurabilty, String classLoaderContext) throws ThriftSecurityException, TException { - Table.ID tableId = new Table.ID(tableIdStr); + Table.ID tableId = Table.ID.of(tableIdStr); Authorizations userauths = null; Namespace.ID namespaceId; try { @@ -1416,7 +1416,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { public void splitTablet(TInfo tinfo, TCredentials credentials, TKeyExtent tkeyExtent, ByteBuffer splitPoint) throws NotServingTabletException, ThriftSecurityException { - Table.ID tableId = new Table.ID(new String(ByteBufferUtil.toBytes(tkeyExtent.table))); + Table.ID tableId = Table.ID.of(new String(ByteBufferUtil.toBytes(tkeyExtent.table))); Namespace.ID namespaceId; try { namespaceId = Tables.getNamespaceId(getInstance(), tableId); @@ -1459,7 +1459,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { onlineTabletsCopy = new TreeMap<>(onlineTablets); } List<TabletStats> result = new ArrayList<>(); - Table.ID text = new Table.ID(tableId); + Table.ID text = Table.ID.of(tableId); KeyExtent start = new KeyExtent(text, new Text(), null); for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.tailMap(start).entrySet()) { KeyExtent ke = entry.getKey(); @@ -1634,7 +1634,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { ArrayList<Tablet> tabletsToFlush = new ArrayList<>(); - KeyExtent ke = new KeyExtent(new Table.ID(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow)); + KeyExtent ke = new KeyExtent(Table.ID.of(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow)); synchronized (onlineTablets) { for (Tablet tablet : onlineTablets.values()) @@ -1752,7 +1752,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { throw new RuntimeException(e); } - KeyExtent ke = new KeyExtent(new Table.ID(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow)); + KeyExtent ke = new KeyExtent(Table.ID.of(tableId), ByteBufferUtil.toText(endRow), ByteBufferUtil.toText(startRow)); ArrayList<Tablet> tabletsToCompact = new ArrayList<>(); synchronized (onlineTablets) { @@ -1848,7 +1848,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { public TSummaries startGetSummaries(TInfo tinfo, TCredentials credentials, TSummaryRequest request) throws ThriftSecurityException, ThriftTableOperationException, NoSuchScanIDException, TException { Namespace.ID namespaceId; - Table.ID tableId = new Table.ID(request.getTableId()); + Table.ID tableId = Table.ID.of(request.getTableId()); try { namespaceId = Tables.getNamespaceId(TabletServer.this.getInstance(), tableId); } catch (TableNotFoundException e1) { @@ -1876,7 +1876,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { ServerConfigurationFactory factory = TabletServer.this.getServerConfigurationFactory(); ExecutorService spe = resourceManager.getSummaryRemoteExecutor(); - Future<SummaryCollection> future = new Gatherer(TabletServer.this, request, factory.getTableConfiguration(new Table.ID(request.getTableId()))) + Future<SummaryCollection> future = new Gatherer(TabletServer.this, request, factory.getTableConfiguration(Table.ID.of(request.getTableId()))) .processPartition(spe, modulus, remainder); return startSummaryOperation(credentials, future); @@ -1891,7 +1891,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { } ExecutorService srp = resourceManager.getSummaryRetrievalExecutor(); - TableConfiguration tableCfg = confFactory.getTableConfiguration(new Table.ID(request.getTableId())); + TableConfiguration tableCfg = confFactory.getTableConfiguration(Table.ID.of(request.getTableId())); BlockCache summaryCache = resourceManager.getSummaryCache(); BlockCache indexCache = resourceManager.getIndexCache(); FileSystemResolver volMgr = p -> fs.getVolumeByPath(p).getFileSystem(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 0bdcf19..f53a5e8 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 @@ -85,7 +85,7 @@ public class LogReader { row = new Text(opts.row); if (opts.extent != null) { String sa[] = opts.extent.split(";"); - ke = new KeyExtent(new Table.ID(sa[0]), new Text(sa[1]), new Text(sa[2])); + ke = new KeyExtent(Table.ID.of(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/cc1cf734/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java index 0dd45c7..879cc30 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationServicerHandler.java @@ -51,7 +51,7 @@ public class ReplicationServicerHandler implements Iface { @Override public long replicateLog(String tableIdStr, WalEdits data, TCredentials tcreds) throws RemoteReplicationException, TException { - Table.ID tableId = new Table.ID(tableIdStr); + Table.ID tableId = Table.ID.of(tableIdStr); log.debug("Got replication request to tableID {} with {} edits", tableId, data.getEditsSize()); tabletServer.getSecurityOperation().authenticateUser(tabletServer.rpcCreds(), tcreds); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 c264aae..0d4df45 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 @@ -50,7 +50,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 Table.ID("1"), null, null), run); + assignments.put(new KeyExtent(Table.ID.of("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/cc1cf734/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 f97607e..e9a6edd 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 @@ -71,7 +71,7 @@ public class CheckTabletMetadataTest { @Test public void testBadTabletMetadata() throws Exception { - KeyExtent ke = new KeyExtent(new Table.ID("1"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("1"), null, null); TreeMap<Key,Value> tabletMeta = new TreeMap<>(); @@ -90,9 +90,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 Table.ID("1"), null, new Text("m")), tsi); + assertFail(tabletMeta, new KeyExtent(Table.ID.of("1"), null, new Text("m")), tsi); - assertFail(tabletMeta, new KeyExtent(new Table.ID("1"), new Text("r"), new Text("m")), tsi); + assertFail(tabletMeta, new KeyExtent(Table.ID.of("1"), new Text("r"), new Text("m")), tsi); assertFail(tabletMeta, ke, tsi, newKey("1<", TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 42b70a5..b3cbe9f 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 @@ -196,7 +196,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 Table.ID("2"), new Text("j"), null); + KeyExtent extent = new KeyExtent(Table.ID.of("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)); @@ -238,7 +238,7 @@ public class LargestFirstMemoryManagerTest { } private static KeyExtent k(String endRow) { - return new KeyExtent(new Table.ID("1"), new Text(endRow), null); + return new KeyExtent(Table.ID.of("1"), new Text(endRow), null); } private static class TestTabletState implements TabletState { http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 0c36d3a..8d0c211 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 @@ -158,7 +158,7 @@ public class DefaultCompactionStrategyTest { } private MajorCompactionRequest createRequest(MajorCompactionReason reason, Object... objs) throws IOException { - return createRequest(new KeyExtent(new Table.ID("0"), null, null), reason, objs); + return createRequest(new KeyExtent(Table.ID.of("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/cc1cf734/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 982d2b6..364873c 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 @@ -52,7 +52,7 @@ public class SizeLimitCompactionStrategyTest { slcs.init(opts); - KeyExtent ke = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null); MajorCompactionRequest mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, DefaultConfiguration.getInstance()); mcr.setFiles(nfl("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G")); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java index 80668bc..d1d7b89 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java @@ -64,7 +64,7 @@ public class TwoTierCompactionStrategyTest { public void testDefaultCompaction() throws IOException { ttcs.init(opts); conf = DefaultConfiguration.getInstance(); - KeyExtent ke = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null); mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, conf); Map<FileRef,DataFileValue> fileMap = createFileMap("f1", "10M", "f2", "10M", "f3", "10M", "f4", "10M", "f5", "100M", "f6", "100M", "f7", "100M", "f8", "100M"); @@ -83,7 +83,7 @@ public class TwoTierCompactionStrategyTest { public void testLargeCompaction() throws IOException { ttcs.init(opts); conf = DefaultConfiguration.getInstance(); - KeyExtent ke = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null); mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, conf); Map<FileRef,DataFileValue> fileMap = createFileMap("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G"); mcr.setFiles(fileMap); @@ -112,7 +112,7 @@ public class TwoTierCompactionStrategyTest { public void testFileSubsetCompaction() throws IOException { ttcs.init(opts); conf = DefaultConfiguration.getInstance(); - KeyExtent ke = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null); mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, conf); Map<FileRef,DataFileValue> fileMap = createFileMap("f1", "1G", "f2", "10M", "f3", "10M", "f4", "10M", "f5", "10M", "f6", "10M", "f7", "10M"); Map<FileRef,DataFileValue> filesToCompactMap = createFileMap("f2", "10M", "f3", "10M", "f4", "10M", "f5", "10M", "f6", "10M", "f7", "10M"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 c991ced..43ec2e3 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 @@ -38,7 +38,7 @@ public class ConfigurableCompactionStrategyTest { @Test public void testOutputOptions() throws Exception { - MajorCompactionRequest mcr = new MajorCompactionRequest(new KeyExtent(new Table.ID("1"), null, null), MajorCompactionReason.USER, null); + MajorCompactionRequest mcr = new MajorCompactionRequest(new KeyExtent(Table.ID.of("1"), null, null), MajorCompactionReason.USER, 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/cc1cf734/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 7b6474f..491363e 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 @@ -30,7 +30,7 @@ public class LogEntryTest { @Test public void test() throws Exception { - KeyExtent extent = new KeyExtent(new Table.ID("1"), null, new Text("")); + KeyExtent extent = new KeyExtent(Table.ID.of("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/cc1cf734/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 e8da141..bedb96e 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 @@ -57,7 +57,7 @@ import org.junit.rules.TemporaryFolder; public class SortedLogRecoveryTest { - static final KeyExtent extent = new KeyExtent(new Table.ID("table"), null, null); + static final KeyExtent extent = new KeyExtent(Table.ID.of("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/cc1cf734/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 51205ac..a26586e 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 @@ -81,7 +81,7 @@ public class LogFileTest { assertEquals(key.seq, 3); assertEquals(key.tid, 4); assertEquals(key.filename, "some file"); - KeyExtent tablet = new KeyExtent(new Table.ID("table"), new Text("bbbb"), new Text("aaaa")); + KeyExtent tablet = new KeyExtent(Table.ID.of("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/cc1cf734/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 d05e849..1703b5f 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 @@ -78,7 +78,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 Table.ID("1"), null, null); + key.tablet = new KeyExtent(Table.ID.of("1"), null, null); key.tid = 1; key.write(dos); @@ -93,7 +93,7 @@ public class AccumuloReplicaSystemTest { value.write(dos); key.event = LogEvents.DEFINE_TABLET; - key.tablet = new KeyExtent(new Table.ID("2"), null, null); + key.tablet = new KeyExtent(Table.ID.of("2"), null, null); key.tid = 2; value.mutations = Collections.emptyList(); @@ -124,7 +124,7 @@ public class AccumuloReplicaSystemTest { value.write(dos); key.event = LogEvents.DEFINE_TABLET; - key.tablet = new KeyExtent(new Table.ID("1"), null, null); + key.tablet = new KeyExtent(Table.ID.of("1"), null, null); key.tid = 3; value.mutations = Collections.emptyList(); @@ -158,7 +158,7 @@ public class AccumuloReplicaSystemTest { Status status = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true).setClosed(false).build(); DataInputStream dis = new DataInputStream(new ByteArrayInputStream(baos.toByteArray())); - WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", new Table.ID("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, + WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, Long.MAX_VALUE, new HashSet<Integer>()); // We stopped because we got to the end of the file @@ -184,7 +184,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 Table.ID("1"), null, null); + key.tablet = new KeyExtent(Table.ID.of("1"), null, null); key.tid = 1; key.write(dos); @@ -199,7 +199,7 @@ public class AccumuloReplicaSystemTest { value.write(dos); key.event = LogEvents.DEFINE_TABLET; - key.tablet = new KeyExtent(new Table.ID("2"), null, null); + key.tablet = new KeyExtent(Table.ID.of("2"), null, null); key.tid = 2; value.mutations = Collections.emptyList(); @@ -230,7 +230,7 @@ public class AccumuloReplicaSystemTest { value.write(dos); key.event = LogEvents.DEFINE_TABLET; - key.tablet = new KeyExtent(new Table.ID("1"), null, null); + key.tablet = new KeyExtent(Table.ID.of("1"), null, null); key.tid = 3; value.mutations = Collections.emptyList(); @@ -266,7 +266,7 @@ public class AccumuloReplicaSystemTest { // If it were still open, more data could be appended that we need to process Status status = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true).setClosed(true).build(); DataInputStream dis = new DataInputStream(new ByteArrayInputStream(baos.toByteArray())); - WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", new Table.ID("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, + WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, Long.MAX_VALUE, new HashSet<Integer>()); // We stopped because we got to the end of the file @@ -301,7 +301,7 @@ public class AccumuloReplicaSystemTest { DataOutputStream out = new DataOutputStream(baos); // Replicate our 2 mutations to "peer", from tableid 1 to tableid 1 - ars.writeValueAvoidingReplicationCycles(out, value, new ReplicationTarget("peer", "1", new Table.ID("1"))); + ars.writeValueAvoidingReplicationCycles(out, value, new ReplicationTarget("peer", "1", Table.ID.of("1"))); out.close(); @@ -332,7 +332,7 @@ public class AccumuloReplicaSystemTest { // If it were still open, more data could be appended that we need to process Status status = Status.newBuilder().setBegin(100).setEnd(0).setInfiniteEnd(true).setClosed(true).build(); DataInputStream dis = new DataInputStream(new ByteArrayInputStream(new byte[0])); - WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", new Table.ID("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, + WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, Long.MAX_VALUE, new HashSet<Integer>()); // We stopped because we got to the end of the file @@ -355,7 +355,7 @@ public class AccumuloReplicaSystemTest { // If it were still open, more data could be appended that we need to process Status status = Status.newBuilder().setBegin(100).setEnd(0).setInfiniteEnd(true).setClosed(false).build(); DataInputStream dis = new DataInputStream(new ByteArrayInputStream(new byte[0])); - WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", new Table.ID("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, + WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, Long.MAX_VALUE, new HashSet<Integer>()); // We stopped because we got to the end of the file @@ -381,7 +381,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 Table.ID("1"), null, null); + key.tablet = new KeyExtent(Table.ID.of("1"), null, null); key.tid = 1; key.write(dos); @@ -419,7 +419,7 @@ public class AccumuloReplicaSystemTest { HashSet<Integer> tids = new HashSet<>(); // Only consume the first mutation, not the second - WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", new Table.ID("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, 1l, + WalReplication repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, 1l, tids); // We stopped because we got to the end of the file @@ -431,7 +431,7 @@ public class AccumuloReplicaSystemTest { status = Status.newBuilder(status).setBegin(2).build(); // Consume the rest of the mutations - repl = ars.getWalEdits(new ReplicationTarget("peer", "1", new Table.ID("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, 1l, tids); + repl = ars.getWalEdits(new ReplicationTarget("peer", "1", Table.ID.of("1")), dis, new Path("/accumulo/wals/tserver+port/wal"), status, 1l, tids); // We stopped because we got to the end of the file Assert.assertEquals(1, repl.entriesConsumed); @@ -447,7 +447,7 @@ public class AccumuloReplicaSystemTest { WalEdits edits = new WalEdits(Collections.<ByteBuffer> emptyList()); WalReplication walReplication = new WalReplication(edits, 0, 0, 0); - ReplicationTarget target = new ReplicationTarget("peer", "2", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("peer", "2", Table.ID.of("1")); DataInputStream input = null; Path p = new Path("/accumulo/wals/tserver+port/" + UUID.randomUUID().toString()); Status status = null; @@ -476,7 +476,7 @@ public class AccumuloReplicaSystemTest { WalEdits edits = new WalEdits(Collections.<ByteBuffer> emptyList()); WalReplication walReplication = new WalReplication(edits, 0, 5, 0); - ReplicationTarget target = new ReplicationTarget("peer", "2", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("peer", "2", Table.ID.of("1")); DataInputStream input = null; Path p = new Path("/accumulo/wals/tserver+port/" + UUID.randomUUID().toString()); Status status = null; @@ -501,7 +501,7 @@ public class AccumuloReplicaSystemTest { @Test public void testUserPassword() throws Exception { AccumuloReplicaSystem ars = new AccumuloReplicaSystem(); - ReplicationTarget target = new ReplicationTarget("peer", "peer_table", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("peer", "peer_table", Table.ID.of("1")); String user = "user", password = "password"; Map<String,String> confMap = new HashMap<>(); @@ -516,7 +516,7 @@ public class AccumuloReplicaSystemTest { @Test public void testUserKeytab() throws Exception { AccumuloReplicaSystem ars = new AccumuloReplicaSystem(); - ReplicationTarget target = new ReplicationTarget("peer", "peer_table", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("peer", "peer_table", Table.ID.of("1")); String user = "user", keytab = "/etc/security/keytabs/replication.keytab"; Map<String,String> confMap = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java index e82e96e..af591ef 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/replication/ReplicationProcessorTest.java @@ -83,7 +83,7 @@ public class ReplicationProcessorTest { ReplicationProcessor proc = EasyMock.createMockBuilder(ReplicationProcessor.class) .addMockedMethods("getReplicaSystem", "doesFileExist", "getStatus", "getHelper").createMock(); - ReplicationTarget target = new ReplicationTarget("peer", "1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("peer", "1", Table.ID.of("1")); Status status = Status.newBuilder().setBegin(0).setEnd(0).setInfiniteEnd(true).setClosed(true).build(); Path path = new Path("/accumulo");
