null+****@clear*****
null+****@clear*****
2012年 6月 18日 (月) 17:51:35 JST
Kouhei Sutou 2012-06-18 17:51:35 +0900 (Mon, 18 Jun 2012) New Revision: c3bb00acdcde17cdfbf03f7d79cae5cad5e1244b https://github.com/groonga/groonga/commit/c3bb00acdcde17cdfbf03f7d79cae5cad5e1244b Log: doc: fix example path Modified files: doc/source/example/reference/grn_expr/query_syntax/setup.log doc/source/example/reference/grn_expr/query_syntax/simple_less_than.log doc/source/example/reference/grn_expr/query_syntax/simple_less_than_or_equal_to.log doc/source/example/reference/grn_expr/query_syntax/simple_not_equal.log doc/source/reference/grn_expr/query_syntax.txt Modified: doc/source/example/reference/grn_expr/query_syntax/setup.log (+1 -1) =================================================================== --- doc/source/example/reference/grn_expr/query_syntax/setup.log 2012-06-18 17:47:03 +0900 (27436e0) +++ doc/source/example/reference/grn_expr/query_syntax/setup.log 2012-06-18 17:51:35 +0900 (07da835) @@ -1,6 +1,6 @@ Execution example:: - table_create Entries TABLE_HASH_KEY ShortText + table_create Entries TABLE_PAT_KEY ShortText # [[0, 1337566253.89858, 0.000355720520019531], true] column_create Entries content COLUMN_SCALAR Text # [[0, 1337566253.89858, 0.000355720520019531], true] Modified: doc/source/example/reference/grn_expr/query_syntax/simple_less_than.log (+6 -6) =================================================================== --- doc/source/example/reference/grn_expr/query_syntax/simple_less_than.log 2012-06-18 17:47:03 +0900 (90992f86) +++ doc/source/example/reference/grn_expr/query_syntax/simple_less_than.log 2012-06-18 17:51:35 +0900 (dbd5913) @@ -31,12 +31,6 @@ Execution example:: # ] # ], # [ - # 1, - # "The first post!", - # "Welcome! This is my first post!", - # 5 - # ], - # [ # 4, # "Good-bye Senna", # "I migrated all Senna system!", @@ -47,6 +41,12 @@ Execution example:: # "Good-bye Tritonn", # "I also migrated all Tritonn system!", # 3 + # ], + # [ + # 1, + # "The first post!", + # "Welcome! This is my first post!", + # 5 # ] # ] # ] Modified: doc/source/example/reference/grn_expr/query_syntax/simple_less_than_or_equal_to.log (+12 -12) =================================================================== --- doc/source/example/reference/grn_expr/query_syntax/simple_less_than_or_equal_to.log 2012-06-18 17:47:03 +0900 (017d566) +++ doc/source/example/reference/grn_expr/query_syntax/simple_less_than_or_equal_to.log 2012-06-18 17:51:35 +0900 (679af98) @@ -31,18 +31,6 @@ Execution example:: # ] # ], # [ - # 1, - # "The first post!", - # "Welcome! This is my first post!", - # 5 - # ], - # [ - # 2, - # "Groonga", - # "I started to use groonga. It's very fast!", - # 10 - # ], - # [ # 4, # "Good-bye Senna", # "I migrated all Senna system!", @@ -53,6 +41,18 @@ Execution example:: # "Good-bye Tritonn", # "I also migrated all Tritonn system!", # 3 + # ], + # [ + # 2, + # "Groonga", + # "I started to use groonga. It's very fast!", + # 10 + # ], + # [ + # 1, + # "The first post!", + # "Welcome! This is my first post!", + # 5 # ] # ] # ] Modified: doc/source/example/reference/grn_expr/query_syntax/simple_not_equal.log (+12 -12) =================================================================== --- doc/source/example/reference/grn_expr/query_syntax/simple_not_equal.log 2012-06-18 17:47:03 +0900 (5370a54) +++ doc/source/example/reference/grn_expr/query_syntax/simple_not_equal.log 2012-06-18 17:51:35 +0900 (c9bf394) @@ -31,18 +31,6 @@ Execution example:: # ] # ], # [ - # 1, - # "The first post!", - # "Welcome! This is my first post!", - # 5 - # ], - # [ - # 3, - # "Mroonga", - # "I also started to use mroonga. It's also very fast! Really fast!", - # 15 - # ], - # [ # 4, # "Good-bye Senna", # "I migrated all Senna system!", @@ -53,6 +41,18 @@ Execution example:: # "Good-bye Tritonn", # "I also migrated all Tritonn system!", # 3 + # ], + # [ + # 3, + # "Mroonga", + # "I also started to use mroonga. It's also very fast! Really fast!", + # 15 + # ], + # [ + # 1, + # "The first post!", + # "Welcome! This is my first post!", + # 5 # ] # ] # ] Modified: doc/source/reference/grn_expr/query_syntax.txt (+17 -17) =================================================================== --- doc/source/reference/grn_expr/query_syntax.txt 2012-06-18 17:47:03 +0900 (38cec38) +++ doc/source/reference/grn_expr/query_syntax.txt 2012-06-18 17:51:35 +0900 (70a0436) @@ -32,7 +32,7 @@ Sample data Here are a schema definition and sample data to show usage. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/setup.log +.. include:: ../../example/reference/grn_expr/query_syntax/setup.log .. table_create Entries TABLE_PAT_KEY ShortText .. column_create Entries content COLUMN_SCALAR Text .. column_create Entries n_likes COLUMN_SCALAR UInt32 @@ -120,7 +120,7 @@ specifies a keyword that contains one or more spaces, you can use Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_full_text_search.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_full_text_search.log .. select Entries --match_columns content --query fast The expression matches records that contain a word ``fast`` in @@ -151,7 +151,7 @@ aren't matched. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_phrase_search.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_phrase_search.log .. select Entries --match_columns content --query '"I started"' The expression matches records that contain a phrase ``I started`` in @@ -193,7 +193,7 @@ See description of ``--match_columns`` option of Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_full_text_search_with_explicit_match_column.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_full_text_search_with_explicit_match_column.log .. select Entries --query content:@fast The expression matches records that contain a word ``fast`` in @@ -220,7 +220,7 @@ condition (with explicit match column)`` about advanced match columns. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_phrase_search_with_explicit_match_column.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_phrase_search_with_explicit_match_column.log .. select Entries --query 'content:@"I started"' The expression matches records that contain a phrase ``I started`` in @@ -250,7 +250,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_prefix_search.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_prefix_search.log .. select Entries --query '_key:^Goo' The expression matches records that contain a word that starts with @@ -280,7 +280,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_suffix_search.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_suffix_search.log .. table_create Titles TABLE_PAT_KEY|KEY_WITH_SIS ShortText .. load --table Titles .. [ @@ -309,7 +309,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_equal.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_equal.log .. select Entries --query _key:Groonga The expression matches records that ``_key`` column value is @@ -328,7 +328,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_not_equal.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_not_equal.log .. select Entries --query _key:!Groonga The expression matches records that ``_key`` column value is not equal @@ -352,7 +352,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_less_than.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_less_than.log .. select Entries --query n_likes:<10 The expression matches records that ``n_likes`` column value is less @@ -376,7 +376,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_greater_than.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_greater_than.log .. select Entries --query n_likes:>10 The expression matches records that ``n_likes`` column value is greater @@ -401,7 +401,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_less_than_or_equal_to.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_less_than_or_equal_to.log .. select Entries --query n_likes:<=10 The expression matches records that ``n_likes`` column value is less @@ -426,7 +426,7 @@ search condition`` and ``phrase search condition``. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_greater_than_or_equal_to.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_greater_than_or_equal_to.log .. select Entries --query n_likes:>=10 The expression matches records that ``n_likes`` column value is @@ -450,7 +450,7 @@ If at least one of ``a`` and ``b`` are matched, ``a OR b`` is matched. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_logical_or.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_logical_or.log .. select Entries --query 'n_likes:>10 OR content:@senna' The expression matches records that ``n_likes`` column value is @@ -473,7 +473,7 @@ is just ignored. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_logical_and.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_logical_and.log .. select Entries --query 'n_likes:>=10 + content:@groonga' The expression matches records that ``n_likes`` column value is @@ -496,7 +496,7 @@ syntax error. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_logical_not.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_logical_not.log .. select Entries --query 'n_likes:>=10 - content:@groonga' The expression matches records that ``n_likes`` column value is @@ -516,7 +516,7 @@ one of ``b`` and ``c`` are matched. Here is a simple exmaple. .. groonga-command -.. include:: ../example/reference/grn_expr/query_syntax/simple_grouping.log +.. include:: ../../example/reference/grn_expr/query_syntax/simple_grouping.log .. select Entries --query 'n_likes:<5 content:@senna OR content:@fast' .. select Entries --query 'n_likes:<5 (content:@senna OR content:@fast)' -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...ダウンロード
