You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2012/06/22 18:36:06 UTC
svn commit: r1352962 - in
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase:
client/Get.java client/Scan.java protobuf/ProtobufUtil.java
Author: jxiang
Date: Fri Jun 22 16:36:05 2012
New Revision: 1352962
URL: http://svn.apache.org/viewvc?rev=1352962&view=rev
Log:
HBASE-6206 Large tests fail with jdk1.7
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java?rev=1352962&r1=1352961&r2=1352962&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java Fri Jun 22 16:36:05 2012
@@ -135,7 +135,9 @@ public class Get extends OperationWithAt
if(set == null) {
set = new TreeSet<byte []>(Bytes.BYTES_COMPARATOR);
}
- set.add(qualifier);
+ if (qualifier != null) {
+ set.add(qualifier);
+ }
familyMap.put(family, set);
return this;
}
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java?rev=1352962&r1=1352961&r2=1352962&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java Fri Jun 22 16:36:05 2012
@@ -224,7 +224,9 @@ public class Scan extends OperationWithA
if(set == null) {
set = new TreeSet<byte []>(Bytes.BYTES_COMPARATOR);
}
- set.add(qualifier);
+ if (qualifier != null) {
+ set.add(qualifier);
+ }
familyMap.put(family, set);
return this;
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java?rev=1352962&r1=1352961&r2=1352962&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java Fri Jun 22 16:36:05 2012
@@ -925,7 +925,8 @@ public final class ProtobufUtil {
edit.add(new KeyValue(keyValue.toByteArray()));
}
if (walEdit.getFamilyScopeCount() > 0) {
- TreeMap<byte[], Integer> scopes = new TreeMap<byte[], Integer>();
+ TreeMap<byte[], Integer> scopes =
+ new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR);
for (FamilyScope scope: walEdit.getFamilyScopeList()) {
scopes.put(scope.getFamily().toByteArray(),
Integer.valueOf(scope.getScopeType().ordinal()));