You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/01/09 04:52:50 UTC

[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 <yu...@gmail.com>


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 <ss...@apache.org>
Authored: Mon Jan 8 09:38:57 2018 -0800
Committer: tedyu <yu...@gmail.com>
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);