Navigation Menu

Skip to content

Commit

Permalink
Don't include "/d" to the variable "endpoint"
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Jun 25, 2014
1 parent 482866a commit ca64e7a
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 48 deletions.
44 changes: 22 additions & 22 deletions _po/ja/tutorial/1.0.4/groonga/index.po
Expand Up @@ -309,9 +309,9 @@ msgstr ""
"新しいテーブル `Store` を作るには、`table_create` コマンドにあたるGETリクエストを送信して下さい:"

msgid ""
" # endpoint=\"http://192.168.0.10:10041/d\"\n"
" # curl \"${endpoint}/table_create?name=Store&flags=TABLE_PAT_KEY&key_type=S"
"hortText\"\n"
" # endpoint=\"http://192.168.0.10:10041\"\n"
" # curl \"${endpoint}/d/table_create?name=Store&flags=TABLE_PAT_KEY&key_type"
"=ShortText\"\n"
" [[0,1401358896.360356,0.0035653114318847656],true]"
msgstr ""

Expand All @@ -332,29 +332,29 @@ msgid ""
msgstr "次は、`column_create` コマンドを使って `Store` テーブルに `name` と `location` という新しいカラムを作ります:"

msgid ""
" # curl \"${endpoint}/column_create?table=Store&name=name&flags=COLUMN_SCALA"
"R&type=ShortText\"\n"
" # curl \"${endpoint}/d/column_create?table=Store&name=name&flags=COLUMN_SCA"
"LAR&type=ShortText\"\n"
" [[0,1401358348.6541538,0.0004096031188964844],true]\n"
" # curl \"${endpoint}/column_create?table=Store&name=location&flags=COLUMN_S"
"CALAR&type=WGS84GeoPoint\"\n"
" # curl \"${endpoint}/d/column_create?table=Store&name=location&flags=COLUMN"
"_SCALAR&type=WGS84GeoPoint\"\n"
" [[0,1401358359.084659,0.002511262893676758],true],true]"
msgstr ""

msgid "Create indexes also."
msgstr "インデックスも作成しましょう。"

msgid ""
" # curl \"${endpoint}/table_create?name=Term&flags=TABLE_PAT_KEY&key_type=Sh"
"ortText&default_tokenizer=TokenBigram&normalizer=NormalizerAuto\"\n"
" # curl \"${endpoint}/d/table_create?name=Term&flags=TABLE_PAT_KEY&key_type="
"ShortText&default_tokenizer=TokenBigram&normalizer=NormalizerAuto\"\n"
" [[0,1401358475.7229664,0.002419710159301758],true]\n"
" # curl \"${endpoint}/column_create?table=Term&name=store_name&flags=COLUMN_"
"INDEX|WITH_POSITION&type=Store&source=name\"\n"
" # curl \"${endpoint}/d/column_create?table=Term&name=store_name&flags=COLUM"
"N_INDEX|WITH_POSITION&type=Store&source=name\"\n"
" [[0,1401358494.1656318,0.006799221038818359],true]\n"
" # curl \"${endpoint}/table_create?name=Location&flags=TABLE_PAT_KEY&key_typ"
"e=WGS84GeoPoint\"\n"
" # curl \"${endpoint}/d/table_create?name=Location&flags=TABLE_PAT_KEY&key_t"
"ype=WGS84GeoPoint\"\n"
" [[0,1401358505.708896,0.0016951560974121094],true]\n"
" # curl \"${endpoint}/column_create?table=Location&name=store&flags=COLUMN_I"
"NDEX&type=Store&source=location\"\n"
" # curl \"${endpoint}/d/column_create?table=Location&name=store&flags=COLUMN"
"_INDEX&type=Store&source=location\"\n"
" [[0,1401358519.6187897,0.024788379669189453],true]"
msgstr ""

Expand All @@ -377,7 +377,7 @@ msgstr ""
"`table_list` コマンドを使って、作成されたテーブルの情報を見てみましょう:"

