From commits-return-64819-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Tue Jan 9 05:53:02 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 97703180607 for ; Tue, 9 Jan 2018 05:53:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 87860160C3E; Tue, 9 Jan 2018 04:53:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CB217160C2C for ; Tue, 9 Jan 2018 05:53:01 +0100 (CET) Received: (qmail 5326 invoked by uid 500); 9 Jan 2018 04:52:58 -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 707 invoked by uid 99); 9 Jan 2018 04:52:51 -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, 09 Jan 2018 04:52:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DF1BCF3238; Tue, 9 Jan 2018 04:52:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Date: Tue, 09 Jan 2018 04:52:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/43] hbase git commit: HBASE-19717 IntegrationTestDDLMasterFailover is using outdated values for DataBlockEncoding addendum HBASE-19717 IntegrationTestDDLMasterFailover is using outdated values for DataBlockEncoding addendum Signed-off-by: tedyu Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5c2161e3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5c2161e3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5c2161e3 Branch: refs/heads/HBASE-19397 Commit: 5c2161e390e7dbe59b0fd6ab512e6c140968ded2 Parents: c5277d5 Author: Sergey Soldatov Authored: Mon Jan 8 09:38:57 2018 -0800 Committer: tedyu Committed: Mon Jan 8 18:27:48 2018 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5c2161e3/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java index f4403d6..d9a2f94 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java @@ -698,8 +698,9 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { try { TableName tableName = selected.getTableName(); // possible DataBlockEncoding ids - int[] possibleIds = {0, 2, 3, 4, 7}; - short id = (short) possibleIds[RandomUtils.nextInt(0, possibleIds.length)]; + DataBlockEncoding[] possibleIds = {DataBlockEncoding.NONE, DataBlockEncoding.PREFIX, + DataBlockEncoding.DIFF, DataBlockEncoding.FAST_DIFF, DataBlockEncoding.ROW_INDEX_V1}; + short id = possibleIds[RandomUtils.nextInt(0, possibleIds.length)].getId(); LOG.info("Altering encoding of column family: " + columnDesc + " to: " + id + " in table: " + tableName);