hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-19495 Fix failed ut TestShell
Date Tue, 12 Dec 2017 17:55:46 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 0e47ded1a -> 7755a9822


HBASE-19495 Fix failed ut TestShell

Signed-off-by: Michael Stack <stack@apache.org>


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 <zghao@apache.org>
Authored: Tue Dec 12 17:58:14 2017 +0800
Committer: Michael Stack <stack@apache.org>
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))


Mime
View raw message