msgid ""
" # curl \"${endpoint}/table_list\"\n"
" # curl \"${endpoint}/d/table_list\"\n"
" [[0,1401358908.9126804,0.001600027084350586],[[[\"id\",\"UInt32\"],[\"name\",\"Sh"
"ortText\"],[\"path\",\"ShortText\"],[\"flags\",\"ShortText\"],[\"domain\",\"ShortText\"],[\""
"range\",\"ShortText\"],[\"default_tokenizer\",\"ShortText\"],[\"normalizer\",\"ShortText"
Expand Down Expand Up @@ -468,7 +468,7 @@ msgid "Then, send it as a POST request of the `load` command, like:"
msgstr "データが準備できたら、`load` コマンドのPOSTリクエストとして送信します:"

msgid ""
" # curl --data \"@stores.json\" \"${endpoint}/load?table=Store\"\n"
" # curl --data \"@stores.json\" \"${endpoint}/d/load?table=Store\"\n"
" [[0,1401358564.909,0.158],[40]]"
msgstr ""

Expand All @@ -485,7 +485,7 @@ msgid "As the starter, let's select initial ten records with the `select` comman
msgstr "試しに、`select` コマンドを使って最初の10レコードを取り出してみましょう:"

msgid ""
" # curl \"${endpoint}/select?table=Store&output_columns=name&limit=10\"\n"
" # curl \"${endpoint}/d/select?table=Store&output_columns=name&limit=10\"\n"
" [[0,1401362059.7437818,0.00004935264587402344],[[[40],[[\"name\",\"ShortText\""
"]],[\"1st Avenue & 75th St. - New York NY (W)\"],[\"76th & Second - New York NY "
" (W)\"],[\"Herald Square- Macy's - New York NY\"],[\"Macy's 5th Floor - Herald Squ"
Expand All @@ -499,13 +499,13 @@ msgid "Of course you can specify conditions via the `query` option:"
msgstr "もちろん、`query` オプションを使って検索条件を指定する事もできます:"

msgid ""
" # curl \"${endpoint}/select?table=Store&query=Columbus&match_columns=name&o"
"utput_columns=name&limit=10\"\n"
" # curl \"${endpoint}/d/select?table=Store&query=Columbus&match_columns=name"
"&output_columns=name&limit=10\"\n"
" [[0,1398670157.661574,0.0012705326080322266],[[[2],[[\"_key\",\"ShortText\"]],"
"[\"Columbus @ 67th - New York NY (W)\"],[\"2 Columbus Ave. - New York NY (W)\"]]"
"]]\n"
" # curl \"${endpoint}/select?table=Store&filter=name@'Ave'&output_columns=na"
"me&limit=10\"\n"
" # curl \"${endpoint}/d/select?table=Store&filter=name@'Ave'&output_columns="
"name&limit=10\"\n"
" [[0,1398670586.193325,0.0003848075866699219],[[[3],[[\"_key\",\"ShortText\"]],"
"[\"2nd Ave. & 9th Street - New York NY\"],[\"84th & Third Ave - New York NY (W)\""
"],[\"2 Columbus Ave. - New York NY (W)\"]]]]"
Expand Down
26 changes: 13 additions & 13 deletions ja/tutorial/1.0.4/groonga/index.md
Expand Up @@ -153,8 +153,8 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ
リクエストの送信方法はGroongaサーバの場合と全く同じです。
新しいテーブル `Store` を作るには、`table_create` コマンドにあたるGETリクエストを送信して下さい:

# endpoint="http://192.168.0.10:10041/d"
# curl "${endpoint}/table_create?name=Store&flags=TABLE_PAT_KEY&key_type=ShortText"
# endpoint="http://192.168.0.10:10041"
# curl "${endpoint}/d/table_create?name=Store&flags=TABLE_PAT_KEY&key_type=ShortText"
[[0,1401358896.360356,0.0035653114318847656],true]

