hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: Revert "HBASE-15079 TestMultiParallel.validateLoadedData AssertionError: null"
Date Sat, 13 Feb 2016 07:49:33 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 f1781b809 -> bc88a99b6


Revert "HBASE-15079 TestMultiParallel.validateLoadedData AssertionError: null"

This reverts commit 4e2ab8f23938f23191a7a6ab2c78fd5b96da29db.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bc88a99b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bc88a99b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bc88a99b

Branch: refs/heads/0.98
Commit: bc88a99b6ff9575daea4edd0f841402f406898a5
Parents: f1781b8
Author: Andrew Purtell <apurtell@apache.org>
Authored: Fri Feb 12 23:47:57 2016 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Fri Feb 12 23:47:57 2016 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/client/TestMultiParallel.java  | 40 ++------------------
 1 file changed, 4 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bc88a99b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
index d172055..60fc674 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
@@ -671,45 +671,13 @@ public class TestMultiParallel {
 
   private void validateLoadedData(HTable table) throws IOException {
     // get the data back and validate that it is correct
-    LOG.info("Validating data on " + table);
-    List<Get> gets = new ArrayList<Get>();
     for (byte[] k : KEYS) {
       Get get = new Get(k);
       get.addColumn(BYTES_FAMILY, QUALIFIER);
-      gets.add(get);
-    }
-    int retryNum = 10;
-    Result[] results = null;
-    do  {
-      results = table.get(gets);
-      boolean finished = true;
-      for (Result result : results) {
-        if (result.isEmpty()) {
-          finished = false;
-          break;
-        }
-      }
-      if (finished) {
-        break;
-      }
-      try {
-        Thread.sleep(10);
-      } catch (InterruptedException e) {
-      }
-      retryNum--;
-    } while (retryNum > 0);
-
-    if (retryNum == 0) {
-      fail("Timeout for validate data");
-    } else {
-      if (results != null) {
-        for (Result r : results) {
-          Assert.assertTrue(r.containsColumn(BYTES_FAMILY, QUALIFIER));
-          Assert.assertEquals(0, Bytes.compareTo(VALUE, r
-            .getValue(BYTES_FAMILY, QUALIFIER)));
-        }
-        LOG.info("Validating data on " + table + " successfully!");
-      }
+      Result r = table.get(get);
+      Assert.assertTrue(r.containsColumn(BYTES_FAMILY, QUALIFIER));
+      Assert.assertEquals(0, Bytes.compareTo(VALUE, r
+          .getValue(BYTES_FAMILY, QUALIFIER)));
     }
   }
 


Mime
View raw message