Navigation Menu

Skip to content

Commit

Permalink
vector_find: operator -> mode for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jun 28, 2018
1 parent 0d3a4ed commit b33ea83
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 140 deletions.
4 changes: 2 additions & 2 deletions doc/files.am
Expand Up @@ -429,7 +429,7 @@ absolute_source_files = \
$(top_srcdir)/doc/source/example/reference/functions/sub_filter/usage_with_sub_filter.log \
$(top_srcdir)/doc/source/example/reference/functions/sub_filter/usage_without_sub_filter.log \
$(top_srcdir)/doc/source/example/reference/functions/vector_find/usage_find.log \
$(top_srcdir)/doc/source/example/reference/functions/vector_find/usage_find_operator.log \
$(top_srcdir)/doc/source/example/reference/functions/vector_find/usage_find_mode.log \
$(top_srcdir)/doc/source/example/reference/functions/vector_find/usage_register.log \
$(top_srcdir)/doc/source/example/reference/functions/vector_find/usage_setup_data.log \
$(top_srcdir)/doc/source/example/reference/functions/vector_find/usage_setup_schema.log \
Expand Down Expand Up @@ -1402,7 +1402,7 @@ source_files_relative_from_doc_dir = \
source/example/reference/functions/sub_filter/usage_with_sub_filter.log \
source/example/reference/functions/sub_filter/usage_without_sub_filter.log \
source/example/reference/functions/vector_find/usage_find.log \
source/example/reference/functions/vector_find/usage_find_operator.log \
source/example/reference/functions/vector_find/usage_find_mode.log \
source/example/reference/functions/vector_find/usage_register.log \
source/example/reference/functions/vector_find/usage_setup_data.log \
source/example/reference/functions/vector_find/usage_setup_schema.log \
Expand Down
87 changes: 44 additions & 43 deletions doc/locale/ja/LC_MESSAGES/reference.po
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.2.1\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2018-06-28 12:32+0900\n"
"PO-Revision-Date: 2018-06-28 12:46+0900\n"
"Last-Translator: Masafumi Yokoyama <yokoyama@clear-code.com>\n"
"Language-Team: Japanese\n"
"Language: ja\n"
Expand Down Expand Up @@ -20171,10 +20171,11 @@ msgstr ""

msgid ""
"See :ref:`query-default-mode` for available mode names. All mode names "
"except ``NEAR``, ``SIMILAR`` and ``SUFFIX`` are supported."
"except ``\"NEAR\"``, ``\"SIMILAR\"`` and ``\"SUFFIX\"`` are supported."
msgstr ""
"利用可能なモード名は :ref:`query-default-mode` を見てください。 ``NEAR`` 、 "
"``SIMILAR`` と ``SUFFIX`` 以外のすべてのモード名をサポートしています。"
"利用可能なモード名は :ref:`query-default-mode` を見てください。 ``\"NEAR"
"\"`` 、 ``\"SIMILAR\"`` と ``\"SUFFIX\"`` 以外のすべてのモード名をサポートし"
"ています。"

msgid "``condition_column_name``"
msgstr ""
Expand Down Expand Up @@ -20605,63 +20606,63 @@ msgstr ""
"reference/grn_expr/query_syntax` を見てください。"

msgid ""
"Here are available modes. The default is ``MATCH`` mode. It does full text "
"search."
"Here are available modes. The default is ``\"MATCH\"`` mode. It does full "
"text search."
msgstr ""
"以下は利用可能なモードです。デフォルトは ``MATCH`` モードです。このモードでは"
"全文検索をします。"
"以下は利用可能なモードです。デフォルトは ``\"MATCH\"`` モードです。このモード"
"では全文検索をします。"

msgid "Mode"
msgstr "モード"

msgid "Aliases"
msgstr "別名"

msgid "``EQUAL``"
msgid "``\"EQUAL\"``"
msgstr ""

msgid "``==``"
msgid "``\"==\"``"
msgstr ""

msgid "It uses :ref:`query-syntax-equal-condition` as the default mode."
msgstr ""
"デフォルトのモードとして :ref:`query-syntax-equal-condition` を使います。"

msgid "``NOT_EQUAL``"
msgid "``\"NOT_EQUAL\"``"
msgstr ""

msgid "``!=``"
msgid "``\"!=\"``"
msgstr ""

msgid "It uses :ref:`query-syntax-not-equal-condition` as the default mode."
msgstr ""
"デフォルトのモードとして :ref:`query-syntax-not-equal-condition` を使います。"