リクエストの送信先として、Droongaノード中でdroonga-http-serverが動作しているDroongaノードのどれか1つを指定する必要がある事に注意して下さい。
Expand All @@ -163,28 +163,28 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ

次は、`column_create` コマンドを使って `Store` テーブルに `name``location` という新しいカラムを作ります:

# curl "${endpoint}/column_create?table=Store&name=name&flags=COLUMN_SCALAR&type=ShortText"
# curl "${endpoint}/d/column_create?table=Store&name=name&flags=COLUMN_SCALAR&type=ShortText"
[[0,1401358348.6541538,0.0004096031188964844],true]
# curl "${endpoint}/column_create?table=Store&name=location&flags=COLUMN_SCALAR&type=WGS84GeoPoint"
# curl "${endpoint}/d/column_create?table=Store&name=location&flags=COLUMN_SCALAR&type=WGS84GeoPoint"
[[0,1401358359.084659,0.002511262893676758],true],true]

インデックスも作成しましょう。

# curl "${endpoint}/table_create?name=Term&flags=TABLE_PAT_KEY&key_type=ShortText&default_tokenizer=TokenBigram&normalizer=NormalizerAuto"
# curl "${endpoint}/d/table_create?name=Term&flags=TABLE_PAT_KEY&key_type=ShortText&default_tokenizer=TokenBigram&normalizer=NormalizerAuto"
[[0,1401358475.7229664,0.002419710159301758],true]
# curl "${endpoint}/column_create?table=Term&name=store_name&flags=COLUMN_INDEX|WITH_POSITION&type=Store&source=name"
# curl "${endpoint}/d/column_create?table=Term&name=store_name&flags=COLUMN_INDEX|WITH_POSITION&type=Store&source=name"
[[0,1401358494.1656318,0.006799221038818359],true]
# curl "${endpoint}/table_create?name=Location&flags=TABLE_PAT_KEY&key_type=WGS84GeoPoint"
# curl "${endpoint}/d/table_create?name=Location&flags=TABLE_PAT_KEY&key_type=WGS84GeoPoint"
[[0,1401358505.708896,0.0016951560974121094],true]
# curl "${endpoint}/column_create?table=Location&name=store&flags=COLUMN_INDEX&type=Store&source=location"
# curl "${endpoint}/d/column_create?table=Location&name=store&flags=COLUMN_INDEX&type=Store&source=location"
[[0,1401358519.6187897,0.024788379669189453],true]

*注意*: テーブルが完全にできあがるまでは、`table_list``column_list` といったコマンドを実行しないでください。テーブルができあがる前にこれらのコマンドを実行してしまうと、インデックスが破損した状態になってしまいます。これはバージョン{{ site.droonga_version }}での既知の不具合で、将来のバージョンで修正される予定です。

さて、テーブルを正しく作成できました。
`table_list` コマンドを使って、作成されたテーブルの情報を見てみましょう:

# curl "${endpoint}/table_list"
# curl "${endpoint}/d/table_list"
[[0,1401358908.9126804,0.001600027084350586],[[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],[256,"Store","/home/vagrant/droonga/000/db.0000100","TABLE_PAT_KEY|PERSISTENT","ShortText",null,null,null]]]

Droongaはクラスタで動作するので、他のエンドポイントも同じ結果を返します。
Expand Down Expand Up @@ -247,7 +247,7 @@ stores.json:

データが準備できたら、`load` コマンドのPOSTリクエストとして送信します:

# curl --data "@stores.json" "${endpoint}/load?table=Store"
# curl --data "@stores.json" "${endpoint}/d/load?table=Store"
[[0,1401358564.909,0.158],[40]]

これで、JSONファイル中のすべてのデータが正しく読み込まれます。
Expand All @@ -258,14 +258,14 @@ stores.json:

試しに、`select` コマンドを使って最初の10レコードを取り出してみましょう:

