hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [1/4] hbase git commit: HBASE-14804 HBase shell's create table command ignores 'NORMALIZATION_ENABLED' attribute (Jean-Marc Spaggiari)
Date Wed, 09 Dec 2015 07:37:01 GMT
Repository: hbase
Updated Branches:
  refs/heads/hbase-12439 1f999c1e2 -> 7bfbb6a3c


HBASE-14804 HBase shell's create table command ignores 'NORMALIZATION_ENABLED' attribute (Jean-Marc
Spaggiari)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/63f2ebca
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/63f2ebca
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/63f2ebca

Branch: refs/heads/hbase-12439
Commit: 63f2ebca1371a1f83ac7c2f4b43b8ffb744d6672
Parents: 1f999c1
Author: Enis Soztutar <enis@apache.org>
Authored: Tue Dec 8 11:13:39 2015 -0800
Committer: Enis Soztutar <enis@apache.org>
Committed: Tue Dec 8 11:13:39 2015 -0800

----------------------------------------------------------------------
 hbase-shell/src/main/ruby/hbase/admin.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/63f2ebca/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 ac201cd..bd24065 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -268,6 +268,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
@@ -360,6 +366,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]
 
@@ -613,8 +620,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]
-        htd.setNormalizationEnabled(
-          JBoolean.valueOf(arg[NORMALIZATION_ENABLED])) if arg[NORMALIZATION_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


Mime
View raw message