Navigation Menu

Skip to content

Commit

Permalink
Document &@ and &? for v1 operator
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Apr 28, 2017
1 parent 2631f10 commit 3c61477
Show file tree
Hide file tree
Showing 15 changed files with 89 additions and 35 deletions.
18 changes: 17 additions & 1 deletion _po/ja/reference/index.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2017-04-26 16:18+0900\n"
"PO-Revision-Date: 2017-04-28 17:13+0900\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -80,12 +80,28 @@ msgstr " * [`LIKE`演算子](operators/like.html)"
msgid " * `ILIKE` operator"
msgstr " * `ILIKE`演算子"

msgid " * [`&@` operator](operators/match-v2.html)"
msgstr " * [`&@`演算子](operators/match-v2.html)"

msgid " * [`%%` operator](operators/match.html)"
msgstr " * [`%%`演算子](operators/match.html)"

msgid ""
" * Deprecated since 1.2.0. Use [`&@` operator](operators/match-v2.html) ins"
"tead."
msgstr " * 1.2.0から非推奨になりました。代わりに[`&@`演算子](operators/match-v2.html)を使ってください。"

msgid " * [`&?` operator](operators/query-v2.html) for non `jsonb` types"
msgstr " * `jsonb`型以外の型用の[`&?`演算子](operators/query-v2.html)"

msgid " * [`@@` operator](operators/query.html) for non `jsonb` types"
msgstr " * `jsonb`型以外の型用の[`@@`演算子](operators/query.html)"

msgid ""
" * Deprecated since 1.2.0. Use [`&?` operator](operators/query-v2.html) ins"
"tead."
msgstr " * 1.2.0から非推奨になりました。代わりに[`&?`演算子](operators/query-v2.html)を使ってください。"

msgid " * [`@@` operator](operators/jsonb-query.html) for `jsonb` type"
msgstr " * `jsonb`型用の[`@@`演算子](operators/jsonb-query.html)"

Expand Down
10 changes: 2 additions & 8 deletions _po/ja/reference/operators/match-v2.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2016-12-05 15:48+0900\n"
"PO-Revision-Date: 2016-12-05 15:51+0900\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -25,11 +25,6 @@ msgstr "# `&@`演算子"
msgid "## Summary"
msgstr "## 概要"

msgid ""
"This operator uses v2 operator class. It doesn't provide backward compatibilit"
"y until PGroonga 2.0.0. Use it carefully."
msgstr "この演算子はv2演算子クラスを使います。v2演算子クラスはPGroonga 2.0.0まで互換性を提供しません。注意して使ってください。"

msgid "`&@` operator performs full text search by one keyword."
msgstr "`&@`演算子は1つのキーワードで全文検索を実行します。"

Expand Down Expand Up @@ -63,8 +58,7 @@ msgid ""
msgstr ""

msgid ""
"CREATE INDEX pgroonga_content_index ON memos\n"
" USING pgroonga (content pgroonga.text_full_text_search_ops_v2);\n"
"CREATE INDEX pgroonga_content_index ON memos USING pgroonga (content);\n"
"```"
msgstr ""

Expand Down
13 changes: 12 additions & 1 deletion _po/ja/reference/operators/match.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2016-12-05 15:48+0900\n"
"PO-Revision-Date: 2017-04-28 16:52+0900\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -25,6 +25,11 @@ msgstr "# `%%`演算子"
msgid "## Summary"
msgstr "## 概要"

msgid ""
"This operator is deprecated since 1.2.0. Use [`&@` operator](match-v2.html) in"
"stead."
msgstr "1.2.0からこの演算子は非推奨になりました。代わりに[`&@`演算子](match-v2.html)を使ってください。"

msgid "`%%` operator performs full text search by one keyword."
msgstr "`%%`は1つのキーワードで全文検索を実行します。"

Expand Down Expand Up @@ -112,5 +117,11 @@ msgstr "複数のキーワードで検索したいときやAND/ORを使った検
msgid "## See also"
msgstr "## 参考"

msgid " * [`&?` operator](query-v2.html)"
msgstr " * [`&?`演算子](query-v2.html)"

msgid " * [`@@` operator](query.html)"
msgstr " * [`@@`演算子](query.html)"

msgid " * Deprecated since 1.2.0. Use [`&?` operator](query-v2.html) instead."
msgstr " * 1.2.0から非推奨になりました。代わりに[`&?`演算子](query-v2.html)を使ってください。"
10 changes: 2 additions & 8 deletions _po/ja/reference/operators/query-v2.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2016-12-05 15:49+0900\n"
"PO-Revision-Date: 2016-12-05 15:51+0900\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -25,11 +25,6 @@ msgstr "# `jsonb`型以外の型用の`&?`演算子"
msgid "## Summary"
msgstr "## 概要"

msgid ""
"This operator uses v2 operator class. It doesn't provide backward compatibilit"
"y until PGroonga 2.0.0. Use it carefully."
msgstr "この演算子はv2演算子クラスを使います。v2演算子クラスはPGroonga 2.0.0まで互換性を提供しません。注意して使ってください。"

