Repository: hbase Updated Branches: refs/heads/HBASE-7912 9dd28f2a9 -> 8c7dc1737
HBASE-16883 Fix javadoc warnings for mega patch Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8c7dc173 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c7dc173 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c7dc173 Branch: refs/heads/HBASE-7912 Commit: 8c7dc173796bea80884b60435c2ed42b382c89f0 Parents: 9dd28f2 Author: tedyu <[email protected]> Authored: Thu Oct 20 08:34:22 2016 -0700 Committer: tedyu <[email protected]> Committed: Thu Oct 20 08:34:22 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/backup/BackupAdmin.java | 8 ++++---- .../main/java/org/apache/hadoop/hbase/backup/BackupInfo.java | 4 ++-- .../org/apache/hadoop/hbase/backup/impl/BackupManifest.java | 2 +- .../apache/hadoop/hbase/backup/impl/BackupSystemTable.java | 8 ++++---- .../apache/hadoop/hbase/backup/impl/HBaseBackupAdmin.java | 4 ++-- .../hadoop/hbase/backup/impl/IncrementalBackupManager.java | 2 +- .../apache/hadoop/hbase/backup/util/BackupClientUtil.java | 2 +- .../apache/hadoop/hbase/backup/util/BackupServerUtil.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java index 82bdd4e..221bc8d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupAdmin.java @@ -29,8 +29,8 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.client.Admin; /** - * The administrative API for HBase Backup. Obtain an instance from - * an {@link Admin#getBackupAdmin()} and call {@link #close()} afterwards. + * The administrative API for HBase Backup. Construct an instance from + * {@link HBaseBackupAdmin(Connection)} and call {@link #close()} afterwards. * <p>BackupAdmin can be used to create backups, restore data from backups and for * other backup-related operations. * @@ -45,7 +45,7 @@ public interface BackupAdmin extends Closeable{ /** * Backs up given list of tables fully. Synchronous operation. * - * @param request BackupRequest instance which contains the following members: + * @param userRequest BackupRequest instance which contains the following members: * type whether the backup is full or incremental * tableList list of tables to backup * targetRootDir root directory for saving the backup @@ -59,7 +59,7 @@ public interface BackupAdmin extends Closeable{ /** * Backs up given list of tables fully. Asynchronous operation. * - * @param request BackupRequest instance which contains the following members: + * @param userRequest BackupRequest instance which contains the following members: * type whether the backup is full or incremental * tableList list of tables to backup * targetRootDir root dir for saving the backup http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java index 6c2dfd3..77aacea 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java @@ -55,7 +55,7 @@ public class BackupInfo implements Comparable<BackupInfo> { /** * Filter interface - * @param info: backup info + * @param info backup info * @return true if info passes filter, false otherwise */ public boolean apply(BackupInfo info); @@ -199,7 +199,7 @@ public class BackupInfo implements Comparable<BackupInfo> { /** * Set progress (0-100%) - * @param msg progress value + * @param p progress value */ public void setProgress(int p) { http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java index 2b66454..878d23b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java @@ -341,7 +341,7 @@ public class BackupManifest { /** * Construct manifest from a backup directory. - * @param conf configuration + * @param fs the FileSystem * @param backupPath backup path * @throws BackupException exception */ http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index fedcac0..72c28d5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -242,7 +242,7 @@ public final class BackupSystemTable implements Closeable { /** * Writes Region Server last roll log result (timestamp) to hbase:backup table * @param server - Region Server name - * @param ts- last log timestamp + * @param ts - last log timestamp * @param backupRoot root directory path to backup * @throws IOException exception */ @@ -260,7 +260,7 @@ public final class BackupSystemTable implements Closeable { /** * Get all completed backup information (in desc order by time) - * @param onlyCompeleted, true, if only successfully completed sessions + * @param onlyCompeleted true, if only successfully completed sessions * @return history info of BackupCompleteData * @throws IOException exception */ @@ -776,7 +776,7 @@ public final class BackupSystemTable implements Closeable { /** * Add backup set (list of tables) * @param name - set name - * @param tables - list of tables, comma-separated + * @param newTables - list of tables, comma-separated * @throws IOException */ public void addToBackupSet(String name, String[] newTables) throws IOException { @@ -823,7 +823,7 @@ public final class BackupSystemTable implements Closeable { /** * Remove tables from backup set (list of tables) * @param name - set name - * @param tables - list of tables, comma-separated + * @param toRemove - list of tables, comma-separated * @throws IOException */ public void removeFromBackupSet(String name, String[] toRemove) throws IOException { http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/HBaseBackupAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/HBaseBackupAdmin.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/HBaseBackupAdmin.java index a7b28a8..f5b3ea7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/HBaseBackupAdmin.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/HBaseBackupAdmin.java @@ -54,8 +54,8 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import com.google.common.collect.Lists; /** - * The administrative API implementation for HBase Backup . Obtain an instance from - * an {@link Admin#getBackupAdmin()} and call {@link #close()} afterwards. + * The administrative API implementation for HBase Backup . Create an instance from + * {@link HBaseBackupAdmin(Connection)} and call {@link #close()} afterwards. * <p>BackupAdmin can be used to create backups, restore data from backups and for * other backup-related operations. * http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java index be5fd23..1a5e5d4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.java @@ -68,7 +68,7 @@ public class IncrementalBackupManager { /** * Obtain the list of logs that need to be copied out for this incremental backup. The list is set * in BackupContext. - * @param svc MasterServices + * @param conn the Connection * @param backupContext backup context * @return The new HashMap of RS log timestamps after the log roll for this incremental backup. * @throws IOException exception http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupClientUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupClientUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupClientUtil.java index 0544618..8b78477 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupClientUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupClientUtil.java @@ -248,7 +248,7 @@ public final class BackupClientUtil { * "hdfs://backup.hbase.org:9000/user/biadmin/backup1/backup_1396650096738/default/t1_dn/" * @param backupRootDir backup root directory * @param backupId backup id - * @param table table name + * @param tableName table name * @return backupPath String for the particular table */ public static String http://git-wip-us.apache.org/repos/asf/hbase/blob/8c7dc173/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupServerUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupServerUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupServerUtil.java index 62c4b81..8adc04c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupServerUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/util/BackupServerUtil.java @@ -152,7 +152,7 @@ public final class BackupServerUtil { /** * copy out Table RegionInfo into incremental backup image need to consider move this logic into * HBackupFileSystem - * @param svc master service + * @param conn connection * @param backupContext backup context * @param conf configuration * @throws IOException exception
