Kouhei Sutou
null+****@clear*****
Fri Mar 14 16:27:22 JST 2014
Kouhei Sutou 2014-03-14 16:27:22 +0900 (Fri, 14 Mar 2014) New Revision: 5faedd701fd10cc88192347b9ecfdbc6c2b86829 https://github.com/ranguba/rroonga/commit/5faedd701fd10cc88192347b9ecfdbc6c2b86829 Message: grndump: stop to use KEY_NORMALIZE It uses "normalizer" option. You can't use grndump for old Groonga. Modified files: lib/groonga/dumper.rb test/test-schema-dumper.rb Modified: lib/groonga/dumper.rb (+2 -10) =================================================================== --- lib/groonga/dumper.rb 2014-03-06 18:58:38 +0900 (c1f131a) +++ lib/groonga/dumper.rb 2014-03-14 16:27:22 +0900 (6054231) @@ -395,10 +395,6 @@ module Groonga return nil if normalizer.nil? normalizer.name end - - def default_normalizer?(normalizer_name) - normalizer_name == "NormalizerAuto" - end end # @private @@ -418,15 +414,12 @@ module Groonga end if table.domain parameters << ":key_type => #{table.domain.name.dump}" - if default_normalizer?(_normalizer_name) - parameters << ":key_normalize => true" - end end default_tokenizer = table.default_tokenizer if default_tokenizer parameters << ":default_tokenizer => #{default_tokenizer.name.dump}" end - if _normalizer_name and not default_normalizer?(_normalizer_name) + if _normalizer_name parameters << ":normalizer => #{_normalizer_name.dump}" end end @@ -566,7 +559,6 @@ module Groonga flags << "TABLE_DAT_KEY" end if table.domain - flags << "KEY_NORMALIZE" if default_normalizer?(_normalizer_name) if table.is_a?(Groonga::PatriciaTrie) and table.register_key_with_sis? flags << "KEY_WITH_SIS" end @@ -584,7 +576,7 @@ module Groonga parameters << "--default_tokenizer #{default_tokenizer.name}" end end - if _normalizer_name and not default_normalizer?(_normalizer_name) + if _normalizer_name parameters << "--normalizer #{_normalizer_name}" end write("table_create #{table.name} #{parameters.join(' ')}\n") Modified: test/test-schema-dumper.rb (+4 -4) =================================================================== --- test/test-schema-dumper.rb 2014-03-06 18:58:38 +0900 (9bceb32) +++ test/test-schema-dumper.rb 2014-03-14 16:27:22 +0900 (6e046a2) @@ -96,8 +96,8 @@ class SchemaDumperTest < Test::Unit::TestCase schema.create_table("Terms", :type => :patricia_trie, :key_type => "ShortText", - :key_normalize => true, - :default_tokenizer => "TokenBigram") do |table| + :default_tokenizer => "TokenBigram", + :normalizer => "NormalizerAuto") do |table| table.index("Items", "_key") table.index("Items", "title") end @@ -220,8 +220,8 @@ end create_table("Terms", :type => :patricia_trie, :key_type => "ShortText", - :key_normalize => true, :default_tokenizer => "TokenBigram", + :normalizer => "NormalizerAuto", :force => true) do |table| end @@ -306,7 +306,7 @@ column_create Comments item COLUMN_SCALAR Items table_create Items TABLE_HASH_KEY --key_type ShortText column_create Items title COLUMN_SCALAR ShortText -table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE --key_type ShortText --default_tokenizer TokenBigram +table_create Terms TABLE_PAT_KEY --key_type ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto column_create Terms Items__key COLUMN_INDEX|WITH_POSITION Items _key column_create Terms Items_title COLUMN_INDEX|WITH_POSITION Items title -------------- next part -------------- HTML����������������������������...Download