Repository: accumulo Updated Branches: refs/heads/master 401411619 -> cc1cf734b
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 d6f614e..409487f 100644 --- a/test/src/main/java/org/apache/accumulo/test/CloneIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CloneIT.java @@ -49,7 +49,7 @@ public class CloneIT extends AccumuloClusterHarness { String tableName = getUniqueNames(1)[0]; conn.tableOperations().create(tableName); - KeyExtent ke = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null); Mutation mut = ke.getPrevRowUpdateMutation(); TabletsSection.ServerColumnFamily.TIME_COLUMN.put(mut, new Value("M0".getBytes())); @@ -63,9 +63,9 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); - int rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + int rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(0, rc); @@ -79,7 +79,7 @@ public class CloneIT extends AccumuloClusterHarness { String tableName = getUniqueNames(1)[0]; conn.tableOperations().create(tableName); - KeyExtent ke = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke = new KeyExtent(Table.ID.of("0"), null, null); Mutation mut = ke.getPrevRowUpdateMutation(); TabletsSection.ServerColumnFamily.TIME_COLUMN.put(mut, new Value("M0".getBytes())); @@ -94,7 +94,7 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); Mutation mut2 = new Mutation(ke.getMetadataEntry()); mut2.putDelete(DataFileColumnFamily.NAME.toString(), "/default_tablet/0_0.rf"); @@ -103,16 +103,16 @@ public class CloneIT extends AccumuloClusterHarness { bw1.addMutation(mut2); bw1.flush(); - int rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + int rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(1, rc); - rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(0, rc); Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); - scanner.setRange(new KeyExtent(new Table.ID("1"), null, null).toMetadataRange()); + scanner.setRange(new KeyExtent(Table.ID.of("1"), null, null).toMetadataRange()); HashSet<String> files = new HashSet<>(); @@ -141,19 +141,19 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); bw1.addMutation(createTablet("0", "m", null, "/default_tablet", "/default_tablet/0_0.rf")); bw1.addMutation(createTablet("0", null, "m", "/t-1", "/default_tablet/0_0.rf")); bw1.flush(); - int rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + int rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(0, rc); Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); - scanner.setRange(new KeyExtent(new Table.ID("1"), null, null).toMetadataRange()); + scanner.setRange(new KeyExtent(Table.ID.of("1"), null, null).toMetadataRange()); HashSet<String> files = new HashSet<>(); @@ -185,7 +185,7 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); bw1.addMutation(createTablet("0", "m", null, "/default_tablet", "/default_tablet/1_0.rf")); Mutation mut3 = createTablet("0", null, "m", "/t-1", "/default_tablet/1_0.rf"); @@ -194,16 +194,16 @@ public class CloneIT extends AccumuloClusterHarness { bw1.flush(); - int rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + int rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(1, rc); - rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(0, rc); Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); - scanner.setRange(new KeyExtent(new Table.ID("1"), null, null).toMetadataRange()); + scanner.setRange(new KeyExtent(Table.ID.of("1"), null, null).toMetadataRange()); HashSet<String> files = new HashSet<>(); @@ -222,7 +222,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 Table.ID(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)); + KeyExtent ke = new KeyExtent(Table.ID.of(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); @@ -233,7 +233,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 Table.ID(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)); + KeyExtent ke = new KeyExtent(Table.ID.of(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())); @@ -259,7 +259,7 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); bw1.addMutation(createTablet("0", "f", null, "/d1", "/d1/file3")); bw1.addMutation(createTablet("0", "m", "f", "/d3", "/d1/file1")); @@ -268,12 +268,12 @@ public class CloneIT extends AccumuloClusterHarness { bw1.flush(); - int rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + int rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(0, rc); Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); - scanner.setRange(new KeyExtent(new Table.ID("1"), null, null).toMetadataRange()); + scanner.setRange(new KeyExtent(Table.ID.of("1"), null, null).toMetadataRange()); HashSet<String> files = new HashSet<>(); @@ -307,7 +307,7 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); bw1.addMutation(deleteTablet("0", "m", null, "/d1", "/d1/file1")); bw1.addMutation(deleteTablet("0", null, "m", "/d2", "/d2/file2")); @@ -321,7 +321,7 @@ public class CloneIT extends AccumuloClusterHarness { bw1.flush(); - int rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + int rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(1, rc); @@ -333,12 +333,12 @@ public class CloneIT extends AccumuloClusterHarness { bw1.flush(); - rc = MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + rc = MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertEquals(0, rc); Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); - scanner.setRange(new KeyExtent(new Table.ID("1"), null, null).toMetadataRange()); + scanner.setRange(new KeyExtent(Table.ID.of("1"), null, null).toMetadataRange()); HashSet<String> files = new HashSet<>(); @@ -373,7 +373,7 @@ public class CloneIT extends AccumuloClusterHarness { BatchWriter bw2 = conn.createBatchWriter(tableName, new BatchWriterConfig()); - MetadataTableUtil.initializeClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.initializeClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); bw1.addMutation(deleteTablet("0", "m", null, "/d1", "/d1/file1")); Mutation mut = createTablet("0", null, null, "/d2", "/d2/file2"); @@ -383,7 +383,7 @@ public class CloneIT extends AccumuloClusterHarness { bw1.flush(); try { - MetadataTableUtil.checkClone(tableName, new Table.ID("0"), new Table.ID("1"), conn, bw2); + MetadataTableUtil.checkClone(tableName, Table.ID.of("0"), Table.ID.of("1"), conn, bw2); assertTrue(false); } catch (TabletIterator.TabletDeletedException tde) {} http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/FileArchiveIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/FileArchiveIT.java b/test/src/main/java/org/apache/accumulo/test/FileArchiveIT.java index f3f3edd..0a98ccf 100644 --- a/test/src/main/java/org/apache/accumulo/test/FileArchiveIT.java +++ b/test/src/main/java/org/apache/accumulo/test/FileArchiveIT.java @@ -65,7 +65,7 @@ public class FileArchiveIT extends ConfigurableMacBase { conn.tableOperations().create(tableName); - final Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + final Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Assert.assertNotNull("Could not get table ID", tableId); BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig()); @@ -123,7 +123,7 @@ public class FileArchiveIT extends ConfigurableMacBase { conn.tableOperations().create(tableName); - final Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + final Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Assert.assertNotNull("Could not get table ID", tableId); BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig()); @@ -180,7 +180,7 @@ public class FileArchiveIT extends ConfigurableMacBase { conn.tableOperations().create(tableName); - final Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + final Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Assert.assertNotNull("Could not get table ID", tableId); BatchWriter bw = conn.createBatchWriter(tableName, new BatchWriterConfig()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java index 41be4ba..6815d18 100644 --- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java @@ -140,7 +140,7 @@ public class ImportExportIT extends AccumuloClusterHarness { // Get all `file` colfams from the metadata table for the new table log.info("Imported into table with ID: {}", tableId); Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); - s.setRange(MetadataSchema.TabletsSection.getRange(new org.apache.accumulo.core.client.impl.Table.ID(tableId))); + s.setRange(MetadataSchema.TabletsSection.getRange(org.apache.accumulo.core.client.impl.Table.ID.of(tableId))); s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME); MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(s); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 b3c36a9..aab203d 100644 --- a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java @@ -71,7 +71,7 @@ public class LocatorIT extends AccumuloClusterHarness { } private static TabletId newTabletId(String tableId, String endRow, String prevRow) { - return new TabletIdImpl(new KeyExtent(new Table.ID(tableId), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow))); + return new TabletIdImpl(new KeyExtent(Table.ID.of(tableId), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow))); } @Test http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 d5ac807..539a337 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java @@ -46,7 +46,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 Table.ID("5"), null, null); + KeyExtent extent = new KeyExtent(Table.ID.of("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/cc1cf734/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 99db049..12e9d0b 100644 --- a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java @@ -125,7 +125,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { String tableName = getUniqueNames(1)[0]; conn.tableOperations().create(tableName); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Assert.assertNotNull("Table ID was null", tableId); LogEntry logEntry = new LogEntry(new KeyExtent(tableId, null, null), 0, "127.0.0.1:12345", emptyWalog.toURI().toString()); @@ -180,7 +180,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { String tableName = getUniqueNames(1)[0]; conn.tableOperations().create(tableName); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Assert.assertNotNull("Table ID was null", tableId); LogEntry logEntry = new LogEntry(null, 0, "127.0.0.1:12345", partialHeaderWalog.toURI().toString()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java index 17b3ee4..e192183 100644 --- a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java @@ -100,7 +100,7 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacBase { BatchScanner scanner = c.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY, 1); DIRECTORY_COLUMN.fetch(scanner); - Table.ID tableId = new Table.ID(c.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(c.tableOperations().tableIdMap().get(tableName)); assertNotNull("TableID for " + tableName + " was null", tableId); scanner.setRanges(Collections.singletonList(TabletsSection.getRange(tableId))); // verify the directory entries are all on v1, make a few entries relative http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/SampleIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/SampleIT.java b/test/src/main/java/org/apache/accumulo/test/SampleIT.java index dc0b9ce..a195d4b 100644 --- a/test/src/main/java/org/apache/accumulo/test/SampleIT.java +++ b/test/src/main/java/org/apache/accumulo/test/SampleIT.java @@ -205,7 +205,7 @@ public class SampleIT extends AccumuloClusterHarness { Set<String> es = Collections.emptySet(); conn.tableOperations().clone(tableName, clone, false, em, es); conn.tableOperations().offline(clone, true); - Table.ID cloneID = new Table.ID(conn.tableOperations().tableIdMap().get(clone)); + Table.ID cloneID = Table.ID.of(conn.tableOperations().tableIdMap().get(clone)); OfflineScanner oScanner = new OfflineScanner(conn.getInstance(), new Credentials(getAdminPrincipal(), getAdminToken()), cloneID, Authorizations.EMPTY); if (sc != null) { oScanner.setSamplerConfiguration(sc); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 f53a1e5..e8cdad7 100644 --- a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java @@ -87,7 +87,7 @@ public class SplitRecoveryIT extends AccumuloClusterHarness { // poke a partial split into the metadata table connector.securityOperations().grantTablePermission(getAdminPrincipal(), MetadataTable.NAME, TablePermission.WRITE); - Table.ID tableId = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); KeyExtent extent = new KeyExtent(tableId, null, new Text("b")); Mutation m = extent.getPrevRowUpdateMutation(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java index 6f086b9..26ee491 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java @@ -63,7 +63,7 @@ public class TableConfigurationUpdateIT extends AccumuloClusterHarness { int numThreads = 2; // Number of iterations per thread int iterations = 100000; - AccumuloConfiguration tableConf = new TableConfiguration(inst, new org.apache.accumulo.core.client.impl.Table.ID(table), defaultConf); + AccumuloConfiguration tableConf = new TableConfiguration(inst, org.apache.accumulo.core.client.impl.Table.ID.of(table), defaultConf); long start = System.currentTimeMillis(); ExecutorService svc = Executors.newFixedThreadPool(numThreads); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java index ef08cec..4d940a8 100644 --- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java +++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java @@ -177,7 +177,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table1 on namespace1 String tableName = namespace1 + ".1"; connector.tableOperations().create(tableName); - Table.ID tableID = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableID = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); // Add 10 splits to the table addSplits(connector, tableName); @@ -201,7 +201,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { String tableName2 = namespace2 + ".1"; connector.tableOperations().create(tableName2); - Table.ID tableID2 = new Table.ID(connector.tableOperations().tableIdMap().get(tableName2)); + Table.ID tableID2 = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName2)); // Add 10 splits to the table addSplits(connector, tableName2); @@ -228,7 +228,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table1 on namespace1 String tableName = namespace1 + ".1"; connector.tableOperations().create(tableName); - Table.ID tableID = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableID = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); // Add 10 splits to the table addSplits(connector, tableName); @@ -248,7 +248,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table2 on namespace2 String tableName2 = namespace2 + ".1"; connector.tableOperations().create(tableName2); - Table.ID tableID2 = new Table.ID(connector.tableOperations().tableIdMap().get(tableName2)); + Table.ID tableID2 = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName2)); // / Add 10 splits to the table addSplits(connector, tableName2); @@ -276,7 +276,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table1 on namespace1 String tableName = namespace1 + ".1"; connector.tableOperations().create(tableName); - Table.ID tableID = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableID = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); // Add 10 splits to the table addSplits(connector, tableName); @@ -300,7 +300,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table2 on namespace2 String tableName2 = namespace2 + ".1"; connector.tableOperations().create(tableName2); - Table.ID tableID2 = new Table.ID(connector.tableOperations().tableIdMap().get(tableName2)); + Table.ID tableID2 = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName2)); // Add 10 splits to the table addSplits(connector, tableName2); @@ -328,7 +328,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table1 on namespace1 String tableName = namespace1 + ".1"; connector.tableOperations().create(tableName); - Table.ID tableID = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableID = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); // Add 10 splits to the table addSplits(connector, tableName); @@ -360,7 +360,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { // Create table1 on namespace1 String tableName = namespace1 + ".1"; connector.tableOperations().create(tableName); - Table.ID tableID = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableID = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); // Add 10 splits to the table addSplits(connector, tableName); @@ -379,7 +379,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { Connector connector = getConnector(); String tableName = getUniqueNames(2)[0]; connector.tableOperations().create(tableName); - Table.ID tableID = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableID = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); // Add 10 splits to the table addSplits(connector, tableName); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 cce3686..d8073e1 100644 --- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java @@ -189,7 +189,7 @@ public class VolumeIT extends ConfigurableMacBase { String tableName = getUniqueNames(1)[0]; connector.tableOperations().create(tableName, new NewTableConfiguration().withoutDefaultIterators()); - Table.ID tableId = new Table.ID(connector.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(connector.tableOperations().tableIdMap().get(tableName)); SortedSet<Text> partitions = new TreeSet<>(); // with some splits @@ -404,7 +404,7 @@ public class VolumeIT extends ConfigurableMacBase { verifyData(expected, conn.createScanner(tableName, Authorizations.EMPTY)); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Scanner metaScanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.fetch(metaScanner); metaScanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 2886d68..0f436af 100644 --- a/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java +++ b/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java @@ -64,8 +64,8 @@ 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 Table.ID("!!"), null, new Text("row_0003750000")).toThrift(), - mutation.toThrift(), TDurability.DEFAULT); + client.update(Tracer.traceInfo(), context.rpcCreds(), new KeyExtent(Table.ID.of("!!"), 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/cc1cf734/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java index ce02352..07161d4 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java @@ -68,7 +68,7 @@ public class FunctionalTestUtils { public static int countRFiles(Connector c, String tableName) throws Exception { Scanner scanner = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY); - Table.ID tableId = new Table.ID(c.tableOperations().tableIdMap().get(tableName)); + Table.ID tableId = Table.ID.of(c.tableOperations().tableIdMap().get(tableName)); scanner.setRange(MetadataSchema.TabletsSection.getRange(tableId)); scanner.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 3595ca2..c6f7cd3 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 @@ -92,7 +92,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 Table.ID(tableId), null))); + MetaDataTableScanner s = new MetaDataTableScanner(context, new Range(KeyExtent.getMetadataEntry(Table.ID.of(tableId), null))); TabletLocationState tlState = s.next(); s.close(); return tlState; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 1a62e02..3aaa13c 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 @@ -219,7 +219,7 @@ public class MergeIT extends AccumuloClusterHarness { protected void resetScanner() { try { Scanner ds = conn.createScanner(metadataTableName, Authorizations.EMPTY); - Text tablet = new KeyExtent(new Table.ID("0"), new Text("m"), null).getMetadataEntry(); + Text tablet = new KeyExtent(Table.ID.of("0"), new Text("m"), null).getMetadataEntry(); ds.setRange(new Range(tablet, true, tablet, true)); Mutation m = new Mutation(tablet); @@ -250,11 +250,11 @@ public class MergeIT extends AccumuloClusterHarness { String metadataTableName = getUniqueNames(1)[0]; getConnector().tableOperations().create(metadataTableName); - KeyExtent ke1 = new KeyExtent(new Table.ID("0"), new Text("m"), null); + KeyExtent ke1 = new KeyExtent(Table.ID.of("0"), new Text("m"), null); Mutation mut1 = ke1.getPrevRowUpdateMutation(); TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(mut1, new Value("/d1".getBytes())); - KeyExtent ke2 = new KeyExtent(new Table.ID("0"), null, null); + KeyExtent ke2 = new KeyExtent(Table.ID.of("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/cc1cf734/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java index dd8238a..c77eccc 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java @@ -165,8 +165,8 @@ public class RegexGroupBalanceIT extends ConfigurableMacBase { private Table<String,String,MutableInt> getCounts(Connector conn, String tablename) throws TableNotFoundException { Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY); s.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME); - org.apache.accumulo.core.client.impl.Table.ID tableId = new org.apache.accumulo.core.client.impl.Table.ID(conn.tableOperations().tableIdMap() - .get(tablename)); + org.apache.accumulo.core.client.impl.Table.ID tableId = org.apache.accumulo.core.client.impl.Table.ID + .of(conn.tableOperations().tableIdMap().get(tablename)); s.setRange(MetadataSchema.TabletsSection.getRange(tableId)); Table<String,String,MutableInt> groupLocationCounts = HashBasedTable.create(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 263787c..783f294 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 @@ -148,7 +148,7 @@ public class SplitIT extends AccumuloClusterHarness { while (c.tableOperations().listSplits(table).size() < 10) { sleepUninterruptibly(15, TimeUnit.SECONDS); } - Table.ID id = new Table.ID(c.tableOperations().tableIdMap().get(table)); + Table.ID id = Table.ID.of(c.tableOperations().tableIdMap().get(table)); Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY); KeyExtent extent = new KeyExtent(id, null, null); s.setRange(extent.toMetadataRange()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 10fcb61..c8d0fda 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 @@ -78,7 +78,7 @@ public class SplitRecoveryIT extends ConfigurableMacBase { } private KeyExtent nke(String table, String endRow, String prevEndRow) { - return new KeyExtent(new Table.ID(table), endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow)); + return new KeyExtent(Table.ID.of(table), endRow == null ? null : new Text(endRow), prevEndRow == null ? null : new Text(prevEndRow)); } private void run() throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 72cf260..19a09f5 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 @@ -86,7 +86,7 @@ public class TableIT extends AccumuloClusterHarness { to.flush(tableName, null, null, true); vopts.setTableName(tableName); VerifyIngest.verifyIngest(c, vopts, new ScannerOpts()); - Table.ID id = new Table.ID(to.tableIdMap().get(tableName)); + Table.ID id = Table.ID.of(to.tableIdMap().get(tableName)); Scanner s = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY); s.setRange(new KeyExtent(id, null, null).toMetadataRange()); s.fetchColumnFamily(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 a5149dc..8b496d8 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 @@ -111,7 +111,7 @@ public class TabletStateChangeIteratorIT extends AccumuloClusterHarness { state = new State() { @Override public Collection<MergeInfo> merges() { - Table.ID tableIdToModify = new Table.ID(getConnector().tableOperations().tableIdMap().get(t3)); + Table.ID tableIdToModify = Table.ID.of(getConnector().tableOperations().tableIdMap().get(t3)); return Collections.singletonList(new MergeInfo(new KeyExtent(tableIdToModify, null, null), MergeInfo.Operation.MERGE)); } }; @@ -128,7 +128,7 @@ public class TabletStateChangeIteratorIT extends AccumuloClusterHarness { } private void addDuplicateLocation(String table, String tableNameToModify) throws TableNotFoundException, MutationsRejectedException { - Table.ID tableIdToModify = new Table.ID(getConnector().tableOperations().tableIdMap().get(tableNameToModify)); + Table.ID tableIdToModify = Table.ID.of(getConnector().tableOperations().tableIdMap().get(tableNameToModify)); 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); @@ -137,7 +137,7 @@ public class TabletStateChangeIteratorIT extends AccumuloClusterHarness { } private void reassignLocation(String table, String tableNameToModify) throws TableNotFoundException, MutationsRejectedException { - Table.ID tableIdToModify = new Table.ID(getConnector().tableOperations().tableIdMap().get(tableNameToModify)); + Table.ID tableIdToModify = Table.ID.of(getConnector().tableOperations().tableIdMap().get(tableNameToModify)); Scanner scanner = getConnector().createScanner(table, Authorizations.EMPTY); scanner.setRange(new KeyExtent(tableIdToModify, null, null).toMetadataRange()); scanner.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME); @@ -152,7 +152,7 @@ public class TabletStateChangeIteratorIT extends AccumuloClusterHarness { } private void removeLocation(String table, String tableNameToModify) throws TableNotFoundException, MutationsRejectedException { - Table.ID tableIdToModify = new Table.ID(getConnector().tableOperations().tableIdMap().get(tableNameToModify)); + Table.ID tableIdToModify = Table.ID.of(getConnector().tableOperations().tableIdMap().get(tableNameToModify)); BatchDeleter deleter = getConnector().createBatchDeleter(table, Authorizations.EMPTY, 1, new BatchWriterConfig()); deleter.setRanges(Collections.singleton(new KeyExtent(tableIdToModify, null, null).toMetadataRange())); deleter.fetchColumnFamily(MetadataSchema.TabletsSection.CurrentLocationColumnFamily.NAME); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 708b591..63107e5 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 @@ -168,7 +168,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 Table.ID("1"), ProtobufUtil.toValue(StatusUtil.ingestedUntil(1000))); + StatusSection.add(m, Table.ID.of("1"), ProtobufUtil.toValue(StatusUtil.ingestedUntil(1000))); bw.addMutation(m); bw.close(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 7730e38..269e5631 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 @@ -67,7 +67,7 @@ public class MergeStateIT extends ConfigurableMacBase { @Override public Set<Table.ID> onlineTables() { - return Collections.singleton(new Table.ID("t")); + return Collections.singleton(Table.ID.of("t")); } @Override @@ -114,7 +114,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 - Table.ID tableId = new Table.ID("t"); + Table.ID tableId = Table.ID.of("t"); Text pr = null; for (String s : splits) { Text split = new Text(s); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/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 259edbd..bf16678 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 @@ -78,7 +78,7 @@ public class MetadataBatchScanTest { splits.add((r.nextLong() & 0x7fffffffffffffffl) % 1000000000000l); } - Table.ID tid = new Table.ID("8"); + Table.ID tid = Table.ID.of("8"); Text per = null; ArrayList<KeyExtent> extents = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java b/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java index de326c8..f03570f 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java @@ -66,7 +66,7 @@ public class FinishedWorkUpdaterIT extends ConfigurableMacBase { String file = "/accumulo/wals/tserver+port/" + UUID.randomUUID(); Status stat = Status.newBuilder().setBegin(100).setEnd(200).setClosed(true).setInfiniteEnd(false).build(); - ReplicationTarget target = new ReplicationTarget("peer", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("peer", "table1", Table.ID.of("1")); // Create a single work record for a file to some peer BatchWriter bw = ReplicationTable.getBatchWriter(conn); @@ -101,9 +101,9 @@ public class FinishedWorkUpdaterIT extends ConfigurableMacBase { Status stat1 = Status.newBuilder().setBegin(100).setEnd(1000).setClosed(true).setInfiniteEnd(false).build(), stat2 = Status.newBuilder().setBegin(500).setEnd(1000).setClosed(true).setInfiniteEnd(false).build(), stat3 = Status.newBuilder().setBegin(1).setEnd(1000).setClosed(true).setInfiniteEnd(false).build(); - ReplicationTarget target1 = new ReplicationTarget("peer1", "table1", new Table.ID("1")), - target2 = new ReplicationTarget("peer2", "table2", new Table.ID("1")), - target3 = new ReplicationTarget("peer3", "table3", new Table.ID("1")); + ReplicationTarget target1 = new ReplicationTarget("peer1", "table1", Table.ID.of("1")), + target2 = new ReplicationTarget("peer2", "table2", Table.ID.of("1")), + target3 = new ReplicationTarget("peer3", "table3", Table.ID.of("1")); // @formatter:on // Create a single work record for a file to some peer @@ -141,9 +141,9 @@ public class FinishedWorkUpdaterIT extends ConfigurableMacBase { Status stat1 = Status.newBuilder().setBegin(100).setEnd(1000).setClosed(true).setInfiniteEnd(true).build(), stat2 = Status.newBuilder().setBegin(1).setEnd(1000).setClosed(true).setInfiniteEnd(true).build(), stat3 = Status.newBuilder().setBegin(500).setEnd(1000).setClosed(true).setInfiniteEnd(true).build(); - ReplicationTarget target1 = new ReplicationTarget("peer1", "table1", new Table.ID("1")), - target2 = new ReplicationTarget("peer2", "table2", new Table.ID("1")), - target3 = new ReplicationTarget("peer3", "table3", new Table.ID("1")); + ReplicationTarget target1 = new ReplicationTarget("peer1", "table1", Table.ID.of("1")), + target2 = new ReplicationTarget("peer2", "table2", Table.ID.of("1")), + target3 = new ReplicationTarget("peer3", "table3", Table.ID.of("1")); // @formatter:on // Create a single work record for a file to some peer http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java index 6141a02..bf1474f 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java @@ -124,7 +124,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB */ private Set<String> getFilesForTable(String tableName) throws Exception { final Connector conn = getConnector(); - final Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + final Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); Assert.assertNotNull("Could not determine table ID for " + tableName, tableId); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java index 3fe2d2e..2a4af6b 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java @@ -78,7 +78,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase { } private Table.ID createTableId(int i) { - return new Table.ID(Integer.toString(i)); + return Table.ID.of(Integer.toString(i)); } @Test @@ -165,14 +165,14 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase { // Add two records that we can delete String fileToRemove = "/accumulo/wal/tserver+port/" + UUID.randomUUID(); Mutation m = new Mutation(fileToRemove); - StatusSection.add(m, new Table.ID("5"), ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build())); + StatusSection.add(m, Table.ID.of("5"), ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build())); replBw.addMutation(m); numRecords++; fileToRemove = "/accumulo/wal/tserver+port/" + UUID.randomUUID(); m = new Mutation(fileToRemove); - StatusSection.add(m, new Table.ID("6"), ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build())); + StatusSection.add(m, Table.ID.of("6"), ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(false).build())); replBw.addMutation(m); numRecords++; @@ -229,14 +229,14 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase { String fileToRemove = "/accumulo/wal/tserver+port/" + UUID.randomUUID(); filesToRemove.add(fileToRemove); Mutation m = new Mutation(fileToRemove); - ReplicationTarget target = new ReplicationTarget("peer1", "5", new Table.ID("5")); + ReplicationTarget target = new ReplicationTarget("peer1", "5", Table.ID.of("5")); Value value = ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(true).setCreatedTime(time).build()); - StatusSection.add(m, new Table.ID("5"), value); + StatusSection.add(m, Table.ID.of("5"), value); WorkSection.add(m, target.toText(), value); replBw.addMutation(m); m = OrderSection.createMutation(fileToRemove, time); - OrderSection.add(m, new Table.ID("5"), value); + OrderSection.add(m, Table.ID.of("5"), value); replBw.addMutation(m); time++; @@ -246,13 +246,13 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase { filesToRemove.add(fileToRemove); m = new Mutation(fileToRemove); value = ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(true).setCreatedTime(time).build()); - target = new ReplicationTarget("peer1", "6", new Table.ID("6")); - StatusSection.add(m, new Table.ID("6"), value); + target = new ReplicationTarget("peer1", "6", Table.ID.of("6")); + StatusSection.add(m, Table.ID.of("6"), value); WorkSection.add(m, target.toText(), value); replBw.addMutation(m); m = OrderSection.createMutation(fileToRemove, time); - OrderSection.add(m, new Table.ID("6"), value); + OrderSection.add(m, Table.ID.of("6"), value); replBw.addMutation(m); time++; @@ -308,13 +308,13 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase { // Add two records that we can delete String fileToRemove = "/accumulo/wal/tserver+port/" + UUID.randomUUID(); Mutation m = new Mutation(fileToRemove); - ReplicationTarget target = new ReplicationTarget("peer1", "5", new Table.ID("5")); + ReplicationTarget target = new ReplicationTarget("peer1", "5", Table.ID.of("5")); Value value = ProtobufUtil.toValue(builder.setBegin(10000).setEnd(10000).setClosed(true).build()); - StatusSection.add(m, new Table.ID("5"), value); + StatusSection.add(m, Table.ID.of("5"), value); WorkSection.add(m, target.toText(), value); - target = new ReplicationTarget("peer2", "5", new Table.ID("5")); + target = new ReplicationTarget("peer2", "5", Table.ID.of("5")); WorkSection.add(m, target.toText(), value); - target = new ReplicationTarget("peer3", "5", new Table.ID("5")); + target = new ReplicationTarget("peer3", "5", Table.ID.of("5")); WorkSection.add(m, target.toText(), ProtobufUtil.toValue(builder.setClosed(false).build())); replBw.addMutation(m); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java index ee8cebf..770a884 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java @@ -159,7 +159,7 @@ public class ReplicationIT extends ConfigurableMacBase { for (UUID id : entry.getValue()) { Pair<WalState,Path> state = wals.state(entry.getKey(), id); for (String tableId : serverToTableID.get(entry.getKey())) { - logs.put(state.getSecond().toString(), new Table.ID(tableId)); + logs.put(state.getSecond().toString(), Table.ID.of(tableId)); } } } @@ -676,7 +676,7 @@ public class ReplicationIT extends ConfigurableMacBase { String table = "table"; conn.tableOperations().create(table); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(table)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(table)); Assert.assertNotNull(tableId); @@ -974,7 +974,7 @@ public class ReplicationIT extends ConfigurableMacBase { writeSomeData(conn, table1, 2000, 50); conn.tableOperations().flush(table1, null, null, true); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(table1)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(table1)); Assert.assertNotNull("Table ID was null", tableId); // Make sure the replication table exists at this point @@ -1220,7 +1220,7 @@ public class ReplicationIT extends ConfigurableMacBase { } } - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(table1)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(table1)); Assert.assertNotNull("Could not determine table id for " + table1, tableId); // Write some data to table1 http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java index 8604e48..5fb22b7 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java @@ -90,7 +90,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase { @Override protected Table.ID getTableId(Instance inst, String tableName) throws ThriftTableOperationException { try { - return new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + return Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); } catch (Exception e) { throw new RuntimeException(e); } @@ -114,7 +114,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase { @Test public void waitsUntilEntriesAreReplicated() throws Exception { conn.tableOperations().create("foo"); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get("foo")); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get("foo")); String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(), file2 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(); Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build(); @@ -210,8 +210,8 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase { conn.tableOperations().create("foo"); conn.tableOperations().create("bar"); - Table.ID tableId1 = new Table.ID(conn.tableOperations().tableIdMap().get("foo")); - Table.ID tableId2 = new Table.ID(conn.tableOperations().tableIdMap().get("bar")); + Table.ID tableId1 = Table.ID.of(conn.tableOperations().tableIdMap().get("foo")); + Table.ID tableId2 = Table.ID.of(conn.tableOperations().tableIdMap().get("bar")); String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(), file2 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(); Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build(); @@ -293,7 +293,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase { public void inprogressReplicationRecordsBlockExecution() throws Exception { conn.tableOperations().create("foo"); - Table.ID tableId1 = new Table.ID(conn.tableOperations().tableIdMap().get("foo")); + Table.ID tableId1 = Table.ID.of(conn.tableOperations().tableIdMap().get("foo")); String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(); Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build(); @@ -371,7 +371,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase { public void laterCreatedLogsDontBlockExecution() throws Exception { conn.tableOperations().create("foo"); - Table.ID tableId1 = new Table.ID(conn.tableOperations().tableIdMap().get("foo")); + Table.ID tableId1 = Table.ID.of(conn.tableOperations().tableIdMap().get("foo")); String file1 = "/accumulo/wals/tserver+port/" + UUID.randomUUID(); Status stat = Status.newBuilder().setBegin(0).setEnd(10000).setInfiniteEnd(false).setClosed(false).build(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java index cf0c5a7..2a7b853 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java @@ -105,7 +105,7 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase { @Test public void createWorkForFilesInCorrectOrder() throws Exception { - ReplicationTarget target = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); Text serializedTarget = target.toText(); // Create two mutations, both of which need replication work done @@ -164,10 +164,10 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase { @Test public void workAcrossTablesHappensConcurrently() throws Exception { - ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); Text serializedTarget1 = target1.toText(); - ReplicationTarget target2 = new ReplicationTarget("cluster1", "table2", new Table.ID("2")); + ReplicationTarget target2 = new ReplicationTarget("cluster1", "table2", Table.ID.of("2")); Text serializedTarget2 = target2.toText(); // Create two mutations, both of which need replication work done @@ -233,10 +233,10 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase { @Test public void workAcrossPeersHappensConcurrently() throws Exception { - ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); Text serializedTarget1 = target1.toText(); - ReplicationTarget target2 = new ReplicationTarget("cluster2", "table1", new Table.ID("1")); + ReplicationTarget target2 = new ReplicationTarget("cluster2", "table1", Table.ID.of("1")); Text serializedTarget2 = target2.toText(); // Create two mutations, both of which need replication work done @@ -304,7 +304,7 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase { @Test public void reprocessingOfCompletedWorkRemovesWork() throws Exception { - ReplicationTarget target = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); Text serializedTarget = target.toText(); // Create two mutations, both of which need replication work done http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java index 0bf1645..8b8dceb 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java @@ -102,7 +102,7 @@ public class StatusCombinerMacIT extends SharedMiniClusterBase { long createTime = System.currentTimeMillis(); try { Mutation m = new Mutation("file:/accumulo/wal/HW10447.local+56808/93cdc17e-7521-44fa-87b5-37f45bcb92d3"); - StatusSection.add(m, new Table.ID("1"), StatusUtil.fileCreatedValue(createTime)); + StatusSection.add(m, Table.ID.of("1"), StatusUtil.fileCreatedValue(createTime)); bw.addMutation(m); } finally { bw.close(); @@ -115,7 +115,7 @@ public class StatusCombinerMacIT extends SharedMiniClusterBase { bw = ReplicationTable.getBatchWriter(conn); try { Mutation m = new Mutation("file:/accumulo/wal/HW10447.local+56808/93cdc17e-7521-44fa-87b5-37f45bcb92d3"); - StatusSection.add(m, new Table.ID("1"), ProtobufUtil.toValue(StatusUtil.replicated(Long.MAX_VALUE))); + StatusSection.add(m, Table.ID.of("1"), ProtobufUtil.toValue(StatusUtil.replicated(Long.MAX_VALUE))); bw.addMutation(m); } finally { bw.close(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java index 34d9ef6..68fe1e3 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java @@ -119,8 +119,8 @@ public class UnorderedWorkAssignerIT extends ConfigurableMacBase { @Test public void createWorkForFilesNeedingIt() throws Exception { - ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", new Table.ID("1")), target2 = new ReplicationTarget("cluster1", "table2", - new Table.ID("2")); + ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")), target2 = new ReplicationTarget("cluster1", "table2", + Table.ID.of("2")); Text serializedTarget1 = target1.toText(), serializedTarget2 = target2.toText(); String keyTarget1 = target1.getPeerName() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target1.getRemoteIdentifier() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target1.getSourceTableId(), keyTarget2 = target2.getPeerName() @@ -176,8 +176,8 @@ public class UnorderedWorkAssignerIT extends ConfigurableMacBase { @Test public void doNotCreateWorkForFilesNotNeedingIt() throws Exception { - ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", new Table.ID("1")), target2 = new ReplicationTarget("cluster1", "table2", - new Table.ID("2")); + ReplicationTarget target1 = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")), target2 = new ReplicationTarget("cluster1", "table2", + Table.ID.of("2")); Text serializedTarget1 = target1.toText(), serializedTarget2 = target2.toText(); // Create two mutations, both of which need replication work done @@ -213,7 +213,7 @@ public class UnorderedWorkAssignerIT extends ConfigurableMacBase { assigner.setQueuedWork(queuedWork); - ReplicationTarget target = new ReplicationTarget("cluster1", "table1", new Table.ID("1")); + ReplicationTarget target = new ReplicationTarget("cluster1", "table1", Table.ID.of("1")); String serializedTarget = target.getPeerName() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target.getRemoteIdentifier() + DistributedWorkQueueWorkAssignerHelper.KEY_SEPARATOR + target.getSourceTableId(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java index 5219d1a..bde9101 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java @@ -78,7 +78,7 @@ public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase conn.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE); conn.tableOperations().create(tableName); - final Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(tableName)); + final Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(tableName)); final int numericTableId = Integer.parseInt(tableId.canonicalID()); final int fakeTableId = numericTableId + 1; @@ -114,7 +114,7 @@ public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase value.write(out); key.event = LogEvents.DEFINE_TABLET; - key.tablet = new KeyExtent(new Table.ID(Integer.toString(fakeTableId)), null, null); + key.tablet = new KeyExtent(Table.ID.of(Integer.toString(fakeTableId)), null, null); key.seq = 1l; key.tid = 1; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc1cf734/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java index 81fefd5..da9ebb2 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java @@ -86,7 +86,7 @@ public class WorkMakerIT extends ConfigurableMacBase { public void singleUnitSingleTarget() throws Exception { String table = testName.getMethodName(); conn.tableOperations().create(table); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(table)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(table)); String file = "hdfs://localhost:8020/accumulo/wal/123456-1234-1234-12345678"; // Create a status record for a file @@ -128,7 +128,7 @@ public class WorkMakerIT extends ConfigurableMacBase { String table = testName.getMethodName(); conn.tableOperations().create(table); - Table.ID tableId = new Table.ID(conn.tableOperations().tableIdMap().get(table)); + Table.ID tableId = Table.ID.of(conn.tableOperations().tableIdMap().get(table)); String file = "hdfs://localhost:8020/accumulo/wal/123456-1234-1234-12345678";
