This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new b926c8967d Remove CompactorGroupIdImpl in favor of CompactorGroupId,
add cache (#4313)
b926c8967d is described below
commit b926c8967df2d936fed870495d139ad34c5683f0
Author: Dom G <domgargu...@apache.org>
AuthorDate: Wed Feb 28 09:17:13 2024 -0500
Remove CompactorGroupIdImpl in favor of CompactorGroupId, add cache (#4313)
* Remove CompactorGroupIdImpl in favor of CompactorGroupId, use cache
---------
Co-authored-by: Keith Turner <ktur...@apache.org>
---
.../core/metadata/schema/CompactionMetadata.java | 6 ++--
.../core/spi/compaction/CompactorGroupId.java | 20 +++++++++++--
.../apache/accumulo/core/util/cache/Caches.java | 1 +
.../compaction/CompactionPlannerInitParams.java | 2 +-
.../core/util/compaction/CompactorGroupIdImpl.java | 34 ----------------------
.../core/metadata/schema/TabletMetadataTest.java | 7 ++---
.../compaction/DefaultCompactionPlannerTest.java | 31 ++++++++++----------
.../util/compaction/CompactionPrioritizerTest.java | 3 +-
.../coordinator/CompactionCoordinator.java | 5 ++--
.../compaction/CompactionCoordinatorTest.java | 3 +-
.../queue/CompactionJobPriorityQueueTest.java | 3 +-
.../compaction/queue/CompactionJobQueuesTest.java | 5 ++--
.../apache/accumulo/test/functional/MergeIT.java | 3 +-
13 files changed, 49 insertions(+), 74 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java
index 3d0536d593..81c15d662c 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java
@@ -31,7 +31,6 @@ import org.apache.accumulo.core.metadata.ReferencedTabletFile;
import org.apache.accumulo.core.metadata.StoredTabletFile;
import org.apache.accumulo.core.spi.compaction.CompactionKind;
import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
public class CompactionMetadata {
@@ -126,9 +125,8 @@ public class CompactionMetadata {
return new
CompactionMetadata(jData.inputs.stream().map(StoredTabletFile::new).collect(toSet()),
StoredTabletFile.of(jData.tmp).getTabletFile(), jData.compactor,
- CompactionKind.valueOf(jData.kind), jData.priority,
- CompactorGroupIdImpl.groupId(jData.groupId), jData.propDels,
- jData.fateId == null ? null : FateId.from(jData.fateId));
+ CompactionKind.valueOf(jData.kind), jData.priority,
CompactorGroupId.of(jData.groupId),
+ jData.propDels, jData.fateId == null ? null :
FateId.from(jData.fateId));
}
@Override
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
index f9fd032d75..83af094dbd 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
@@ -19,6 +19,9 @@
package org.apache.accumulo.core.spi.compaction;
import org.apache.accumulo.core.data.AbstractId;
+import org.apache.accumulo.core.util.cache.Caches;
+
+import com.github.benmanes.caffeine.cache.Cache;
/**
* A unique identifier for a compactor group that a {@link CompactionPlanner}
can schedule
@@ -28,10 +31,23 @@ import org.apache.accumulo.core.data.AbstractId;
* @see org.apache.accumulo.core.spi.compaction
*/
public class CompactorGroupId extends AbstractId<CompactorGroupId> {
- // ELASTICITY_TODO make this cache ids like TableId. This will help save
manager memory.
private static final long serialVersionUID = 1L;
- protected CompactorGroupId(String canonical) {
+ static final Cache<String,CompactorGroupId> cache = Caches.getInstance()
+ .createNewBuilder(Caches.CacheName.COMPACTOR_GROUP_ID,
false).weakValues().build();
+
+ private CompactorGroupId(String canonical) {
super(canonical);
}
+
+ /**
+ * Get a CompactorGroupId object for the provided canonical string. This is
guaranteed to be
+ * non-null.
+ *
+ * @param canonical compactor group ID string
+ * @return CompactorGroupId object
+ */
+ public static CompactorGroupId of(String canonical) {
+ return cache.get(canonical, CompactorGroupId::new);
+ }
}
diff --git a/core/src/main/java/org/apache/accumulo/core/util/cache/Caches.java
b/core/src/main/java/org/apache/accumulo/core/util/cache/Caches.java
index 39a96225d4..a96af36bc5 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/cache/Caches.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/cache/Caches.java
@@ -42,6 +42,7 @@ public class Caches implements MetricsProducer {
COMPACTION_CONFIGS,
COMPACTION_DIR_CACHE,
COMPACTION_DISPATCHERS,
+ COMPACTOR_GROUP_ID,
COMPRESSION_ALGORITHM,
CRYPT_PASSWORDS,
HOST_REGEX_BALANCER_TABLE_REGEX,
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlannerInitParams.java
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlannerInitParams.java
index 6966815439..b9677b04ab 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlannerInitParams.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlannerInitParams.java
@@ -67,7 +67,7 @@ public class CompactionPlannerInitParams implements
CompactionPlanner.InitParame
@Override
public CompactorGroupId getGroup(String name) {
- var cgid = CompactorGroupIdImpl.groupId(name);
+ var cgid = CompactorGroupId.of(name);
Preconditions.checkArgument(!getRequestedGroups().contains(cgid),
"Duplicate compactor group for group: " + name);
getRequestedGroups().add(cgid);
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactorGroupIdImpl.java
b/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactorGroupIdImpl.java
deleted file mode 100644
index f3b15de965..0000000000
---
a/core/src/main/java/org/apache/accumulo/core/util/compaction/CompactorGroupIdImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.util.compaction;
-
-import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
-
-public class CompactorGroupIdImpl extends CompactorGroupId {
-
- protected CompactorGroupIdImpl(String canonical) {
- super(canonical);
- }
-
- private static final long serialVersionUID = 1L;
-
- public static CompactorGroupId groupId(String groupName) {
- return new CompactorGroupIdImpl(groupName);
- }
-}
diff --git
a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
index 7e927749b4..8131a1a0df 100644
---
a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
@@ -76,8 +76,8 @@ import
org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType;
import org.apache.accumulo.core.spi.compaction.CompactionKind;
+import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.Test;
@@ -431,9 +431,8 @@ public class TabletMetadataTest {
assertThrows(IllegalStateException.class, tm2::getCompacted);
var ecid1 = ExternalCompactionId.generate(UUID.randomUUID());
- CompactionMetadata ecm =
- new CompactionMetadata(Set.of(sf1, sf2), rf1, "cid1",
CompactionKind.USER, (short) 3,
- CompactorGroupIdImpl.groupId("Q1"), true, FateId.from(type, 99L));
+ CompactionMetadata ecm = new CompactionMetadata(Set.of(sf1, sf2), rf1,
"cid1",
+ CompactionKind.USER, (short) 3, CompactorGroupId.of("Q1"), true,
FateId.from(type, 99L));
LogEntry le1 = LogEntry.fromPath("localhost+8020/" + UUID.randomUUID());
LogEntry le2 = LogEntry.fromPath("localhost+8020/" + UUID.randomUUID());
diff --git
a/core/src/test/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlannerTest.java
b/core/src/test/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlannerTest.java
index 43a6179b51..8f2f317946 100644
---
a/core/src/test/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlannerTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlannerTest.java
@@ -54,7 +54,6 @@ import
org.apache.accumulo.core.util.compaction.CompactionJobImpl;
import org.apache.accumulo.core.util.compaction.CompactionJobPrioritizer;
import org.apache.accumulo.core.util.compaction.CompactionPlanImpl;
import org.apache.accumulo.core.util.compaction.CompactionPlannerInitParams;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import org.easymock.EasyMock;
import org.junit.jupiter.api.Test;
@@ -178,7 +177,7 @@ public class DefaultCompactionPlannerTest {
// planner should compact.
var job = getOnlyElement(plan.getJobs());
assertEquals(candidates, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("medium"), job.getGroup());
+ assertEquals(CompactorGroupId.of("medium"), job.getGroup());
}
@Test
@@ -201,7 +200,7 @@ public class DefaultCompactionPlannerTest {
// a running non-user compaction should not prevent a user compaction
var job = getOnlyElement(plan.getJobs());
assertEquals(candidates, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("medium"), job.getGroup());
+ assertEquals(CompactorGroupId.of("medium"), job.getGroup());
assertEquals(CompactionJobPrioritizer.createPriority(TableId.of("42"),
CompactionKind.USER,
all.size(), job.getFiles().size()), job.getPriority());
@@ -221,7 +220,7 @@ public class DefaultCompactionPlannerTest {
plan = planner.makePlan(params);
job = getOnlyElement(plan.getJobs());
assertEquals(createCFs("F1", "1M", "F2", "2M", "F3", "4M"),
job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("small"), job.getGroup());
+ assertEquals(CompactorGroupId.of("small"), job.getGroup());
// should compact all 15
all = createCFs("FI", "7M", "F4", "8M", "F5", "16M", "F6", "32M", "F7",
"64M", "F8", "128M",
@@ -231,7 +230,7 @@ public class DefaultCompactionPlannerTest {
plan = planner.makePlan(params);
job = getOnlyElement(plan.getJobs());
assertEquals(all, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("huge"), job.getGroup());
+ assertEquals(CompactorGroupId.of("huge"), job.getGroup());
// For user compaction, can compact a subset that meets the compaction
ratio if there is also a
// larger set of files that meets the compaction ratio
@@ -241,7 +240,7 @@ public class DefaultCompactionPlannerTest {
plan = planner.makePlan(params);
job = getOnlyElement(plan.getJobs());
assertEquals(createCFs("F1", "3M", "F2", "4M", "F3", "5M", "F4", "6M"),
job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("small"), job.getGroup());
+ assertEquals(CompactorGroupId.of("small"), job.getGroup());
// There is a subset of small files that meets the compaction ratio, but
the larger set does not
// so compact everything to avoid doing more than logarithmic work
@@ -250,7 +249,7 @@ public class DefaultCompactionPlannerTest {
plan = planner.makePlan(params);
job = getOnlyElement(plan.getJobs());
assertEquals(all, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("medium"), job.getGroup());
+ assertEquals(CompactorGroupId.of("medium"), job.getGroup());
}
@@ -267,14 +266,14 @@ public class DefaultCompactionPlannerTest {
// should only compact files less than max size
var job = getOnlyElement(plan.getJobs());
assertEquals(createCFs("F1", "128M", "F2", "129M", "F3", "130M"),
job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("large"), job.getGroup());
+ assertEquals(CompactorGroupId.of("large"), job.getGroup());
// user compaction can exceed the max size
params = createPlanningParams(all, all, Set.of(), 2, CompactionKind.USER);
plan = planner.makePlan(params);
job = getOnlyElement(plan.getJobs());
assertEquals(all, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("large"), job.getGroup());
+ assertEquals(CompactorGroupId.of("large"), job.getGroup());
}
@Test
@@ -300,7 +299,7 @@ public class DefaultCompactionPlannerTest {
plan.getJobs().forEach(job -> {
assertEquals(15, job.getFiles().size());
assertEquals(kind, job.getKind());
- assertEquals(CompactorGroupIdImpl.groupId("small"), job.getGroup());
+ assertEquals(CompactorGroupId.of("small"), job.getGroup());
// ensure the files across all of the jobs are disjoint
job.getFiles().forEach(cf -> assertTrue(filesSeen.add(cf)));
});
@@ -375,7 +374,7 @@ public class DefaultCompactionPlannerTest {
plan.getJobs().forEach(job -> {
assertEquals(15, job.getFiles().size());
assertEquals(kind, job.getKind());
- assertEquals(CompactorGroupIdImpl.groupId("small"), job.getGroup());
+ assertEquals(CompactorGroupId.of("small"), job.getGroup());
// ensure the files across all of the jobs are disjoint
job.getFiles().forEach(cf -> assertTrue(filesSeen.add(cf)));
});
@@ -444,7 +443,7 @@ public class DefaultCompactionPlannerTest {
var job = getOnlyElement(plan.getJobs());
assertEquals(all, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("small"), job.getGroup());
+ assertEquals(CompactorGroupId.of("small"), job.getGroup());
all = createCFs("F1", "100M", "F2", "100M", "F3", "100M", "F4", "100M");
params = createPlanningParams(all, all, Set.of(), 2,
CompactionKind.SYSTEM);
@@ -452,7 +451,7 @@ public class DefaultCompactionPlannerTest {
job = getOnlyElement(plan.getJobs());
assertEquals(all, job.getFiles());
- assertEquals(CompactorGroupIdImpl.groupId("midsize"), job.getGroup());
+ assertEquals(CompactorGroupId.of("midsize"), job.getGroup());
}
/**
@@ -634,8 +633,8 @@ public class DefaultCompactionPlannerTest {
// ensure when a compaction is running and we are over files max but below
the compaction ratio
// that a compaction is not planned
all = createCFs(1_000, 2, 2, 2, 2, 2, 2, 2);
- var job = new CompactionJobImpl((short) 1,
CompactorGroupIdImpl.groupId("ee1"),
- createCFs("F1", "1000"), CompactionKind.SYSTEM, Optional.of(false));
+ var job = new CompactionJobImpl((short) 1, CompactorGroupId.of("ee1"),
createCFs("F1", "1000"),
+ CompactionKind.SYSTEM, Optional.of(false));
params = createPlanningParams(all, all, Set.of(job), 3,
CompactionKind.SYSTEM, conf);
plan = planner.makePlan(params);
@@ -672,7 +671,7 @@ public class DefaultCompactionPlannerTest {
private CompactionJob createJob(CompactionKind kind, Set<CompactableFile>
all,
Set<CompactableFile> files) {
return new CompactionPlanImpl.BuilderImpl(kind, all, all)
- .addJob((short) all.size(), CompactorGroupIdImpl.groupId("small"),
files).build().getJobs()
+ .addJob((short) all.size(), CompactorGroupId.of("small"),
files).build().getJobs()
.iterator().next();
}
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionPrioritizerTest.java
b/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionPrioritizerTest.java
index 2e6a03ef41..e1c1b9983c 100644
---
a/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionPrioritizerTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/util/compaction/CompactionPrioritizerTest.java
@@ -35,6 +35,7 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.metadata.AccumuloTable;
import org.apache.accumulo.core.spi.compaction.CompactionJob;
import org.apache.accumulo.core.spi.compaction.CompactionKind;
+import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
import org.junit.jupiter.api.Test;
public class CompactionPrioritizerTest {
@@ -48,7 +49,7 @@ public class CompactionPrioritizerTest {
}
// TODO pass numFiles
return new CompactionJobImpl(createPriority(TableId.of("1"), kind,
totalFiles, numFiles),
- CompactorGroupIdImpl.groupId("test"), files, kind, Optional.of(false));
+ CompactorGroupId.of("test"), files, kind, Optional.of(false));
}
@Test
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 8d54fe376c..2c8dae7671 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -97,7 +97,6 @@ import
org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.util.Retry;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.cache.Caches.CacheName;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.core.util.compaction.RunningCompaction;
import org.apache.accumulo.core.util.threads.ThreadPools;
@@ -326,7 +325,7 @@ public class CompactionCoordinator
throw new AccumuloSecurityException(credentials.getPrincipal(),
SecurityErrorCode.PERMISSION_DENIED).asThriftException();
}
- CompactorGroupId groupId = CompactorGroupIdImpl.groupId(groupName);
+ CompactorGroupId groupId = CompactorGroupId.of(groupName);
LOG.trace("getCompactionJob called for group {} by compactor {}", groupId,
compactorAddress);
TIME_COMPACTOR_LAST_CHECKED.put(groupId, System.currentTimeMillis());
@@ -365,7 +364,7 @@ public class CompactionCoordinator
LOG.debug(
"Unable to reserve compaction job for {}, pulling another off the
queue for group {}",
metaJob.getTabletMetadata().getExtent(), groupName);
- metaJob = jobQueues.poll(CompactorGroupIdImpl.groupId(groupName));
+ metaJob = jobQueues.poll(CompactorGroupId.of(groupName));
}
}
diff --git
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
index 404e04fccc..770405863e 100644
---
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
+++
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java
@@ -63,7 +63,6 @@ import
org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.cache.Caches;
import org.apache.accumulo.core.util.compaction.CompactionJobImpl;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import org.apache.accumulo.core.util.compaction.RunningCompaction;
import org.apache.accumulo.manager.Manager;
import
org.apache.accumulo.manager.compaction.coordinator.CompactionCoordinator;
@@ -86,7 +85,7 @@ public class CompactionCoordinatorTest {
private static final AtomicReference<Map<FateInstanceType,Fate<Manager>>>
fateInstances =
new AtomicReference<>(Map.of());
- private static final CompactorGroupId GROUP_ID =
CompactorGroupIdImpl.groupId("R2DQ");
+ private static final CompactorGroupId GROUP_ID = CompactorGroupId.of("R2DQ");
public class TestCoordinator extends CompactionCoordinator {
diff --git
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
index 268751dc85..f511f35078 100644
---
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
+++
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.spi.compaction.CompactionJob;
import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.compaction.CompactionJobPrioritizer;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import
org.apache.accumulo.manager.compaction.queue.CompactionJobQueues.MetaJob;
import org.apache.hadoop.io.Text;
import org.easymock.EasyMock;
@@ -45,7 +44,7 @@ import org.junit.jupiter.api.Test;
public class CompactionJobPriorityQueueTest {
- private static final CompactorGroupId GROUP =
CompactorGroupIdImpl.groupId("TEST");
+ private static final CompactorGroupId GROUP = CompactorGroupId.of("TEST");
@Test
public void testTabletFileReplacement() {
diff --git
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
index de39497640..dfd956fc91 100644
---
a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
+++
b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
@@ -39,7 +39,6 @@ import org.apache.accumulo.core.spi.compaction.CompactionJob;
import org.apache.accumulo.core.spi.compaction.CompactionKind;
import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
import org.apache.accumulo.core.util.compaction.CompactionJobImpl;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.Test;
@@ -57,8 +56,8 @@ public class CompactionJobQueuesTest {
final int numToAdd = 100_000;
CompactionJobQueues jobQueues = new CompactionJobQueues(numToAdd + 1);
- CompactorGroupId[] groups = Stream.of("G1", "G2", "G3")
- .map(s -> CompactorGroupIdImpl.groupId(s)).toArray(l -> new
CompactorGroupId[l]);
+ CompactorGroupId[] groups =
+ Stream.of("G1", "G2",
"G3").map(CompactorGroupId::of).toArray(CompactorGroupId[]::new);
var executor = Executors.newFixedThreadPool(groups.length);
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 a4ca9803e7..1c5efc4835 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
@@ -73,7 +73,6 @@ import org.apache.accumulo.core.spi.compaction.CompactionKind;
import org.apache.accumulo.core.spi.compaction.CompactorGroupId;
import org.apache.accumulo.core.util.FastFormat;
import org.apache.accumulo.core.util.Merge;
-import org.apache.accumulo.core.util.compaction.CompactorGroupIdImpl;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.TestIngest.IngestParams;
@@ -697,7 +696,7 @@ public class MergeIT extends AccumuloClusterHarness {
ReferencedTabletFile tmpFile =
ReferencedTabletFile.of(new
Path("file:///accumulo/tables/t-0/b-0/c1.rf"));
- CompactorGroupId ceid = CompactorGroupIdImpl.groupId("G1");
+ CompactorGroupId ceid = CompactorGroupId.of("G1");
Set<StoredTabletFile> jobFiles =
Set.of(StoredTabletFile.of(new
Path("file:///accumulo/tables/t-0/b-0/b2.rf")));
CompactionMetadata ecMeta = new CompactionMetadata(jobFiles,
tmpFile, "localhost:4444",
