You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/05/12 01:10:49 UTC
[1/3] hbase git commit: HBASE-13563 Add missing table owner to AC
tests.
Repository: hbase
Updated Branches:
refs/heads/0.98 dfc066ee8 -> 368329dec
HBASE-13563 Add missing table owner to AC tests.
Amending-Author: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/31d32266
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/31d32266
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/31d32266
Branch: refs/heads/0.98
Commit: 31d32266e60a33cbc762cfb6dc55fe0aea9a1f4f
Parents: dfc066e
Author: Srikanth Srungarapu <ss...@cloudera.com>
Authored: Sun Apr 26 16:40:40 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon May 11 15:58:55 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/security/access/TestAccessController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/31d32266/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
index 825351e..c77544e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
@@ -1972,7 +1972,7 @@ public class TestAccessController extends SecureTestUtil {
verifyAllowed(listTablesAction, SUPERUSER, USER_ADMIN);
verifyDenied(listTablesAction, USER_CREATE, USER_RW, USER_RO, USER_NONE, TABLE_ADMIN);
- verifyAllowed(getTableDescAction, SUPERUSER, USER_ADMIN, USER_CREATE, TABLE_ADMIN);
+ verifyAllowed(getTableDescAction, SUPERUSER, USER_ADMIN, USER_CREATE, USER_OWNER, TABLE_ADMIN);
verifyDenied(getTableDescAction, USER_RW, USER_RO, USER_NONE);
}
[3/3] hbase git commit: HBASE-13585
HRegionFileSystem#splitStoreFile() finishes without closing the file handle
in some situation (Stephen Yuan Jiang)
Posted by ap...@apache.org.
HBASE-13585 HRegionFileSystem#splitStoreFile() finishes without closing the file handle in some situation (Stephen Yuan Jiang)
Amending-Author: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/368329de
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/368329de
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/368329de
Branch: refs/heads/0.98
Commit: 368329dec9d0c2fbed9ddd53ccf503ff892e62bc
Parents: 93ff195
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Apr 28 17:27:46 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon May 11 16:08:36 2015 -0700
----------------------------------------------------------------------
.../hbase/regionserver/HRegionFileSystem.java | 44 ++++++++++----------
1 file changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/368329de/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
index 93fe52d..e1412c0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
@@ -570,31 +570,33 @@ public class HRegionFileSystem {
if (splitPolicy == null || !splitPolicy.skipStoreFileRangeCheck()) {
// Check whether the split row lies in the range of the store file
// If it is outside the range, return directly.
- if (top) {
- //check if larger than last key.
- KeyValue splitKey = KeyValue.createFirstOnRow(splitRow);
- byte[] lastKey = f.createReader().getLastKey();
- // If lastKey is null means storefile is empty.
- if (lastKey == null) return null;
- if (f.getReader().getComparator().compareFlatKey(splitKey.getBuffer(),
- splitKey.getKeyOffset(), splitKey.getKeyLength(), lastKey, 0, lastKey.length) > 0) {
- return null;
- }
- } else {
- //check if smaller than first key
- KeyValue splitKey = KeyValue.createLastOnRow(splitRow);
- byte[] firstKey = f.createReader().getFirstKey();
- // If firstKey is null means storefile is empty.
- if (firstKey == null) return null;
- if (f.getReader().getComparator().compareFlatKey(splitKey.getBuffer(),
- splitKey.getKeyOffset(), splitKey.getKeyLength(), firstKey, 0, firstKey.length) < 0) {
- return null;
+ try {
+ if (top) {
+ //check if larger than last key.
+ KeyValue splitKey = KeyValue.createFirstOnRow(splitRow);
+ byte[] lastKey = f.createReader().getLastKey();
+ // If lastKey is null means storefile is empty.
+ if (lastKey == null) return null;
+ if (f.getReader().getComparator().compareFlatKey(splitKey.getBuffer(),
+ splitKey.getKeyOffset(), splitKey.getKeyLength(), lastKey, 0, lastKey.length) > 0) {
+ return null;
+ }
+ } else {
+ //check if smaller than first key
+ KeyValue splitKey = KeyValue.createLastOnRow(splitRow);
+ byte[] firstKey = f.createReader().getFirstKey();
+ // If firstKey is null means storefile is empty.
+ if (firstKey == null) return null;
+ if (f.getReader().getComparator().compareFlatKey(splitKey.getBuffer(),
+ splitKey.getKeyOffset(), splitKey.getKeyLength(), firstKey, 0, firstKey.length) < 0) {
+ return null;
+ }
}
+ } finally {
+ f.closeReader(true);
}
}
- f.closeReader(true);
-
Path splitDir = new Path(getSplitsDir(hri), familyName);
// A reference to the bottom half of the hsf store file.
Reference r =
[2/3] hbase git commit: HBASE-13417 batchCoprocessorService() does
not handle NULL keys (Abhishek Singh Chouhan)
Posted by ap...@apache.org.
HBASE-13417 batchCoprocessorService() does not handle NULL keys (Abhishek Singh Chouhan)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/93ff1955
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/93ff1955
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/93ff1955
Branch: refs/heads/0.98
Commit: 93ff1955944391d6135331bc967303c58da2253f
Parents: 31d3226
Author: Nick Dimiduk <nd...@apache.org>
Authored: Tue Apr 28 16:37:58 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon May 11 16:03:32 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/client/HTable.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/93ff1955/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index 736064e..7f641fb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -1726,6 +1726,12 @@ public class HTable implements HTableInterface {
byte[] startKey, byte[] endKey, final R responsePrototype, final Callback<R> callback)
throws ServiceException, Throwable {
+ if (startKey == null) {
+ startKey = HConstants.EMPTY_START_ROW;
+ }
+ if (endKey == null) {
+ endKey = HConstants.EMPTY_END_ROW;
+ }
// get regions covered by the row range
Pair<List<byte[]>, List<HRegionLocation>> keysAndRegions =
getKeysAndRegionsInRange(startKey, endKey, true);