Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6206 Large tests fail with jdk1.7 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1352962 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2012-06-22 16:36:05 +00:00
parent 877030a5b9
commit f59ddd78c3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/client/Get.java
View File

@ -135,7 +135,9 @@ public class Get extends OperationWithAttributes
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;
}

4
hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java
View File

@ -224,7 +224,9 @@ public class Scan extends OperationWithAttributes implements Writable {
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;

3
hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
View File

@ -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()));