This is an automated email from the ASF dual-hosted git repository. anmolnar pushed a commit to branch HBASE-28957 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 629d37ad6957adf175ad63a9e2d4b3941cc2ce72 Author: Andor Molnar <[email protected]> AuthorDate: Mon Mar 23 18:54:08 2026 -0500 HBASE-28957. Spotless apply --- .../org/apache/hadoop/hbase/backup/impl/BackupCommands.java | 8 ++++---- .../hadoop/hbase/backup/impl/DefaultPitrRestoreHandler.java | 6 +++--- .../hadoop/hbase/backup/impl/FullTableBackupClient.java | 1 - .../hbase/backup/impl/IncrementalTableBackupClient.java | 4 ++-- .../java/org/apache/hadoop/hbase/backup/TestBackupUtils.java | 7 ++++--- .../apache/hadoop/hbase/backup/impl/TestBackupAdminImpl.java | 12 +++++++----- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java index 933c81333ec..23b978ab822 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java @@ -803,8 +803,8 @@ public final class BackupCommands { } // Check if there is any other valid backup that can cover the PITR window - List<BackupInfo> allBackups = backupSystemTable.getBackupHistory(withState( - BackupInfo.BackupState.COMPLETE)); + List<BackupInfo> allBackups = + backupSystemTable.getBackupHistory(withState(BackupInfo.BackupState.COMPLETE)); boolean hasAnotherValidBackup = canAnyOtherBackupCover(allBackups, targetBackup, table, coveredPitrWindow.get(), continuousBackupStartTimes.get(table), maxAllowedPITRTime, currentTime); @@ -947,8 +947,8 @@ public final class BackupCommands { * @return cutoff timestamp or 0 if not found */ long determineWALCleanupCutoffTime(BackupSystemTable sysTable) throws IOException { - List<BackupInfo> backupInfos = sysTable.getBackupHistory(withState( - BackupInfo.BackupState.COMPLETE)); + List<BackupInfo> backupInfos = + sysTable.getBackupHistory(withState(BackupInfo.BackupState.COMPLETE)); Collections.reverse(backupInfos); // Start from oldest for (BackupInfo backupInfo : backupInfos) { diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/DefaultPitrRestoreHandler.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/DefaultPitrRestoreHandler.java index d33e266503b..a8b15a222e8 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/DefaultPitrRestoreHandler.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/DefaultPitrRestoreHandler.java @@ -17,6 +17,8 @@ */ package org.apache.hadoop.hbase.backup.impl; +import static org.apache.hadoop.hbase.backup.BackupInfo.withState; + import java.io.IOException; import java.util.List; import java.util.stream.Collectors; @@ -24,7 +26,6 @@ import org.apache.hadoop.hbase.backup.BackupInfo; import org.apache.hadoop.hbase.backup.PointInTimeRestoreRequest; import org.apache.hadoop.hbase.client.Connection; import org.apache.yetus.audience.InterfaceAudience; -import static org.apache.hadoop.hbase.backup.BackupInfo.withState; /** * Default PITR restore handler that retrieves backup metadata from the system table. @@ -49,8 +50,7 @@ public class DefaultPitrRestoreHandler extends AbstractPitrRestoreHandler { protected List<PitrBackupMetadata> getBackupMetadata(PointInTimeRestoreRequest request) throws IOException { try (BackupSystemTable table = new BackupSystemTable(conn)) { - return table.getBackupHistory(withState( - BackupInfo.BackupState.COMPLETE)).stream() + return table.getBackupHistory(withState(BackupInfo.BackupState.COMPLETE)).stream() .map(BackupInfoAdapter::new).collect(Collectors.toList()); } } diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java index b636a78aed0..3acc21593b2 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.java @@ -250,7 +250,6 @@ public class FullTableBackupClient extends TableBackupClient { backupInfo.setTableSetTimestampMap(timestampMap); } - private long startContinuousWALBackup(Admin admin) throws IOException { enableTableReplication(admin); if (continuousBackupReplicationPeerExists(admin)) { diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java index 2a5dab428dd..8339786f973 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.java @@ -464,8 +464,8 @@ public class IncrementalTableBackupClient extends TableBackupClient { Path walBackupPath = new Path(walBackupDir); Set<TableName> tableSet = backupInfo.getTables(); currentBackupTs = backupInfo.getIncrCommittedWalTs(); - List<BackupInfo> backupInfos = backupManager.getBackupHistory(withState( - BackupInfo.BackupState.COMPLETE)); + List<BackupInfo> backupInfos = + backupManager.getBackupHistory(withState(BackupInfo.BackupState.COMPLETE)); for (TableName table : tableSet) { for (BackupInfo backup : backupInfos) { // find previous backup for this table diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java index 397851fa716..86df4e316a4 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java @@ -199,8 +199,8 @@ public class TestBackupUtils { // Verify the correct number of valid WAL dirs was found assertEquals(numExpectedValidWalDirs, validWalDirs.size(), - "The number of valid WAL dirs should be " + numExpectedValidWalDirs - + " for time zone " + timeZone); + "The number of valid WAL dirs should be " + numExpectedValidWalDirs + " for time zone " + + timeZone); // Verify the list of valid WAL dirs is as expected for (String dirName : expectedValidWalDirs) { @@ -212,7 +212,8 @@ public class TestBackupUtils { List<String> expectedInvalidWalDirs = new ArrayList<>(availableWalDateDirs); expectedInvalidWalDirs.removeAll(expectedValidWalDirs); for (String dirName : expectedInvalidWalDirs) { - assertFalse(validWalDirs.contains(dirName), "Expected " + dirName + " to NOT be a valid WAL dir"); + assertFalse(validWalDirs.contains(dirName), + "Expected " + dirName + " to NOT be a valid WAL dir"); } } } finally { diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/impl/TestBackupAdminImpl.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/impl/TestBackupAdminImpl.java index af9e91426a6..3d0e3c00858 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/impl/TestBackupAdminImpl.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/impl/TestBackupAdminImpl.java @@ -267,7 +267,8 @@ public class TestBackupAdminImpl { BackupInfo b3 = createBackupInfo("backup_003", 3000L, BackupType.INCREMENTAL, table); BackupInfo b4 = createBackupInfo("backup_004", 4000L, BackupType.INCREMENTAL, table); - when(mockTable.getBackupHistory(withRoot("/backup/root"))).thenReturn(List.of(b4, b3, b2, b1, b0)); + when(mockTable.getBackupHistory(withRoot("/backup/root"))) + .thenReturn(List.of(b4, b3, b2, b1, b0)); List<BackupInfo> result = backupAdminImpl.getAffectedBackupSessions(current, table, mockTable); @@ -321,7 +322,8 @@ public class TestBackupAdminImpl { TableName.valueOf("other_table")); BackupInfo b4 = createBackupInfo("backup_004", 4000L, BackupType.INCREMENTAL, table); - when(mockTable.getBackupHistory(withRoot("/backup/root"))).thenReturn(List.of(b4, b3, b2, b1, b0)); + when(mockTable.getBackupHistory(withRoot("/backup/root"))) + .thenReturn(List.of(b4, b3, b2, b1, b0)); List<BackupInfo> result = backupAdminImpl.getAffectedBackupSessions(current, table, mockTable); @@ -350,7 +352,8 @@ public class TestBackupAdminImpl { BackupInfo b3 = createBackupInfo("backup_003", 3000L, BackupType.INCREMENTAL, table); BackupInfo b4 = createBackupInfo("backup_004", 4000L, BackupType.INCREMENTAL, table); - when(mockTable.getBackupHistory(withRoot("/backup/root"))).thenReturn(List.of(b4, b3, b2, b1, b0)); + when(mockTable.getBackupHistory(withRoot("/backup/root"))) + .thenReturn(List.of(b4, b3, b2, b1, b0)); List<BackupInfo> result = backupAdminImpl.getAffectedBackupSessions(current, table, mockTable); @@ -634,8 +637,7 @@ public class TestBackupAdminImpl { BackupSystemTable table = mock(BackupSystemTable.class); when(table.readBackupInfo("b1")).thenReturn(b1); when(table.readBackupInfo("b2")).thenReturn(b2); - when(table.getBackupHistory(any())) - .thenReturn(List.of(b1, b2)); + when(table.getBackupHistory(any())).thenReturn(List.of(b1, b2)); new BackupAdminImpl(mock(Connection.class)).checkIfValidForMerge(ids, table); }
