Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE36D18EAF for ; Sat, 13 Feb 2016 07:49:33 +0000 (UTC) Received: (qmail 85994 invoked by uid 500); 13 Feb 2016 07:49:33 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 85952 invoked by uid 500); 13 Feb 2016 07:49:33 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 85943 invoked by uid 99); 13 Feb 2016 07:49:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Feb 2016 07:49:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66200E0A1B; Sat, 13 Feb 2016 07:49:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Message-Id: <7a7b5b6e8f7d49a2b353cfce482e907e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: Revert "HBASE-15079 TestMultiParallel.validateLoadedData AssertionError: null" Date: Sat, 13 Feb 2016 07:49:33 +0000 (UTC) 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 Authored: Fri Feb 12 23:47:57 2016 -0800 Committer: Andrew Purtell 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 gets = new ArrayList(); 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))); } }