This is an automated email from the ASF dual-hosted git repository.
taklwu pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 09c9116a269 HBASE-29695: Fix typo in RestoreRequest's
"Builder.withOvewrite()" method (#7508) (#7511)
09c9116a269 is described below
commit 09c9116a269a43276c6f953caa40fd64174aef05
Author: Tak Lon (Stephen) Wu <[email protected]>
AuthorDate: Thu Dec 4 12:44:05 2025 +0800
HBASE-29695: Fix typo in RestoreRequest's "Builder.withOvewrite()" method
(#7508) (#7511)
Signed-off-by: Tak Lon (Stephen) Wu <[email protected]>
Signed-off-by: Andor Molnár <[email protected]>
Co-authored-by: Kevin Geiszler <[email protected]>
---
.../src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java | 2 +-
.../apache/hadoop/hbase/backup/TestBackupRestoreOnEmptyEnvironment.java | 2 +-
.../apache/hadoop/hbase/backup/TestBackupRestoreWithModifications.java | 2 +-
.../src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java | 2 +-
.../test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java
index 6e52d312ab7..d6ee80a4014 100644
---
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java
+++
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreRequest.java
@@ -62,7 +62,7 @@ public final class RestoreRequest {
return this;
}
- public Builder withOvewrite(boolean overwrite) {
+ public Builder withOverwrite(boolean overwrite) {
request.setOverwrite(overwrite);
return this;
}
diff --git
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
index bb3d80a5c1b..92ffbfa116d 100644
---
a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
+++
b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
@@ -665,7 +665,7 @@ public final class BackupUtils {
boolean isKeepOriginalSplits) {
RestoreRequest.Builder builder = new RestoreRequest.Builder();
RestoreRequest request =
builder.withBackupRootDir(backupRootDir).withBackupId(backupId)
-
.withCheck(check).withFromTables(fromTables).withToTables(toTables).withOvewrite(isOverwrite)
+
.withCheck(check).withFromTables(fromTables).withToTables(toTables).withOverwrite(isOverwrite)
.withKeepOriginalSplits(isKeepOriginalSplits).build();
return request;
}
diff --git
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreOnEmptyEnvironment.java
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreOnEmptyEnvironment.java
index 6fb538fe629..297b8980fd5 100644
---
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreOnEmptyEnvironment.java
+++
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreOnEmptyEnvironment.java
@@ -231,7 +231,7 @@ public class TestBackupRestoreOnEmptyEnvironment {
try (Connection connection =
ConnectionFactory.createConnection(cluster.getConf());
BackupAdmin backupAdmin = new BackupAdminImpl(connection)) {
RestoreRequest restoreRequest = new
RestoreRequest.Builder().withBackupId(backupId)
- .withBackupRootDir(BACKUP_ROOT_DIR.toString()).withOvewrite(true)
+ .withBackupRootDir(BACKUP_ROOT_DIR.toString()).withOverwrite(true)
.withFromTables(new TableName[] { sourceTableName })
.withToTables(new TableName[] { targetTableName }).build();
backupAdmin.restore(restoreRequest);
diff --git
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreWithModifications.java
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreWithModifications.java
index 72c4a464e94..bad5a8d3f49 100644
---
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreWithModifications.java
+++
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupRestoreWithModifications.java
@@ -228,7 +228,7 @@ public class TestBackupRestoreWithModifications {
try (Connection connection =
ConnectionFactory.createConnection(cluster.getConf());
BackupAdmin backupAdmin = new BackupAdminImpl(connection)) {
RestoreRequest restoreRequest = new
RestoreRequest.Builder().withBackupId(backupId)
- .withBackupRootDir(BACKUP_ROOT_DIR.toString()).withOvewrite(true)
+ .withBackupRootDir(BACKUP_ROOT_DIR.toString()).withOverwrite(true)
.withFromTables(new TableName[] { sourceTableName })
.withToTables(new TableName[] { targetTableName }).build();
backupAdmin.restore(restoreRequest);
diff --git
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
index 53ef8955df3..72dc3504cff 100644
---
a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
+++
b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
@@ -109,7 +109,7 @@ public class TestRemoteRestore extends TestBackupBase {
new BackupAdminImpl(ConnectionFactory.createConnection(conf))
.restore(new
RestoreRequest.Builder().withBackupRootDir(BACKUP_REMOTE_ROOT_DIR)
.withRestoreRootDir(BACKUP_ROOT_DIR).withBackupId(backupId).withCheck(false)
-
.withFromTables(tableset).withToTables(tablemap).withOvewrite(false).build());
+
.withFromTables(tableset).withToTables(tablemap).withOverwrite(false).build());
Path hfileOutputPath = new Path(
new
Path(conf.get(MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY)).toUri().getPath());
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
index 80785b86684..27a8c062016 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
@@ -388,7 +388,7 @@ public class IntegrationTestBackupRestore extends
IntegrationTestBase {
TableName[] fromTables, TableName[] toTables, boolean isOverwrite) {
RestoreRequest.Builder builder = new RestoreRequest.Builder();
return
builder.withBackupRootDir(backupRootDir).withBackupId(backupId).withCheck(check)
-
.withFromTables(fromTables).withToTables(toTables).withOvewrite(isOverwrite).build();
+
.withFromTables(fromTables).withToTables(toTables).withOverwrite(isOverwrite).build();
}
@Override
