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 BB37F174C2 for ; Tue, 3 Mar 2015 12:43:44 +0000 (UTC) Received: (qmail 79229 invoked by uid 500); 3 Mar 2015 12:43:44 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 79180 invoked by uid 500); 3 Mar 2015 12:43:44 -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 79171 invoked by uid 99); 3 Mar 2015 12:43:44 -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; Tue, 03 Mar 2015 12:43:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53F92E0F5A; Tue, 3 Mar 2015 12:43:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmhsieh@apache.org To: commits@hbase.apache.org Date: Tue, 03 Mar 2015 12:43:44 -0000 Message-Id: <087659dc48834ea0868f149e7b5bce36@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hbase git commit: HBASE-13141 IntegrationTestAcidGuarantees returns incorrect values for getColumnFamilies Repository: hbase Updated Branches: refs/heads/hbase-11339 a1e9ce3d8 -> d66f88134 HBASE-13141 IntegrationTestAcidGuarantees returns incorrect values for getColumnFamilies Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cf4f4fcb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cf4f4fcb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cf4f4fcb Branch: refs/heads/hbase-11339 Commit: cf4f4fcbb37fd80572aa11f01b9255a5a3a613c2 Parents: a1e9ce3 Author: Jonathan M Hsieh Authored: Mon Mar 2 21:25:47 2015 -0800 Committer: Jonathan M Hsieh Committed: Tue Mar 3 04:41:27 2015 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/IntegrationTestAcidGuarantees.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/cf4f4fcb/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java index acece95..7250eb3 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java @@ -21,6 +21,7 @@ import com.google.common.collect.Sets; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.testclassification.IntegrationTests; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.ToolRunner; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -83,9 +84,9 @@ public class IntegrationTestAcidGuarantees extends IntegrationTestBase { @Override protected Set getColumnFamilies() { - return Sets.newHashSet(String.valueOf(TestAcidGuarantees.FAMILY_A), - String.valueOf(TestAcidGuarantees.FAMILY_B), - String.valueOf(TestAcidGuarantees.FAMILY_C)); + return Sets.newHashSet(Bytes.toString(TestAcidGuarantees.FAMILY_A), + Bytes.toString(TestAcidGuarantees.FAMILY_B), + Bytes.toString(TestAcidGuarantees.FAMILY_C)); } // ***** Actual integration tests