This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 0f0814ccd42a73a9274b88272e4fefaf72b5f15e Merge: a8cf37d892 d6ef7c8400 Author: Dave Marion <[email protected]> AuthorDate: Tue Jun 30 11:43:28 2026 +0000 Merge branch '2.1' .../server/metadata/GcCandidateFilter.java | 33 ++++++++++++++++++++++ .../accumulo/server/metadata/ServerAmpleImpl.java | 5 ++-- .../main/java/org/apache/accumulo/gc/GCRun.java | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) diff --cc server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java index ee17d962de,b47a410396..17676dc685 --- a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java @@@ -22,13 -22,21 +22,14 @@@ import static java.nio.charset.Standard import static org.apache.accumulo.core.metadata.RootTable.ZROOT_TABLET_GC_CANDIDATES; import static org.apache.accumulo.server.util.MetadataTableUtil.EMPTY_TEXT; +import java.net.URI; import java.util.Collection; import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; +import java.util.function.Function; -import org.apache.accumulo.core.client.BatchScanner; import org.apache.accumulo.core.client.BatchWriter; -import org.apache.accumulo.core.client.IsolatedScanner; + import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableNotFoundException; @@@ -47,9 -57,13 +48,8 @@@ import org.apache.accumulo.core.metadat import org.apache.accumulo.core.metadata.ValidationUtil; import org.apache.accumulo.core.metadata.schema.Ample; import org.apache.accumulo.core.metadata.schema.AmpleImpl; -import org.apache.accumulo.core.metadata.schema.ExternalCompactionFinalState; -import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.MetadataSchema.BlipSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection; - import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection.SkewedKeyValue; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.ExternalCompactionSection; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.ScanServerFileReferenceSection; -import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.BulkFileColumnFamily; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.server.ServerContext; import org.apache.hadoop.io.Text; @@@ -246,12 -265,13 +246,13 @@@ public class ServerAmpleImpl extends Am Scanner scanner; try { - scanner = context.createScanner(level.metaTable(), Authorizations.EMPTY); + scanner = context.createScanner(getMetaTable(level), Authorizations.EMPTY); } catch (TableNotFoundException e) { - throw new RuntimeException(e); + throw new IllegalStateException(e); } scanner.setRange(range); - return scanner.stream().filter(entry -> entry.getValue().equals(SkewedKeyValue.NAME)) + scanner.addScanIterator(new IteratorSetting(25, "gcCandidate", GcCandidateFilter.class)); + return scanner.stream() .map( entry -> new GcCandidate(DeletesSection.decodeRow(entry.getKey().getRow().toString()), entry.getKey().getTimestamp()))
