Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 32BE1200D56 for ; Tue, 12 Dec 2017 18:55:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3144D160C00; Tue, 12 Dec 2017 17:55:48 +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 762E8160BE7 for ; Tue, 12 Dec 2017 18:55:47 +0100 (CET) Received: (qmail 14717 invoked by uid 500); 12 Dec 2017 17:55:46 -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 14706 invoked by uid 99); 12 Dec 2017 17:55:46 -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, 12 Dec 2017 17:55:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6DA21DFC11; Tue, 12 Dec 2017 17:55:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-19495 Fix failed ut TestShell Date: Tue, 12 Dec 2017 17:55:46 +0000 (UTC) archived-at: Tue, 12 Dec 2017 17:55:48 -0000 Repository: hbase Updated Branches: refs/heads/branch-2 0e47ded1a -> 7755a9822 HBASE-19495 Fix failed ut TestShell Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7755a982 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7755a982 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7755a982 Branch: refs/heads/branch-2 Commit: 7755a982270b0827b69c116d1e8118fa3e55881d Parents: 0e47ded Author: Guanghao Zhang Authored: Tue Dec 12 17:58:14 2017 +0800 Committer: Michael Stack Committed: Tue Dec 12 09:55:39 2017 -0800 ---------------------------------------------------------------------- hbase-shell/src/main/ruby/hbase/admin.rb | 1 - hbase-shell/src/test/ruby/hbase/admin_test.rb | 2 -- 2 files changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7755a982/hbase-shell/src/main/ruby/hbase/admin.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb index 9f8551c..6e3de37 100644 --- a/hbase-shell/src/main/ruby/hbase/admin.rb +++ b/hbase-shell/src/main/ruby/hbase/admin.rb @@ -849,7 +849,6 @@ module Hbase family.setCacheIndexesOnWrite(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::CACHE_INDEX_ON_WRITE))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::CACHE_INDEX_ON_WRITE) family.setCacheBloomsOnWrite(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::CACHE_BLOOMS_ON_WRITE))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::CACHE_BLOOMS_ON_WRITE) family.setEvictBlocksOnClose(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::EVICT_BLOCKS_ON_CLOSE))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::EVICT_BLOCKS_ON_CLOSE) - family.setCacheDataInL1(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::CACHE_DATA_IN_L1))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::CACHE_DATA_IN_L1) family.setInMemory(JBoolean.valueOf(arg.delete(org.apache.hadoop.hbase.HColumnDescriptor::IN_MEMORY))) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::IN_MEMORY) if arg.include?(org.apache.hadoop.hbase.HColumnDescriptor::IN_MEMORY_COMPACTION) family.setInMemoryCompaction( http://git-wip-us.apache.org/repos/asf/hbase/blob/7755a982/hbase-shell/src/test/ruby/hbase/admin_test.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb b/hbase-shell/src/test/ruby/hbase/admin_test.rb index 5184996..7318c1a 100644 --- a/hbase-shell/src/test/ruby/hbase/admin_test.rb +++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb @@ -202,13 +202,11 @@ module Hbase command(:create, @create_test_name, { NAME => 'a', CACHE_BLOOMS_ON_WRITE => 'TRUE', - CACHE_DATA_IN_L1 => 'TRUE', CACHE_INDEX_ON_WRITE => 'TRUE', EVICT_BLOCKS_ON_CLOSE => 'TRUE', COMPRESSION_COMPACT => 'GZ'}) assert_equal(['a:'], table(@create_test_name).get_all_columns.sort) assert_match(/CACHE_BLOOMS_ON_WRITE/, admin.describe(@create_test_name)) - assert_match(/CACHE_DATA_IN_L1/, admin.describe(@create_test_name)) assert_match(/CACHE_INDEX_ON_WRITE/, admin.describe(@create_test_name)) assert_match(/EVICT_BLOCKS_ON_CLOSE/, admin.describe(@create_test_name)) assert_match(/GZ/, admin.describe(@create_test_name))