msgid "`&?` operator performs full text search with query."
msgstr "`&?`演算子はクエリーを使って全文検索を実行します。"

Expand Down Expand Up @@ -75,8 +70,7 @@ msgid ""
msgstr ""

msgid ""
"CREATE INDEX pgroonga_content_index ON memos\n"
" USING pgroonga (content pgroonga.text_full_text_search_ops_v2);\n"
"CREATE INDEX pgroonga_content_index ON memos USING pgroonga (content);\n"
"```"
msgstr ""

Expand Down
13 changes: 12 additions & 1 deletion _po/ja/reference/operators/query.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2016-12-05 15:49+0900\n"
"PO-Revision-Date: 2017-04-28 16:50+0900\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -25,6 +25,11 @@ msgstr "# `jsonb`型以外の型用の`@@`演算子"
msgid "## Summary"
msgstr "## 概要"

msgid ""
"This operator is deprecated since 1.2.0. Use [`&?` operator](query-v2.html) in"
"stead."
msgstr "1.2.0からこの演算子は非推奨になりました。代わりに[`&?`演算子](query-v2.html)を使ってください。"

msgid "`@@` operator performs full text search with query."
msgstr "`@@`演算子はクエリーを使って全文検索を実行します。"

Expand Down Expand Up @@ -146,9 +151,15 @@ msgstr ""
msgid "## See also"
msgstr "## 参考"

msgid " * [`&@` operator](match-v2.html)"
msgstr " * [`&@`演算子](match-v2.html)"

msgid " * [`%%` operator](match.html)"
msgstr " * [`%%`演算子](match.html)"

msgid " * Deprecated since 1.2.0. Use [`&@` operator](match-v2.html) instead."
msgstr " * 1.2.0から非推奨になりました。代わりに[`&@`演算子](match-v2.html)を使ってください。"

msgid ""
" * [Groonga's query syntax](http://groonga.org/docs/reference/grn_expr/query_"
"syntax.html)"
Expand Down
8 changes: 8 additions & 0 deletions ja/reference/index.md
Expand Up @@ -32,10 +32,18 @@ PGroongaは`pgroonga`スキーマに関数・演算子・演算子クラスな

* `ILIKE`演算子

* [`&@`演算子](operators/match-v2.html)

* [`%%`演算子](operators/match.html)

* 1.2.0から非推奨になりました。代わりに[`&@`演算子](operators/match-v2.html)を使ってください。

* `jsonb`型以外の型用の[`&?`演算子](operators/query-v2.html)

* `jsonb`型以外の型用の[`@@`演算子](operators/query.html)

* 1.2.0から非推奨になりました。代わりに[`&?`演算子](operators/query-v2.html)を使ってください。

* `jsonb`型用の[`@@`演算子](operators/jsonb-query.html)

* [`@>`演算子](operators/jsonb-contain.html)
Expand Down
5 changes: 1 addition & 4 deletions ja/reference/operators/match-v2.md
Expand Up @@ -7,8 +7,6 @@ upper_level: ../

## 概要

この演算子はv2演算子クラスを使います。v2演算子クラスはPGroonga 2.0.0まで互換性を提供しません。注意して使ってください。

`&@`演算子は1つのキーワードで全文検索を実行します。

## 構文
Expand All @@ -31,8 +29,7 @@ CREATE TABLE memos (
content text
);

CREATE INDEX pgroonga_content_index ON memos
USING pgroonga (content pgroonga.text_full_text_search_ops_v2);
CREATE INDEX pgroonga_content_index ON memos USING pgroonga (content);
```

```sql
Expand Down
6 changes: 6 additions & 0 deletions ja/reference/operators/match.md
Expand Up @@ -7,6 +7,8 @@ upper_level: ../

## 概要

1.2.0からこの演算子は非推奨になりました。代わりに[`&@`演算子](match-v2.html)を使ってください。

`%%`は1つのキーワードで全文検索を実行します。

## 構文
Expand Down Expand Up @@ -53,4 +55,8 @@ SELECT * FROM memos WHERE content %% '全文検索';

## 参考

* [`&?`演算子](query-v2.html)

* [`@@`演算子](query.html)

* 1.2.0から非推奨になりました。代わりに[`&?`演算子](query-v2.html)を使ってください。
5 changes: 1 addition & 4 deletions ja/reference/operators/query-v2.md
Expand Up @@ -7,8 +7,6 @@ upper_level: ../

## 概要

この演算子はv2演算子クラスを使います。v2演算子クラスはPGroonga 2.0.0まで互換性を提供しません。注意して使ってください。

`&?`演算子はクエリーを使って全文検索を実行します。

クエリーの構文はWeb検索エンジンで使われている構文と似ています。たとえば、クエリーで`キーワード1 OR キーワード2`と書くとOR検索できます。
Expand All @@ -35,8 +33,7 @@ CREATE TABLE memos (
content text
);

