Revert "HBASE-14769 Removing unused functions from HBaseAdmin. Removing redundant javadocs from HBaseAdmin as they will be automatically inhertited from Admin.java. (Apekshit)" Reverting. The conversation on issues to do with this patch was not done (Appy brought it to my attention).
This reverts commit 6adce67572a502a067c74f78cf83683dda4d67e4. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/92e178df Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/92e178df Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/92e178df Branch: refs/heads/hbase-12439 Commit: 92e178df28120fcae2aad47f3e4b1cc6e06a8404 Parents: ed4e001 Author: stack <st...@apache.org> Authored: Tue Dec 1 11:29:59 2015 -0800 Committer: stack <st...@apache.org> Committed: Tue Dec 1 11:30:39 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/Admin.java | 8 +- .../apache/hadoop/hbase/client/HBaseAdmin.java | 1417 +++++++++++++++++- .../hbase/IntegrationTestDDLMasterFailover.java | 2 +- .../hbase/IntegrationTestIngestWithMOB.java | 2 +- .../hadoop/hbase/HBaseTestingUtility.java | 25 +- .../apache/hadoop/hbase/TestAcidGuarantees.java | 2 +- .../apache/hadoop/hbase/client/TestAdmin2.java | 4 +- .../hbase/client/TestMetaWithReplicas.java | 8 +- .../hbase/mob/TestExpiredMobFileCleaner.java | 2 +- .../compactions/TestFIFOCompactionPolicy.java | 8 +- hbase-shell/src/main/ruby/hbase/admin.rb | 88 +- hbase-shell/src/main/ruby/hbase/security.rb | 6 +- .../src/main/ruby/hbase/visibility_labels.rb | 2 +- hbase-shell/src/test/ruby/hbase/admin_test.rb | 14 +- src/main/asciidoc/_chapters/cp.adoc | 2 +- src/main/asciidoc/_chapters/external_apis.adoc | 4 +- src/main/asciidoc/_chapters/ops_mgt.adoc | 2 +- src/main/asciidoc/_chapters/schema_design.adoc | 2 +- 18 files changed, 1439 insertions(+), 159 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/92e178df/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index b06902a..290ecb5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -487,10 +487,7 @@ public interface Admin extends Abortable, Closeable { * @return Pair indicating the number of regions updated Pair.getFirst() is the regions that are * yet to be updated Pair.getSecond() is the total number of regions of the table * @throws IOException if a remote or network exception occurs - * @deprecated Since 2.0.0. Will be removed in 3.0.0. Use {@link #getAlterStatus(TableName)} - * instead. */ - @Deprecated Pair<Integer, Integer> getAlterStatus(final byte[] tableName) throws IOException; /** @@ -1184,8 +1181,9 @@ public interface Admin extends Abortable, Closeable { throws IOException, SnapshotCreationException, IllegalArgumentException; /** - * Create a timestamp consistent snapshot for the given table. Snapshots are considered unique - * based on <b>the name of the snapshot</b>. Attempts to take a snapshot with the same name (even + * public void snapshot(final String snapshotName, Create a timestamp consistent snapshot for the + * given table. final byte[] tableName) throws IOException, Snapshots are considered unique based + * on <b>the name of the snapshot</b>. Attempts to take a snapshot with the same name (even a * different type or with different parameters) will fail with a {@link SnapshotCreationException} * indicating the duplicate naming. Snapshot names follow the same naming constraints as tables in * HBase.
