(hbase) 16/16: HBASE-28957. Resolve merge conflicts

[andor]

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

andor pushed a commit to branch HBASE-28957_rebase
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 6fbae0ba3e7d84acf6a2ce80a943103648db975a
Author: Andor Molnar <an...@cloudera.com>
AuthorDate: Mon Jul 28 16:04:50 2025 -0500

    HBASE-28957. Resolve merge conflicts
---
 .../java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java  | 2 +-
 .../java/org/apache/hadoop/hbase/mapreduce/TestWALInputFormat.java   | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
index 48416433bf0..788194c1963 100644
--- 
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
+++ 
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
@@ -391,7 +391,7 @@ public final class BackupSystemTable implements Closeable {
    * Reads the rows from backup table recording bulk loaded hfiles
    * @param tableList list of table names
    */
-  public List<BulkLoad> readBulkloadRows(List<TableName> tableList) throws 
IOException {
+  public List<BulkLoad> readBulkloadRows(Collection<TableName> tableList) 
throws IOException {
     return readBulkloadRows(tableList, Long.MAX_VALUE);
   }
 
diff --git 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALInputFormat.java
 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALInputFormat.java
index 0b2d66bd0b8..b9ca501d014 100644
--- 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALInputFormat.java
+++ 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALInputFormat.java
@@ -159,11 +159,6 @@ public class TestWALInputFormat {
       Path[] getInputPaths(Configuration conf) {
         return new Path[] { new Path("/input") };
       }
-
-      @Override
-      List<FileStatus> getFiles(FileSystem fs, Path inputPath, long startTime, 
long endTime) {
-        return Collections.singletonList(emptyFile);
-      }
     };
 
     return inputFormat.getSplits(jobContext, "", "");