You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/04/27 00:59:17 UTC
svn commit: r1096942 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor: AggregationClient.java ExecResult.java

Author: stack
Date: Tue Apr 26 22:59:17 2011
New Revision: 1096942

URL: http://svn.apache.org/viewvc?rev=1096942&view=rev
Log:
HBASE-1512 Addendum to fix failing tests on jenkins

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/ExecResult.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java?rev=1096942&r1=1096941&r2=1096942&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/AggregationClient.java Tue Apr 26 22:59:17 2011
@@ -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.");
     }
   }

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/ExecResult.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/ExecResult.java?rev=1096942&r1=1096941&r2=1096942&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/ExecResult.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/coprocessor/ExecResult.java Tue Apr 26 22:59:17 2011
@@ -72,7 +72,7 @@ public class ExecResult implements Writa
   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;