# curl "${endpoint}/select?table=Store&output_columns=name&limit=10"
# curl "${endpoint}/d/select?table=Store&output_columns=name&limit=10"
[[0,1401362059.7437818,0.00004935264587402344],[[[40],[["name","ShortText"]],["1st Avenue & 75th St. - New York NY (W)"],["76th & Second - New York NY (W)"],["Herald Square- Macy's - New York NY"],["Macy's 5th Floor - Herald Square - New York NY (W)"],["80th & York - New York NY (W)"],["Columbus @ 67th - New York NY (W)"],["45th & Broadway - New York NY (W)"],["Marriott Marquis - Lobby - New York NY"],["Second @ 81st - New York NY (W)"],["52nd & Seventh - New York NY (W)"]]]]

もちろん、`query` オプションを使って検索条件を指定する事もできます:

# curl "${endpoint}/select?table=Store&query=Columbus&match_columns=name&output_columns=name&limit=10"
# curl "${endpoint}/d/select?table=Store&query=Columbus&match_columns=name&output_columns=name&limit=10"
[[0,1398670157.661574,0.0012705326080322266],[[[2],[["_key","ShortText"]],["Columbus @ 67th - New York NY (W)"],["2 Columbus Ave. - New York NY (W)"]]]]
# curl "${endpoint}/select?table=Store&filter=name@'Ave'&output_columns=name&limit=10"
# curl "${endpoint}/d/select?table=Store&filter=name@'Ave'&output_columns=name&limit=10"
[[0,1398670586.193325,0.0003848075866699219],[[[3],[["_key","ShortText"]],["2nd Ave. & 9th Street - New York NY"],["84th & Third Ave - New York NY (W)"],["2 Columbus Ave. - New York NY (W)"]]]]

## まとめ
Expand Down
26 changes: 13 additions & 13 deletions tutorial/1.0.4/groonga/index.md
Expand Up @@ -146,8 +146,8 @@ Now your Droonga cluster actually works as a Groonga's HTTP server.
Requests are completely same to ones for a Groonga server.
To create a new table `Store`, you just have to send a GET request for the `table_create` command, like:

# endpoint="http://192.168.0.10:10041/d"
# curl "${endpoint}/table_create?name=Store&flags=TABLE_PAT_KEY&key_type=ShortText"
# endpoint="http://192.168.0.10:10041"
# curl "${endpoint}/d/table_create?name=Store&flags=TABLE_PAT_KEY&key_type=ShortText"
[[0,1401358896.360356,0.0035653114318847656],true]

Note that you have to specify the host, one of Droonga nodes with active droonga-http-server, in your Droonga cluster.
Expand All @@ -156,20 +156,20 @@ All requests will be distributed to suitable nodes in the cluster.

Next, create new columns `name` and `location` to the `Store` table by the `column_create` command, like:

# curl "${endpoint}/column_create?table=Store&name=name&flags=COLUMN_SCALAR&type=ShortText"
# curl "${endpoint}/d/column_create?table=Store&name=name&flags=COLUMN_SCALAR&type=ShortText"
[[0,1401358348.6541538,0.0004096031188964844],true]
# curl "${endpoint}/column_create?table=Store&name=location&flags=COLUMN_SCALAR&type=WGS84GeoPoint"
# curl "${endpoint}/d/column_create?table=Store&name=location&flags=COLUMN_SCALAR&type=WGS84GeoPoint"
[[0,1401358359.084659,0.002511262893676758],true],true]

Create indexes also.

