You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/02/13 19:34:20 UTC
[1/3] hbase git commit: HBASE-13038 addendum for branch-1
Repository: hbase
Updated Branches:
refs/heads/branch-1 74d373c03 -> a1e58c107
refs/heads/branch-1.0 6e78ab4af -> b1d444234
HBASE-13038 addendum for branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a1e58c10
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a1e58c10
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a1e58c10
Branch: refs/heads/branch-1
Commit: a1e58c1076cee9bc668f51ac9461095d580ef833
Parents: 74d373c
Author: Sean Busbey <bu...@apache.org>
Authored: Fri Feb 13 11:40:37 2015 -0600
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Feb 13 11:40:37 2015 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 4 ++--
.../org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 2 +-
.../org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java | 2 +-
.../hadoop/hbase/security/visibility/VisibilityLabelService.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index b6ef128..37ef788 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1103,7 +1103,7 @@ public class MetaTableAccessor {
* Adds a (single) hbase:meta row for the specified new region and its daughters. Note that this
* does not add its daughter's as different rows, but adds information about the daughters
* in the same row as the parent. Use
- * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int)
+ * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int)}
* if you want to do that.
* @param meta the Table for META
* @param regionInfo region information
@@ -1125,7 +1125,7 @@ public class MetaTableAccessor {
* Adds a (single) hbase:meta row for the specified new region and its daughters. Note that this
* does not add its daughter's as different rows, but adds information about the daughters
* in the same row as the parent. Use
- * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int)
+ * {@link #splitRegion(Connection, HRegionInfo, HRegionInfo, HRegionInfo, ServerName, int)}
* if you want to do that.
* @param connection connection we're using
* @param regionInfo region information
http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 76266a6..6572684 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -80,7 +80,7 @@ import com.google.common.annotations.VisibleForTesting;
* all HFiles being written.
* <p>
* Using this class as part of a MapReduce job is best done
- * using {@link #configureIncrementalLoad(Job, Table, RegionLocator, Class)}.
+ * using {@link #configureIncrementalLoad(Job, Table, RegionLocator)}.
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
index 35d0a56..d70dd6c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java
@@ -622,7 +622,7 @@ public class LoadIncrementalHFiles extends Configured implements Tool {
}
/**
- * @deprecated Use {@link #tryAtomicRegionLoad(HConnection, TableName, byte[], Collection)}
+ * @deprecated Use {@link #tryAtomicRegionLoad(Connection, TableName, byte[], Collection)}
*/
@Deprecated
protected List<LoadQueueItem> tryAtomicRegionLoad(final HConnection conn,
http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e58c10/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
index e01f986..1ef1253 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
@@ -80,7 +80,7 @@ public interface VisibilityLabelService extends Configurable {
* @param systemCall
* Whether a system or user originated call.
* @return Visibility labels authorized for the given user.
- * @deprecated Use {@link#getUserAuths(byte[], boolean)}
+ * @deprecated Use {@link #getUserAuths(byte[], boolean)}
*/
@Deprecated
List<String> getAuths(byte[] user, boolean systemCall) throws IOException;
@@ -147,7 +147,7 @@ public interface VisibilityLabelService extends Configurable {
* @param user
* User for whom system auth check to be done.
* @return true if the given user is having system/super auth
- * @deprecated Use {@link#havingSystemAuth(User)}
+ * @deprecated Use {@link #havingSystemAuth(User)}
*/
@Deprecated
boolean havingSystemAuth(byte[] user) throws IOException;
[3/3] hbase git commit: HBASE-13038 addendum for branch-1
Posted by bu...@apache.org.
HBASE-13038 addendum for branch-1
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b1d44423
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b1d44423
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b1d44423
Branch: refs/heads/branch-1.0
Commit: b1d44423478c8356dca16f20c9ffe7bc625e3c5a
Parents: c5da9b7
Author: Sean Busbey <bu...@apache.org>
Authored: Fri Feb 13 11:40:37 2015 -0600
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Feb 13 12:20:35 2015 -0600
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 2 +-
.../hadoop/hbase/security/visibility/VisibilityLabelService.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b1d44423/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 513e398..2b4e82d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -80,7 +80,7 @@ import com.google.common.annotations.VisibleForTesting;
* all HFiles being written.
* <p>
* Using this class as part of a MapReduce job is best done
- * using {@link #configureIncrementalLoad(Job, Table, RegionLocator, Class)}.
+ * using {@link #configureIncrementalLoad(Job, Table, RegionLocator)}.
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
http://git-wip-us.apache.org/repos/asf/hbase/blob/b1d44423/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
index e01f986..1ef1253 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityLabelService.java
@@ -80,7 +80,7 @@ public interface VisibilityLabelService extends Configurable {
* @param systemCall
* Whether a system or user originated call.
* @return Visibility labels authorized for the given user.
- * @deprecated Use {@link#getUserAuths(byte[], boolean)}
+ * @deprecated Use {@link #getUserAuths(byte[], boolean)}
*/
@Deprecated
List<String> getAuths(byte[] user, boolean systemCall) throws IOException;
@@ -147,7 +147,7 @@ public interface VisibilityLabelService extends Configurable {
* @param user
* User for whom system auth check to be done.
* @return true if the given user is having system/super auth
- * @deprecated Use {@link#havingSystemAuth(User)}
+ * @deprecated Use {@link #havingSystemAuth(User)}
*/
@Deprecated
boolean havingSystemAuth(byte[] user) throws IOException;
[2/3] hbase git commit: HBASE-13038 Fix the java doc continuously
reported by Hadoop QA
Posted by bu...@apache.org.
HBASE-13038 Fix the java doc continuously reported by Hadoop QA
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c5da9b78
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c5da9b78
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c5da9b78
Branch: refs/heads/branch-1.0
Commit: c5da9b78cf88ef0680ab75bfcc295d92b863977c
Parents: 6e78ab4
Author: Ashish Singhi <as...@huawei.com>
Authored: Fri Feb 13 19:10:53 2015 +0530
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Feb 13 11:43:22 2015 -0600
----------------------------------------------------------------------
hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c5da9b78/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
index b4b5755..351208c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
@@ -2273,7 +2273,8 @@ public class KeyValue implements Cell, HeapSize, Cloneable, SettableSequenceId,
* @param leftKey
* @param rightKey
* @return 0 if equal, <0 if left smaller, >0 if right smaller
- * @deprecated Since 0.99.2; Use {@link CellComparator#getMidpoint(Cell, Cell)} instead.
+ * @deprecated Since 0.99.2; Use
+ * {@link CellComparator#getMidpoint(KeyValue.KVComparator, Cell, Cell) instead}
*/
@Deprecated
public byte[] getShortMidpointKey(final byte[] leftKey, final byte[] rightKey) {