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 2014/08/14 20:45:23 UTC
[1/6] git commit: HBASE-11745 FilterAllFilter should return
ReturnCode.SKIP
Repository: hbase
Updated Branches:
refs/heads/0.98 9740bf656 -> 3d292e8d7
refs/heads/branch-1 2eb075730 -> a79e5ce52
refs/heads/master cabcb6ca2 -> 819b06d62
HBASE-11745 FilterAllFilter should return ReturnCode.SKIP
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e55bdbf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e55bdbf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e55bdbf
Branch: refs/heads/master
Commit: 1e55bdbf7781cb705ff4d3ef1fdc31fb60e59bd8
Parents: cabcb6c
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Aug 14 11:42:30 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Aug 14 11:42:30 2014 -0700
----------------------------------------------------------------------
.../hadoop/hbase/filter/FilterAllFilter.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1e55bdbf/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
index 13abb9e..a104def 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
@@ -21,9 +21,6 @@ import java.io.IOException;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
-import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;
-
-import com.google.protobuf.InvalidProtocolBufferException;
public class FilterAllFilter extends FilterBase {
@@ -32,7 +29,12 @@ public class FilterAllFilter extends FilterBase {
@Override
public ReturnCode filterKeyValue(Cell v) throws IOException {
- return ReturnCode.INCLUDE;
+ return ReturnCode.SKIP;
+ }
+
+ @Override
+ public boolean hasFilterRow() {
+ return true;
}
@Override
@@ -41,12 +43,7 @@ public class FilterAllFilter extends FilterBase {
}
public static FilterAllFilter parseFrom(final byte[] pbBytes) throws DeserializationException {
- FilterProtos.FilterAllFilter proto;
- try {
- proto = FilterProtos.FilterAllFilter.parseFrom(pbBytes);
- } catch (InvalidProtocolBufferException e) {
- throw new DeserializationException(e);
- }
+ // No options to parse, so why bother
return new FilterAllFilter();
}
[6/6] git commit: Amend HBASE-11438 [Visibility Controller] Support
UTF8 character as Visibility Labels; Fix failing tests
Posted by ap...@apache.org.
Amend HBASE-11438 [Visibility Controller] Support UTF8 character as Visibility Labels; Fix failing tests
String(byte[]) constructor may not select UTF8 aware conversion
depending on environment
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3d292e8d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3d292e8d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3d292e8d
Branch: refs/heads/0.98
Commit: 3d292e8d7a7fc67d0ce492a726e4cc051c8508d6
Parents: 0d4e561
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Aug 14 11:43:45 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Aug 14 11:46:03 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/security/visibility/ExpressionParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3d292e8d/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
index bb17b48..cfbc97d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
@@ -87,7 +87,7 @@ public class ExpressionParser {
// If we don't do this way then we may have to handle while checking the authorizations.
// Better to do it here.
byte[] array = com.google.common.primitives.Bytes.toArray(list);
- String leafExp = new String(array).trim();
+ String leafExp = Bytes.toString(array).trim();
if (leafExp.isEmpty()) {
throw new ParseException("Error parsing expression " + expS + " at column : " + index);
}
[2/6] git commit: HBASE-11745 FilterAllFilter should return
ReturnCode.SKIP
Posted by ap...@apache.org.
HBASE-11745 FilterAllFilter should return ReturnCode.SKIP
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1f5ee71d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f5ee71d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f5ee71d
Branch: refs/heads/branch-1
Commit: 1f5ee71d0fdd826c5f18fbabd8fea312ca187dc2
Parents: 2eb0757
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Aug 14 11:42:31 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Aug 14 11:42:31 2014 -0700
----------------------------------------------------------------------
.../hadoop/hbase/filter/FilterAllFilter.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1f5ee71d/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
index 13abb9e..a104def 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
@@ -21,9 +21,6 @@ import java.io.IOException;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
-import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;
-
-import com.google.protobuf.InvalidProtocolBufferException;
public class FilterAllFilter extends FilterBase {
@@ -32,7 +29,12 @@ public class FilterAllFilter extends FilterBase {
@Override
public ReturnCode filterKeyValue(Cell v) throws IOException {
- return ReturnCode.INCLUDE;
+ return ReturnCode.SKIP;
+ }
+
+ @Override
+ public boolean hasFilterRow() {
+ return true;
}
@Override
@@ -41,12 +43,7 @@ public class FilterAllFilter extends FilterBase {
}
public static FilterAllFilter parseFrom(final byte[] pbBytes) throws DeserializationException {
- FilterProtos.FilterAllFilter proto;
- try {
- proto = FilterProtos.FilterAllFilter.parseFrom(pbBytes);
- } catch (InvalidProtocolBufferException e) {
- throw new DeserializationException(e);
- }
+ // No options to parse, so why bother
return new FilterAllFilter();
}
[3/6] git commit: HBASE-11745 FilterAllFilter should return
ReturnCode.SKIP
Posted by ap...@apache.org.
HBASE-11745 FilterAllFilter should return ReturnCode.SKIP
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0d4e5612
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0d4e5612
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0d4e5612
Branch: refs/heads/0.98
Commit: 0d4e56128759806d59b762c39782175f5ddd8aa4
Parents: 9740bf6
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Aug 14 11:42:32 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Aug 14 11:42:32 2014 -0700
----------------------------------------------------------------------
.../hadoop/hbase/filter/FilterAllFilter.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0d4e5612/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
index 13abb9e..a104def 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/FilterAllFilter.java
@@ -21,9 +21,6 @@ import java.io.IOException;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
-import org.apache.hadoop.hbase.protobuf.generated.FilterProtos;
-
-import com.google.protobuf.InvalidProtocolBufferException;
public class FilterAllFilter extends FilterBase {
@@ -32,7 +29,12 @@ public class FilterAllFilter extends FilterBase {
@Override
public ReturnCode filterKeyValue(Cell v) throws IOException {
- return ReturnCode.INCLUDE;
+ return ReturnCode.SKIP;
+ }
+
+ @Override
+ public boolean hasFilterRow() {
+ return true;
}
@Override
@@ -41,12 +43,7 @@ public class FilterAllFilter extends FilterBase {
}
public static FilterAllFilter parseFrom(final byte[] pbBytes) throws DeserializationException {
- FilterProtos.FilterAllFilter proto;
- try {
- proto = FilterProtos.FilterAllFilter.parseFrom(pbBytes);
- } catch (InvalidProtocolBufferException e) {
- throw new DeserializationException(e);
- }
+ // No options to parse, so why bother
return new FilterAllFilter();
}
[5/6] git commit: Amend HBASE-11438 [Visibility Controller] Support
UTF8 character as Visibility Labels; Fix failing tests
Posted by ap...@apache.org.
Amend HBASE-11438 [Visibility Controller] Support UTF8 character as Visibility Labels; Fix failing tests
String(byte[]) constructor may not select UTF8 aware conversion
depending on environment
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a79e5ce5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a79e5ce5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a79e5ce5
Branch: refs/heads/branch-1
Commit: a79e5ce5250d76a367ca00c88a42d70530ad5f6b
Parents: 1f5ee71
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Aug 14 11:43:45 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Aug 14 11:45:59 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/security/visibility/ExpressionParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a79e5ce5/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
index bb17b48..cfbc97d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
@@ -87,7 +87,7 @@ public class ExpressionParser {
// If we don't do this way then we may have to handle while checking the authorizations.
// Better to do it here.
byte[] array = com.google.common.primitives.Bytes.toArray(list);
- String leafExp = new String(array).trim();
+ String leafExp = Bytes.toString(array).trim();
if (leafExp.isEmpty()) {
throw new ParseException("Error parsing expression " + expS + " at column : " + index);
}
[4/6] git commit: Amend HBASE-11438 [Visibility Controller] Support
UTF8 character as Visibility Labels; Fix failing tests
Posted by ap...@apache.org.
Amend HBASE-11438 [Visibility Controller] Support UTF8 character as Visibility Labels; Fix failing tests
String(byte[]) constructor may not select UTF8 aware conversion
depending on environment
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/819b06d6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/819b06d6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/819b06d6
Branch: refs/heads/master
Commit: 819b06d62145cdcda0a755497a1bedff0e68a450
Parents: 1e55bdb
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Aug 14 11:43:45 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Aug 14 11:44:09 2014 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/security/visibility/ExpressionParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/819b06d6/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
index bb17b48..cfbc97d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
@@ -87,7 +87,7 @@ public class ExpressionParser {
// If we don't do this way then we may have to handle while checking the authorizations.
// Better to do it here.
byte[] array = com.google.common.primitives.Bytes.toArray(list);
- String leafExp = new String(array).trim();
+ String leafExp = Bytes.toString(array).trim();
if (leafExp.isEmpty()) {
throw new ParseException("Error parsing expression " + expS + " at column : " + index);
}