# curl "${endpoint}/table_create?name=Term&flags=TABLE_PAT_KEY&key_type=ShortText&default_tokenizer=TokenBigram&normalizer=NormalizerAuto"
# curl "${endpoint}/d/table_create?name=Term&flags=TABLE_PAT_KEY&key_type=ShortText&default_tokenizer=TokenBigram&normalizer=NormalizerAuto"
[[0,1401358475.7229664,0.002419710159301758],true]
# curl "${endpoint}/column_create?table=Term&name=store_name&flags=COLUMN_INDEX|WITH_POSITION&type=Store&source=name"
# curl "${endpoint}/d/column_create?table=Term&name=store_name&flags=COLUMN_INDEX|WITH_POSITION&type=Store&source=name"
[[0,1401358494.1656318,0.006799221038818359],true]
# curl "${endpoint}/table_create?name=Location&flags=TABLE_PAT_KEY&key_type=WGS84GeoPoint"
# curl "${endpoint}/d/table_create?name=Location&flags=TABLE_PAT_KEY&key_type=WGS84GeoPoint"
[[0,1401358505.708896,0.0016951560974121094],true]
# curl "${endpoint}/column_create?table=Location&name=store&flags=COLUMN_INDEX&type=Store&source=location"
# curl "${endpoint}/d/column_create?table=Location&name=store&flags=COLUMN_INDEX&type=Store&source=location"
[[0,1401358519.6187897,0.024788379669189453],true]

*IMPORTANT NOTE*: Don't run `table_list` or `column_list` before the table is completely created.
Expand All @@ -179,7 +179,7 @@ This is a known issue on the version {{ site.droonga_version }}, and it will be
OK, now the table has been created successfully.
Let's see it by the `table_list` command:

# curl "${endpoint}/table_list"
# curl "${endpoint}/d/table_list"
[[0,1401358908.9126804,0.001600027084350586],[[["id","UInt32"],["name","ShortText"],["path","ShortText"],["flags","ShortText"],["domain","ShortText"],["range","ShortText"],["default_tokenizer","ShortText"],["normalizer","ShortText"]],[256,"Store","/home/vagrant/droonga/000/db.0000100","TABLE_PAT_KEY|PERSISTENT","ShortText",null,null,null]]]

Because it is a cluster, another endpoint returns same result.
Expand Down Expand Up @@ -242,7 +242,7 @@ stores.json:

Then, send it as a POST request of the `load` command, like:

# curl --data "@stores.json" "${endpoint}/load?table=Store"
# curl --data "@stores.json" "${endpoint}/d/load?table=Store"
[[0,1401358564.909,0.158],[40]]

Now all data in the JSON file are successfully loaded.
Expand All @@ -253,14 +253,14 @@ OK, all data is now ready.

As the starter, let's select initial ten records with the `select` command:

# curl "${endpoint}/select?table=Store&output_columns=name&limit=10"
# curl "${endpoint}/d/select?table=Store&output_columns=name&limit=10"
[[0,1401362059.7437818,0.00004935264587402344],[[[40],[["name","ShortText"]],["1st Avenue & 75th St. - New York NY (W)"],["76th & Second - New York NY (W)"],["Herald Square- Macy's - New York NY"],["Macy's 5th Floor - Herald Square - New York NY (W)"],["80th & York - New York NY (W)"],["Columbus @ 67th - New York NY (W)"],["45th & Broadway - New York NY (W)"],["Marriott Marquis - Lobby - New York NY"],["Second @ 81st - New York NY (W)"],["52nd & Seventh - New York NY (W)"]]]]

Of course you can specify conditions via the `query` option:

# curl "${endpoint}/select?table=Store&query=Columbus&match_columns=name&output_columns=name&limit=10"
# curl "${endpoint}/d/select?table=Store&query=Columbus&match_columns=name&output_columns=name&limit=10"
[[0,1398670157.661574,0.0012705326080322266],[[[2],[["_key","ShortText"]],["Columbus @ 67th - New York NY (W)"],["2 Columbus Ave. - New York NY (W)"]]]]
# curl "${endpoint}/select?table=Store&filter=name@'Ave'&output_columns=name&limit=10"
# curl "${endpoint}/d/select?table=Store&filter=name@'Ave'&output_columns=name&limit=10"
[[0,1398670586.193325,0.0003848075866699219],[[[3],[["_key","ShortText"]],["2nd Ave. & 9th Street - New York NY"],["84th & Third Ave - New York NY (W)"],["2 Columbus Ave. - New York NY (W)"]]]]

## Conclusion
Expand Down

0 comments on commit ca64e7a

Please sign in to comment.