CREATE INDEX pgroonga_content_index ON memos
USING pgroonga (content pgroonga.text_full_text_search_ops_v2);
CREATE INDEX pgroonga_content_index ON memos USING pgroonga (content);
```

```sql
Expand Down
6 changes: 6 additions & 0 deletions ja/reference/operators/query.md
Expand Up @@ -7,6 +7,8 @@ upper_level: ../

## 概要

1.2.0からこの演算子は非推奨になりました。代わりに[`&?`演算子](query-v2.html)を使ってください。

`@@`演算子はクエリーを使って全文検索を実行します。

クエリーの構文はWeb検索エンジンで使われている構文と似ています。たとえば、クエリーで`キーワード1 OR キーワード2`と書くとOR検索できます。
Expand Down Expand Up @@ -66,6 +68,10 @@ TODO: Describe about `SET search_path = "$user",public,pgroonga,pg_catalog;`.

## 参考

* [`&@`演算子](match-v2.html)

* [`%%`演算子](match.html)

* 1.2.0から非推奨になりました。代わりに[`&@`演算子](match-v2.html)を使ってください。

* [Groongaのクエリー構文](http://groonga.org/ja/docs/reference/grn_expr/query_syntax.html)
8 changes: 8 additions & 0 deletions reference/index.md
Expand Up @@ -32,10 +32,18 @@ PGroonga defines functions, operators, operator classes and so on into `pgroonga

* `ILIKE` operator

* [`&@` operator](operators/match-v2.html)

* [`%%` operator](operators/match.html)

* Deprecated since 1.2.0. Use [`&@` operator](operators/match-v2.html) instead.

* [`&?` operator](operators/query-v2.html) for non `jsonb` types

* [`@@` operator](operators/query.html) for non `jsonb` types

* Deprecated since 1.2.0. Use [`&?` operator](operators/query-v2.html) instead.

* [`@@` operator](operators/jsonb-query.html) for `jsonb` type

* [`@>` operator](operators/jsonb-contain.html)
Expand Down
5 changes: 1 addition & 4 deletions reference/operators/match-v2.md
Expand Up @@ -7,8 +7,6 @@ upper_level: ../

## Summary

This operator uses v2 operator class. It doesn't provide backward compatibility until PGroonga 2.0.0. Use it carefully.

`&@` operator performs full text search by one keyword.

## Syntax
Expand All @@ -31,8 +29,7 @@ CREATE TABLE memos (
content text
);

CREATE INDEX pgroonga_content_index ON memos
USING pgroonga (content pgroonga.text_full_text_search_ops_v2);
CREATE INDEX pgroonga_content_index ON memos USING pgroonga (content);
```

```sql
Expand Down
6 changes: 6 additions & 0 deletions reference/operators/match.md
Expand Up @@ -7,6 +7,8 @@ upper_level: ../

## Summary

This operator is deprecated since 1.2.0. Use [`&@` operator](match-v2.html) instead.

`%%` operator performs full text search by one keyword.

## Syntax
Expand Down Expand Up @@ -53,4 +55,8 @@ If you want to perform full text search with multiple keywords or AND/OR search,

## See also

* [`&?` operator](query-v2.html)

* [`@@` operator](query.html)

* Deprecated since 1.2.0. Use [`&?` operator](query-v2.html) instead.
5 changes: 1 addition & 4 deletions reference/operators/query-v2.md
Expand Up @@ -7,8 +7,6 @@ upper_level: ../

## Summary

This operator uses v2 operator class. It doesn't provide backward compatibility until PGroonga 2.0.0. Use it carefully.

`&?` operator performs full text search with query.

Query's syntax is similar to syntax that is used in Web search engine. For example, you can use OR search by `KEYWORD1 OR KEYWORD2` in query.
Expand All @@ -35,8 +33,7 @@ CREATE TABLE memos (
content text
);

CREATE INDEX pgroonga_content_index ON memos
USING pgroonga (content pgroonga.text_full_text_search_ops_v2);
CREATE INDEX pgroonga_content_index ON memos USING pgroonga (content);
```

```sql
Expand Down
6 changes: 6 additions & 0 deletions reference/operators/query.md
Expand Up @@ -7,6 +7,8 @@ upper_level: ../

## Summary

This operator is deprecated since 1.2.0. Use [`&?` operator](query-v2.html) instead.

`@@` operator performs full text search with query.

Query's syntax is similar to syntax that is used in Web search engine. For example, you can use OR search by `KEYWORD1 OR KEYWORD2` in query.
Expand Down Expand Up @@ -66,6 +68,10 @@ TODO: Describe about `SET search_path = "$user",public,pgroonga,pg_catalog;`.

## See also

* [`&@` operator](match-v2.html)

* [`%%` operator](match.html)

* Deprecated since 1.2.0. Use [`&@` operator](match-v2.html) instead.

* [Groonga's query syntax](http://groonga.org/docs/reference/grn_expr/query_syntax.html)

0 comments on commit 3c61477

Please sign in to comment.