(accumulo) 01/01: Merge branch '2.1' into 3.1

[ddanielr]

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

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

commit 5e0455a08b1e2042f225efbebbf88c7fea6c9dbe
Merge: 9fee5991fb 51e152a85d
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Fri Jan 31 23:44:48 2025 +0000

    Merge branch '2.1' into 3.1

 .../accumulo/core/client/rfile/FSConfArgs.java     | 10 +++++-
 .../core/client/rfile/RFileScannerBuilder.java     |  5 ++-
 .../core/client/rfile/RFileWriterBuilder.java      |  4 +--
 .../core/client/rfile/RFileClientTest.java         | 40 ++++++++++++++++++++++
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
index ca1a810b44,d9ad691cac..c8e41f87fe
--- 
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScannerBuilder.java
@@@ -58,11 -54,10 +58,11 @@@ class RFileScannerBuilder implements RF
  
      RFileSource[] getSources() throws IOException {
        if (sources == null) {
 -        sources = new RFileSource[paths.length];
 -        for (int i = 0; i < paths.length; i++) {
 -          sources[i] = new RFileSource(getFileSystem(paths[i]).open(paths[i]),
 -              getFileSystem(paths[i]).getFileStatus(paths[i]).getLen());
 +        sources = new RFileSource[rFiles.length];
 +        for (int i = 0; i < rFiles.length; i++) {
 +          final Path path = rFiles[i].getPath();
-           sources[i] = new RFileSource(getFileSystem().open(path),
-               getFileSystem().getFileStatus(path).getLen(), 
rFiles[i].getFence());
++          sources[i] = new RFileSource(getFileSystem(path).open(path),
++              getFileSystem(path).getFileStatus(path).getLen(), 
rFiles[i].getFence());
          }
        } else {
          for (int i = 0; i < sources.length; i++) {
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
index b1d7957338,6382d568b5..559f43df1e
--- 
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriterBuilder.java
@@@ -120,8 -119,7 +120,8 @@@ class RFileWriterBuilder implements RFi
            visCacheSize);
      } else {
        return new RFileWriter(fileops.newWriterBuilder()
-           .forFile(UnreferencedTabletFile.of(out.getFileSystem(), out.path), 
out.getFileSystem(),
-               out.getConf(), cs)
 -          .forFile(out.path.toString(), out.getFileSystem(out.path), 
out.getConf(), cs)
++          .forFile(UnreferencedTabletFile.of(out.getFileSystem(out.path), 
out.path),
++              out.getFileSystem(out.path), out.getConf(), cs)
            .withTableConfiguration(acuconf).withStartDisabled().build(), 
visCacheSize);
      }
    }
diff --cc 
core/src/test/java/org/apache/accumulo/core/client/rfile/RFileClientTest.java
index 3466026518,716803b356..753ff6631d
--- 
a/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileClientTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileClientTest.java
@@@ -28,6 -27,8 +28,7 @@@ import static org.junit.jupiter.api.Ass
  
  import java.io.File;
  import java.io.IOException;
+ import java.net.ConnectException;
 -import java.security.SecureRandom;
  import java.util.AbstractMap;
  import java.util.ArrayList;
  import java.util.Arrays;