You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/12/14 21:25:49 UTC
hbase git commit: HBASE-14804 HBase shell's create table command
ignores 'NORMALIZATION_ENABLED' attribute (Jean-Marc Spaggiari)
Repository: hbase
Updated Branches:
refs/heads/0.98 69b0c5477 -> 40d7fa2ec
HBASE-14804 HBase shell's create table command ignores 'NORMALIZATION_ENABLED' attribute (Jean-Marc Spaggiari)
Conflicts:
hbase-shell/src/main/ruby/hbase/admin.rb
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/40d7fa2e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/40d7fa2e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/40d7fa2e
Branch: refs/heads/0.98
Commit: 40d7fa2eccc881f0ebec5c001e9ddd6e27b75b09
Parents: 69b0c54
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Dec 8 11:13:39 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Dec 14 20:22:24 2015 +0000
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/40d7fa2e/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 f31babc..7275ba2 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -207,6 +207,12 @@ module Hbase
end
#----------------------------------------------------------------------------------------------
+ # Parse arguments and update HTableDescriptor accordingly
+ def parse_htd_args(htd, arg)
+ htd.setNormalizationEnabled(JBoolean.valueOf(arg.delete(NORMALIZATION_ENABLED))) if arg[NORMALIZATION_ENABLED]
+ end
+
+ #----------------------------------------------------------------------------------------------
# Creates a table
def create(table_name, *args)
# Fail if table name is not a string
@@ -288,6 +294,7 @@ module Hbase
end
end
htd.setDurability(org.apache.hadoop.hbase.client.Durability.valueOf(arg.delete(DURABILITY))) if arg[DURABILITY]
+ parse_htd_args(htd, arg)
set_user_metadata(htd, arg.delete(METADATA)) if arg[METADATA]
set_descriptor_config(htd, arg.delete(CONFIGURATION)) if arg[CONFIGURATION]
@@ -538,6 +545,7 @@ module Hbase
htd.setMaxFileSize(JLong.valueOf(arg.delete(MAX_FILESIZE))) if arg[MAX_FILESIZE]
htd.setReadOnly(JBoolean.valueOf(arg.delete(READONLY))) if arg[READONLY]
htd.setCompactionEnabled(JBoolean.valueOf(arg[COMPACTION_ENABLED])) if arg[COMPACTION_ENABLED]
+ parse_htd_args(htd, arg)
htd.setMemStoreFlushSize(JLong.valueOf(arg.delete(MEMSTORE_FLUSHSIZE))) if arg[MEMSTORE_FLUSHSIZE]
# DEFERRED_LOG_FLUSH is deprecated and was replaced by DURABILITY. To keep backward compatible, it still exists.
# However, it has to be set before DURABILITY so that DURABILITY could overwrite if both args are set