You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/12/29 19:55:13 UTC
hbase git commit: HBASE-14804 Revert due to normalization feature
absent in 0.98 branch
Repository: hbase
Updated Branches:
refs/heads/0.98 f03bf8e3a -> 4bdd2b2de
HBASE-14804 Revert due to normalization feature absent in 0.98 branch
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4bdd2b2d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4bdd2b2d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4bdd2b2d
Branch: refs/heads/0.98
Commit: 4bdd2b2de00300a7c95c623fc653f620e3f27087
Parents: f03bf8e
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 29 10:55:08 2015 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 29 10:55:08 2015 -0800
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4bdd2b2d/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 7275ba2..f31babc 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -207,12 +207,6 @@ 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
@@ -294,7 +288,6 @@ 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]
@@ -545,7 +538,6 @@ 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