This is an automated email from the ASF dual-hosted git repository.
keith-turner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 00464c08b1 removes some unused code (#6626)
00464c08b1 is described below
commit 00464c08b16604dd5b03479ebe780432ffe24f34
Author: Keith Turner <[email protected]>
AuthorDate: Tue Nov 3 11:56:39 2026 -0500
removes some unused code (#6626)
---
.../org/apache/accumulo/core/file/DispatchingFileFactory.java | 5 -----
.../main/java/org/apache/accumulo/core/file/FileOperations.java | 2 --
.../org/apache/accumulo/core/file/rfile/RFileOperations.java | 9 ---------
.../main/java/org/apache/accumulo/test/functional/BulkIT.java | 7 ++-----
4 files changed, 2 insertions(+), 21 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/DispatchingFileFactory.java
b/core/src/main/java/org/apache/accumulo/core/file/DispatchingFileFactory.java
index f7ba7d268d..f78d209d60 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/DispatchingFileFactory.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/DispatchingFileFactory.java
@@ -48,11 +48,6 @@ class DispatchingFileFactory extends FileOperations {
}
}
- @Override
- protected long getFileSize(FileOptions options) throws IOException {
- return findFileFactory(options).getFileSize(options);
- }
-
@Override
protected FileSKVWriter openWriter(FileOptions options) throws IOException {
FileOperations fileOps = new RFileOperations();
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
index 3b814b2cd9..3db0a6bd89 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
@@ -108,8 +108,6 @@ public abstract class FileOperations {
// Abstract methods (to be implemented by subclasses)
//
- protected abstract long getFileSize(FileOptions options) throws IOException;
-
protected abstract FileSKVWriter openWriter(FileOptions options) throws
IOException;
protected abstract FileSKVIterator openIndex(FileOptions options) throws
IOException;
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
index 7cc22b5197..712f389731 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java
@@ -69,15 +69,6 @@ public class RFileOperations extends FileOperations {
return RFile.getReader(cb, options.getFile());
}
- @Override
- protected long getFileSize(FileOptions options) throws IOException {
- if (options.status == null) {
- return
options.getFileSystem().getFileStatus(options.getFile().getPath()).getLen();
- } else {
- return options.status.getLen();
- }
- }
-
@Override
protected FileSKVIterator openIndex(FileOptions options) throws IOException {
return getReader(options).getIndex();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index 887cb297ff..478bf95e2e 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -63,11 +63,8 @@ public class BulkIT extends AccumuloClusterHarness {
fs.delete(base, true);
fs.mkdirs(base);
fs.deleteOnExit(base);
- Path bulkFailures = new Path(base, "failures");
- fs.deleteOnExit(bulkFailures);
Path files = new Path(base, "files");
fs.deleteOnExit(files);
- fs.mkdirs(bulkFailures);
fs.mkdirs(files);
IngestParams params = new IngestParams(c.properties(), tableName, N);
@@ -86,7 +83,7 @@ public class BulkIT extends AccumuloClusterHarness {
// create an rfile with one entry, there was a bug with this:
TestIngest.ingest(c, fs, params);
- bulkLoad(c, tableName, bulkFailures, files);
+ bulkLoad(c, tableName, files);
VerifyParams verifyParams = new VerifyParams(c.properties(), tableName, N);
verifyParams.random = 56;
for (int i = 0; i < COUNT; i++) {
@@ -98,7 +95,7 @@ public class BulkIT extends AccumuloClusterHarness {
VerifyIngest.verifyIngest(c, verifyParams);
}
- private static void bulkLoad(AccumuloClient c, String tableName, Path
bulkFailures, Path files)
+ private static void bulkLoad(AccumuloClient c, String tableName, Path files)
throws TableNotFoundException, IOException, AccumuloException,
AccumuloSecurityException {
// Make sure the server can modify the files
// not appending the 'ignoreEmptyDir' method defaults to not ignoring
empty directories.
