From 1c1e2a0ddfaa4390d9cae36f350768d0ed5c6f3d Mon Sep 17 00:00:00 2001 From: Dave Marion Date: Mon, 28 Apr 2025 14:25:29 +0000 Subject: [PATCH 1/2] Removed table name and id from RFileScanner. Closes #5505 --- .../accumulo/core/client/rfile/RFileScanner.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java index 38172594afb..93abfeff311 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java @@ -95,9 +95,7 @@ public RFileScannerEnvironmentImpl(Opts opts) { @Override public String getTableName(TableId tableId) throws TableNotFoundException { - Preconditions.checkArgument(tableId == TABLE_ID, "Expected " + TABLE_ID + " obtained" - + " from IteratorEnvironment.getTableId(), but got: " + tableId); - return TABLE_NAME; + return null; } @Override @@ -107,8 +105,6 @@ public Configuration getConfiguration() { @Override public Configuration getConfiguration(TableId tableId) { - Preconditions.checkArgument(tableId == TABLE_ID, "Expected " + TABLE_ID + " obtained" - + " from IteratorEnvironment.getTableId(), but got: " + tableId); return tableConf; } @@ -116,8 +112,6 @@ public Configuration getConfiguration(TableId tableId) { private static final byte[] EMPTY_BYTES = new byte[0]; private static final Range EMPTY_RANGE = new Range(); - private static final String TABLE_NAME = "rfileScanner"; - private static final TableId TABLE_ID = TableId.of(TABLE_NAME); private Range range; private BlockCacheManager blockCacheManager = null; @@ -309,7 +303,7 @@ public Iterator> iterator() { ClientIteratorEnvironment.Builder iterEnvBuilder = new ClientIteratorEnvironment.Builder() .withEnvironment(new RFileScannerEnvironmentImpl(opts)).withAuthorizations(opts.auths) - .withScope(IteratorScope.scan).withTableId(TABLE_ID); + .withScope(IteratorScope.scan); if (getSamplerConfiguration() != null) { iterEnvBuilder.withSamplerConfiguration(getSamplerConfiguration()); iterEnvBuilder.withSamplingEnabled(); From f857cb0b38b093af9b7dae7d55c64943c47481d9 Mon Sep 17 00:00:00 2001 From: Dave Marion Date: Mon, 28 Apr 2025 14:53:46 +0000 Subject: [PATCH 2/2] Support null tableId to avoid throwing exception --- .../org/apache/accumulo/core/client/rfile/RFileScanner.java | 2 +- .../accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java index 93abfeff311..e34730ff360 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java @@ -303,7 +303,7 @@ public Iterator> iterator() { ClientIteratorEnvironment.Builder iterEnvBuilder = new ClientIteratorEnvironment.Builder() .withEnvironment(new RFileScannerEnvironmentImpl(opts)).withAuthorizations(opts.auths) - .withScope(IteratorScope.scan); + .withScope(IteratorScope.scan).withTableId(null); if (getSamplerConfiguration() != null) { iterEnvBuilder.withSamplerConfiguration(getSamplerConfiguration()); iterEnvBuilder.withSamplingEnabled(); diff --git a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java index 41a514f19aa..746d05602f6 100644 --- a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java +++ b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java @@ -75,7 +75,7 @@ public Builder isUserCompaction() { public Builder withTableId(TableId tableId) { checkState(this.tableId.isEmpty(), "TableId has already been set"); - this.tableId = Optional.of(tableId); + this.tableId = Optional.ofNullable(tableId); return this; }