Hiroyuki Sato
null+****@clear*****
Thu Aug 20 20:11:19 JST 2015
Hiroyuki Sato 2015-08-20 20:11:19 +0900 (Thu, 20 Aug 2015) New Revision: 3325d530659dfbe404c7f1fab47412dc724c3515 https://github.com/groonga/groonga/commit/3325d530659dfbe404c7f1fab47412dc724c3515 Merged be95cbe: Merge pull request #380 from hiroyuki-sato/fix_normalize Message: doc: replace deprecated option (KEY_NORMALIZE) Modified files: doc/source/reference/commands/select.rst doc/source/reference/functions/query.rst doc/source/reference/functions/snippet_html.rst doc/source/reference/grn_expr/query_syntax.rst doc/source/reference/grn_expr/script_syntax.rst doc/source/reference/indexing.rst doc/source/reference/tuning.rst Modified: doc/source/reference/commands/select.rst (+3 -3) =================================================================== --- doc/source/reference/commands/select.rst 2015-08-20 14:41:09 +0900 (1c40938) +++ doc/source/reference/commands/select.rst 2015-08-20 20:11:19 +0900 (917b330) @@ -89,7 +89,7 @@ Here are a schema definition and sample data to show usage. .. column_create Entries content COLUMN_SCALAR Text .. column_create Entries n_likes COLUMN_SCALAR UInt32 .. column_create Entries tag COLUMN_SCALAR ShortText -.. table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +.. table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto .. column_create Terms entries_key_index COLUMN_INDEX|WITH_POSITION Entries _key .. column_create Terms entries_content_index COLUMN_INDEX|WITH_POSITION Entries content .. load --table Entries @@ -679,7 +679,7 @@ Here is a sample substitution table to show a simple .. groonga-command .. include:: ../../example/reference/commands/select/query_expander_substitution_table.log -.. table_create Thesaurus TABLE_PAT_KEY|KEY_NORMALIZE ShortText +.. table_create Thesaurus TABLE_PAT_KEY ShortText --normalizer NormalizerAuto .. column_create Thesaurus synonym COLUMN_VECTOR ShortText .. load --table Thesaurus .. [ @@ -692,7 +692,7 @@ Here is a sample substitution table to show a simple searches with ``"((mroonga) OR (tritonn) OR (groonga mysql))"``. If an user searches with ``"groonga"``, groonga searches with ``"((groonga) OR (senna))"``. Nomrally, it's good idea that substitution table has -``KEY_NORMALIZE`` flag. If the flag is used, substitute target word is +``NormalizerAuto`` option. If the option is used, substitute target word is matched in case insensitive manner. Note that those synonym values include the key value such as Modified: doc/source/reference/functions/query.rst (+1 -1) =================================================================== --- doc/source/reference/functions/query.rst 2015-08-20 14:41:09 +0900 (0c709f4) +++ doc/source/reference/functions/query.rst 2015-08-20 20:11:19 +0900 (f31546d) @@ -47,7 +47,7 @@ Sample schema: .. include:: ../../example/reference/functions/query/usage_setup_schema.log .. table_create Documents TABLE_NO_KEY .. column_create Documents content COLUMN_SCALAR Text -.. table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +.. table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto .. column_create Terms documents_content_index COLUMN_INDEX|WITH_POSITION Documents content .. table_create Users TABLE_NO_KEY .. column_create Users name COLUMN_SCALAR ShortText Modified: doc/source/reference/functions/snippet_html.rst (+1 -1) =================================================================== --- doc/source/reference/functions/snippet_html.rst 2015-08-20 14:41:09 +0900 (31b6c78) +++ doc/source/reference/functions/snippet_html.rst 2015-08-20 20:11:19 +0900 (dc7e207) @@ -42,7 +42,7 @@ Here are a schema definition and sample data to show usage. .. include:: ../../example/reference/functions/snippet_html/usage_setup.log .. table_create Documents TABLE_NO_KEY .. column_create Documents content COLUMN_SCALAR Text -.. table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +.. table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto .. column_create Terms documents_content_index COLUMN_INDEX|WITH_POSITION Documents content .. load --table Documents .. [ Modified: doc/source/reference/grn_expr/query_syntax.rst (+1 -1) =================================================================== --- doc/source/reference/grn_expr/query_syntax.rst 2015-08-20 14:41:09 +0900 (2440c59) +++ doc/source/reference/grn_expr/query_syntax.rst 2015-08-20 20:11:19 +0900 (4ea4776) @@ -36,7 +36,7 @@ Here are a schema definition and sample data to show usage. .. table_create Entries TABLE_PAT_KEY ShortText .. column_create Entries content COLUMN_SCALAR Text .. column_create Entries n_likes COLUMN_SCALAR UInt32 -.. table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +.. table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto .. column_create Terms entries_key_index COLUMN_INDEX|WITH_POSITION Entries _key .. column_create Terms entries_content_index COLUMN_INDEX|WITH_POSITION Entries content .. load --table Entries Modified: doc/source/reference/grn_expr/script_syntax.rst (+4 -4) =================================================================== --- doc/source/reference/grn_expr/script_syntax.rst 2015-08-20 14:41:09 +0900 (dc6ee3a) +++ doc/source/reference/grn_expr/script_syntax.rst 2015-08-20 20:11:19 +0900 (94818b4) @@ -83,7 +83,7 @@ Here are a schema definition and sample data to show usage. .. table_create Entries TABLE_PAT_KEY ShortText .. column_create Entries content COLUMN_SCALAR Text .. column_create Entries n_likes COLUMN_SCALAR UInt32 -.. table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +.. table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto .. column_create Terms entries_key_index COLUMN_INDEX|WITH_POSITION Entries _key .. column_create Terms entries_content_index COLUMN_INDEX|WITH_POSITION Entries content .. load --table Entries @@ -1043,7 +1043,7 @@ Here is a simple example. .. groonga-command .. include:: ../../example/reference/grn_expr/script_syntax/simple_term_extract_operator.log -.. table_create Words TABLE_PAT_KEY|KEY_NORMALIZE ShortText +.. table_create Words TABLE_PAT_KEY ShortText --normalizer NormalizerAuto .. load --table Words .. [ .. {"_key": "groonga"}, @@ -1054,8 +1054,8 @@ Here is a simple example. .. select Words --filter '_key *T "Groonga is the successor project to Senna."' --output_columns _key The expression extrcts terms that included in document ``Groonga is -the successor project to Senna.``. In this case, ``KEY_NORMALIZE`` -flag is specified to ``Words``. So ``Groonga`` can be extracted even +the successor project to Senna.``. In this case, ``NormalizerAuto`` +option is specified to ``Words``. So ``Groonga`` can be extracted even if it is loaded as ``groonga`` into ``Words``. All of extracted terms are also normalized. Modified: doc/source/reference/indexing.rst (+1 -1) =================================================================== --- doc/source/reference/indexing.rst 2015-08-20 14:41:09 +0900 (c5b847a) +++ doc/source/reference/indexing.rst 2015-08-20 20:11:19 +0900 (5820f1c) @@ -61,7 +61,7 @@ We define a schema: .. include:: ../example/reference/indexing-schema.log .. table_create Tweets TABLE_NO_KEY .. column_create Tweets content COLUMN_SCALAR ShortText -.. table_create Lexicon TABLE_HASH_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +.. table_create Lexicon TABLE_HASH_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto We register data: Modified: doc/source/reference/tuning.rst (+1 -1) =================================================================== --- doc/source/reference/tuning.rst 2015-08-20 14:41:09 +0900 (096e862) +++ doc/source/reference/tuning.rst 2015-08-20 20:11:19 +0900 (8f83c70) @@ -43,7 +43,7 @@ Here is an example schema:: table_create Entries TABLE_HASH_KEY ShortText column_create Entries content COLUMN_SCALAR Text column_create Entries n_likes COLUMN_SCALAR UInt32 - table_create Terms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram + table_create Terms TABLE_PAT_KEY ShortText --default_tokenizer TokenBigram --normalizer NormalizerAuto column_create Terms entries_key_index COLUMN_INDEX|WITH_POSITION Entries _key column_create Terms entries_content_index COLUMN_INDEX|WITH_POSITION Entries content -------------- next part -------------- HTML����������������������������...Download