svn commit: r1328166 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/client/ test/java/org/apache/hadoop/hbase/constraint/ test/java/org/apache/hadoop/hbase/coprocessor/

[te...@apache.org]

Author: tedyu
Date: Fri Apr 20 01:07:29 2012
New Revision: 1328166

URL: http://svn.apache.org/viewvc?rev=1328166&view=rev
Log:
HBASE-5824 addendum fixes coprocessor tests (Jimmy)

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1328166&r1=1328165&r2=1328166&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java Fri Apr 20 01:07:29 2012
@@ -852,7 +852,8 @@ public class HTable implements HTableInt
         writeBuffer.add(put);
         currentWriteBufferSize += put.heapSize();
 
-        // we need to periodically see if the writebuffer is full instead of waiting until the end of the List
+        // we need to periodically see if the writebuffer is full
+        // instead of waiting until the end of the List
         n++;
         if (n % DOPUT_WB_CHECK == 0 && currentWriteBufferSize > writeBufferSize) {
           flushCommits();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java?rev=1328166&r1=1328165&r2=1328166&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java Fri Apr 20 01:07:29 2012
@@ -17,13 +17,10 @@
  */
 package org.apache.hadoop.hbase.constraint;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -32,7 +29,6 @@ import org.apache.hadoop.hbase.HTableDes
 import org.apache.hadoop.hbase.MediumTests;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -118,13 +114,8 @@ public class TestConstraint {
     try {
       table.put(put);
       fail("This put should not have suceeded - AllFailConstraint was not run!");
-    } catch (RetriesExhaustedWithDetailsException e) {
-      List<Throwable> causes = e.getCauses();
-      assertEquals(
-          "More than one failure cause - should only be the failure constraint exception",
-          1, causes.size());
-      Throwable t = causes.get(0);
-      assertEquals(ConstraintException.class, t.getClass());
+    } catch (Throwable t) {
+      assertTrue(t instanceof ConstraintException);
     }
     table.close();
   }

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java?rev=1328166&r1=1328165&r2=1328166&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java Fri Apr 20 01:07:29 2012
@@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
@@ -112,12 +111,12 @@ public class TestRegionServerCoprocessor
       Put put = new Put(ROW);
       put.add(TEST_FAMILY, ROW, ROW);
       table.put(put);
-    } catch (RetriesExhaustedWithDetailsException e) {
+    } catch (Throwable t) {
       // below, could call instead :
       // startsWith("Failed 1 action: DoNotRetryIOException.")
       // But that might be too brittle if client-side
       // DoNotRetryIOException-handler changes its message.
-      assertTrue(e.getMessage().contains("DoNotRetryIOException"));
+      assertTrue(t instanceof DoNotRetryIOException);
       threwDNRE = true;
     } finally {
       assertTrue(threwDNRE);