(accumulo) branch 2.1 updated: Removed table name and id from RFileScanner. (#5512)

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new 67b4e4f159 Removed table name and id from RFileScanner. (#5512)
67b4e4f159 is described below

commit 67b4e4f159fac1807383532bfc06a25f28dbf7da
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Apr 28 14:25:42 2025 -0400

    Removed table name and id from RFileScanner. (#5512)
    
    Closes #5505
---
 .../org/apache/accumulo/core/client/rfile/RFileScanner.java    | 10 ++--------
 .../accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java |  2 +-
 2 files changed, 3 insertions(+), 9 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 38172594af..e34730ff36 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 @@ class RFileScanner extends ScannerOptions implements Scanner {
 
     @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 @@ class RFileScanner extends ScannerOptions implements 
Scanner {
 
     @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 @@ class RFileScanner extends ScannerOptions implements 
Scanner {
 
   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 @@ class RFileScanner extends ScannerOptions implements 
Scanner {
 
       ClientIteratorEnvironment.Builder iterEnvBuilder = new 
ClientIteratorEnvironment.Builder()
           .withEnvironment(new 
RFileScannerEnvironmentImpl(opts)).withAuthorizations(opts.auths)
-          .withScope(IteratorScope.scan).withTableId(TABLE_ID);
+          .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 41a514f19a..746d05602f 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 class ClientIteratorEnvironment implements 
IteratorEnvironment {
 
     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;
     }