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

HBASE-1512 Addendum to fix failing tests on jenkins 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1096942 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-04-26 22:59:17 +00:00
parent e6a521407d
commit df94fbe4f8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java
View File

@ -108,11 +108,13 @@ public class AggregationClient {
}
private void validateParameters(Scan scan) throws IOException {
if (scan == null ||
(Bytes.equals(scan.getStartRow(), scan.getStopRow()) && !Bytes
.equals(scan.getStartRow(), HConstants.EMPTY_START_ROW))){
throw new IOException("Agg client Exception: Startrow should be smaller than Stoprow");
}else if(scan.getFamilyMap().size() != 1) {
if (scan == null
|| (Bytes.equals(scan.getStartRow(), scan.getStopRow()) && !Bytes
.equals(scan.getStartRow(), HConstants.EMPTY_START_ROW))
|| Bytes.compareTo(scan.getStartRow(), scan.getStopRow()) > 0) {
throw new IOException(
"Agg client Exception: Startrow should be smaller than Stoprow");
} else if (scan.getFamilyMap().size() != 1) {
throw new IOException("There must be only one family.");
}
}

2
src/main/java/org/apache/hadoop/hbase/client/coprocessor/ExecResult.java
View File

@ -72,7 +72,7 @@ public class ExecResult implements Writable {
public void write(DataOutput out) throws IOException {
Bytes.writeByteArray(out, regionName);
HbaseObjectWritable.writeObject(out, value,
value != null ? value.getClass() : valueType, null);
value != null ? value.getClass() : Writable.class, null);
Class<?> alternativeSerializationClass;
if(value instanceof Writable){
alternativeSerializationClass = Writable.class;