msgid "``LESS``"
msgid "``\"LESS\"``"
msgstr ""

msgid "``<``"
msgid "``\"<\"``"
msgstr ""

msgid "It uses :ref:`query-syntax-less-than-condition` as the default mode."
msgstr ""
"デフォルトのモードとして :ref:`query-syntax-less-than-condition` を使います。"

msgid "``GREATER``"
msgid "``\"GREATER\"``"
msgstr ""

msgid "``>``"
msgid "``\">\"``"
msgstr ""

msgid "It uses :ref:`query-syntax-greater-than-condition` as the default mode."
msgstr ""
"デフォルトのモードとして :ref:`query-syntax-greater-than-condition` を使いま"
"す。"

msgid "``LESS_EQUAL``"
msgid "``\"LESS_EQUAL\"``"
msgstr ""

msgid "``<=``"
msgid "``\"<=\"``"
msgstr ""

msgid ""
Expand All @@ -20670,10 +20671,10 @@ msgstr ""
"デフォルトのモードとして :ref:`query-syntax-less-than-or-equal-condition` を"
"使います。"

msgid "``GREATER_EQUAL``"
msgid "``\"GREATER_EQUAL\"``"
msgstr ""

msgid "``>=``"
msgid "``\">=\"``"
msgstr ""

msgid ""
Expand All @@ -20683,10 +20684,10 @@ msgstr ""
"デフォルトのモードとして :ref:`query-syntax-greater-than-or-equal-condition` "
"を使います。"

msgid "``MATCH``"
msgid "``\"MATCH\"``"
msgstr ""

msgid "``@``"
msgid "``\"@\"``"
msgstr ""

msgid ""
Expand All @@ -20698,21 +20699,21 @@ msgstr ""
msgid "It's the default."
msgstr "これがデフォルトです。"

msgid "``NEAR``"
msgid "``\"NEAR\"``"
msgstr ""

msgid "``*N``"
msgid "``\"*N\"``"
msgstr ""

msgid "It uses :ref:`query-syntax-near-search-condition` as the default mode."
msgstr ""
"デフォルトのモードとして :ref:`query-syntax-near-search-condition` を使いま"
"す。"

msgid "``SIMILAR``"
msgid "``\"SIMILAR\"``"
msgstr ""

msgid "``*S``"
msgid "``\"*S\"``"
msgstr ""

msgid ""
Expand All @@ -20721,10 +20722,10 @@ msgstr ""
"デフォルトのモードとして :ref:`query-syntax-similar-search-condition` を使い"
"ます。"

msgid "``PREFIX``"
msgid "``\"PREFIX\"``"
msgstr ""

msgid "``^``, ``@^``"
msgid "``\"^\"``, ``\"@^\"``"
msgstr ""

msgid ""
Expand All @@ -20733,10 +20734,10 @@ msgstr ""
"デフォルトのモードとして :ref:`query-syntax-prefix-search-condition` を使いま"
"す。"

msgid "``SUFFIX``"
msgid "``\"SUFFIX\"``"
msgstr ""

msgid "``$``, ``@$``"
msgid "``\"$\"``, ``\"@$\"``"
msgstr ""

msgid ""
Expand All @@ -20745,10 +20746,10 @@ msgstr ""
"デフォルトのモードとして :ref:`query-syntax-suffix-search-condition` を使いま"
"す。"

msgid "``REGEXP``"
msgid "``\"REGEXP\"``"
msgstr ""

msgid "``~``, ``@~``"
msgid "``\"~\"``, ``\"@~\"``"
msgstr ""

msgid ""
Expand Down Expand Up @@ -21159,23 +21160,23 @@ msgstr ""
msgid "Specifies a vector value to be searched an element."
msgstr "検索対象のベクターを指定します。"

msgid "``operator`` is optional."
msgstr "``operator`` は省略可能です。"

msgid "``operator``"
msgstr ""
msgid "``mode`` is optional."
msgstr "``mode`` は省略可能です。"

msgid ""
"Specifies an operator to determine how to compare each value with :ref:"
"Specifies a mode that specifies how to compare each element with :ref:"
"`vector-find-value`."
msgstr ":ref:`vector-find-value` と各要素を比較する方法を指定します。"
msgstr ""
":ref:`vector-find-value` と各要素を比較する方法(モード)を指定します。"

msgid ""
"Here are available operators. The default is ``EQUAL`` operator. It does "
"equality comparison."
"The default mode is ``\"EQUAL\"``. Note that :ref:`query-default-mode` says "
"the default mode is ``\"MATCH\"`` but the default mode of ``vector_find`` is "
"``\"EQUAL\"``."
msgstr ""
"以下は利用可能なオペレーターです。デフォルトは ``EQUAL`` オペレーターです。こ"
"のオペレーターは等価比較をします。"
"デフォルトのモードは ``\"EQUAL\"`` です。 :ref:`query-default-mode` ではデ"
"フォルトのモードは ``\"MATCH\"`` ですが、 ``vector_find`` のデフォルトのモー"
"ドは ``\"EQUAL\"`` です。"

msgid "The matched element on match, ``null`` otherwise."
msgstr "マッチした場合はマッチした要素。マッチしない場合は ``null`` 。"
Expand Down
3 changes: 2 additions & 1 deletion doc/source/reference/functions/in_records.rst
Expand Up @@ -171,7 +171,8 @@ Specifies a value to be compared.

Specifies a mode name that specifies how to compare :ref:`in-records-value` with a value of :ref:`in-records-condition-column-name`.

See :ref:`query-default-mode` for available mode names. All mode names except ``NEAR``, ``SIMILAR`` and ``SUFFIX`` are supported.
See :ref:`query-default-mode` for available mode names. All mode names
except ``"NEAR"``, ``"SIMILAR"`` and ``"SUFFIX"`` are supported.

.. _in-records-condition-column-name:

Expand Down
52 changes: 26 additions & 26 deletions doc/source/reference/functions/query.rst
Expand Up @@ -171,59 +171,59 @@ used when you just specify ``keyword`` instead of
``column:@keyword``. See :doc:`/reference/grn_expr/query_syntax` for
more syntax details.

Here are available modes. The default is ``MATCH`` mode. It does full
text search.
Here are available modes. The default is ``"MATCH"`` mode. It does
full text search.

.. list-table::
:header-rows: 1

* - Mode
- Aliases
- Description
* - ``EQUAL``
- ``==``
* - ``"EQUAL"``
- ``"=="``
- It uses :ref:`query-syntax-equal-condition` as the default mode.
* - ``NOT_EQUAL``
- ``!=``
* - ``"NOT_EQUAL"``
- ``"!="``
- It uses :ref:`query-syntax-not-equal-condition` as the default mode.
* - ``LESS``
- ``<``
* - ``"LESS"``
- ``"<"``
- It uses :ref:`query-syntax-less-than-condition` as the default mode.
* - ``GREATER``
- ``>``
* - ``"GREATER"``
- ``">"``
- It uses :ref:`query-syntax-greater-than-condition` as the default mode.
* - ``LESS_EQUAL``
- ``<=``
* - ``"LESS_EQUAL"``
- ``"<="``
- It uses :ref:`query-syntax-less-than-or-equal-condition` as the
default mode.
* - ``GREATER_EQUAL``
- ``>=``
* - ``"GREATER_EQUAL"``
- ``">="``
- It uses :ref:`query-syntax-greater-than-or-equal-condition` as the
default mode.
* - ``MATCH``
- ``@``
* - ``"MATCH"``
- ``"@"``
- It uses :ref:`query-syntax-full-text-search-condition` as the
default mode.

It's the default.
* - ``NEAR``
- ``*N``
* - ``"NEAR"``
- ``"*N"``
- It uses :ref:`query-syntax-near-search-condition` as the default
mode.
* - ``SIMILAR``
- ``*S``
* - ``"SIMILAR"``
- ``"*S"``
- It uses :ref:`query-syntax-similar-search-condition` as the default
mode.
* - ``PREFIX``
- ``^``, ``@^``
* - ``"PREFIX"``
- ``"^"``, ``"@^"``
- It uses :ref:`query-syntax-prefix-search-condition` as the default
mode.
* - ``SUFFIX``
- ``$``, ``@$``
* - ``"SUFFIX"``
- ``"$"``, ``"@$"``
- It uses :ref:`query-syntax-suffix-search-condition` as the default
mode.
* - ``REGEXP``
- ``~``, ``@~``
* - ``"REGEXP"``
- ``"~"``, ``"@~"``
- It uses :ref:`query-syntax-regular-expression-condition` as the default
mode.

Expand Down

0 comments on commit b33ea83

Please sign in to comment.