YUKI Hiroshi
null+****@clear*****
Thu May 29 20:48:09 JST 2014
YUKI Hiroshi 2014-05-29 20:48:09 +0900 (Thu, 29 May 2014) New Revision: be92d8b64041cc506e096f2c3a11b4073e7fee08 https://github.com/droonga/droonga.org/commit/be92d8b64041cc506e096f2c3a11b4073e7fee08 Message: Confirm dump and restore result Modified files: _po/ja/tutorial/1.0.3/dump-restore/index.po _po/ja/tutorial/1.0.3/groonga/index.po _po/ja/tutorial/1.0.4/dump-restore/index.po _po/ja/tutorial/1.0.4/groonga/index.po ja/tutorial/1.0.3/dump-restore/index.md ja/tutorial/1.0.3/groonga/index.md ja/tutorial/1.0.4/dump-restore/index.md ja/tutorial/1.0.4/groonga/index.md tutorial/1.0.3/dump-restore/index.md tutorial/1.0.3/groonga/index.md tutorial/1.0.4/dump-restore/index.md tutorial/1.0.4/groonga/index.md Modified: _po/ja/tutorial/1.0.3/dump-restore/index.po (+31 -40) =================================================================== --- _po/ja/tutorial/1.0.3/dump-restore/index.po 2014-05-29 20:32:53 +0900 (7a1285e) +++ _po/ja/tutorial/1.0.3/dump-restore/index.po 2014-05-29 20:48:09 +0900 (e2e646f) @@ -121,7 +121,7 @@ msgid "" " \"dataset\": \"Default\",\n" " \"body\": {\n" " \"name\": \"Location\",\n" -" \"flags\": \"TABLE_HASH_KEY\",\n" +" \"flags\": \"TABLE_PAT_KEY\",\n" " \"key_type\": \"WGS84GeoPoint\"\n" " }\n" "}\n" @@ -130,9 +130,10 @@ msgid "" " \"dataset\": \"Default\",\n" " \"body\": {\n" " \"table\": \"Store\",\n" -" \"key\": \"Fashion Inst of Technology - New York NY\",\n" +" \"key\": \"store9\",\n" " \"values\": {\n" -" \"location\": \"146689013x-266380405\"\n" +" \"location\": \"146702531x-266363233\",\n" +" \"name\": \"Macy's 6th Floor - Herald Square - New York NY (W)\"\n" " }\n" " },\n" " \"type\": \"add\"\n" @@ -153,10 +154,10 @@ msgid "" " \"dataset\": \"Default\",\n" " \"body\": {\n" " \"table\": \"Term\",\n" -" \"name\": \"store__key\",\n" +" \"name\": \"store_name\",\n" " \"type\": \"Store\",\n" " \"flags\": \"COLUMN_INDEX|WITH_POSITION\",\n" -" \"source\": \"_key\"\n" +" \"source\": \"name\"\n" " }\n" "}\n" "~~~" @@ -240,48 +241,34 @@ msgstr "もし順番にこのチュートリアルを読み進めているので msgid "" " (on 192.168.0.10)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)\n" " # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -r ~/droonga/000\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" " --log-file=~/droonga/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" -" # droonga-http-server --port=10041 \\\n" -" --receive-host-name=$host \\\n" -" --droonga-engine-host-name=$host \\\n" -" --access-log-file=~/droonga/droonga-http-server.acce" -"ss.log \\\n" -" --system-log-file=~/droonga/droonga-http-server.syst" -"em.log \\\n" -" --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=~/droonga/droonga-engine.pid" msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)\n" " # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -r ~/droonga/000\n" " # host=192.168.0.11\n" " # droonga-engine --host=$host \\\n" " --log-file=~/droonga/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" -" # droonga-http-server --port=10041 \\\n" -" --receive-host-name=$host \\\n" -" --droonga-engine-host-name=$host \\\n" -" --access-log-file=~/droonga/droonga-http-server.acce" -"ss.log \\\n" -" --system-log-file=~/droonga/droonga-http-server.syst" -"em.log \\\n" -" --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=~/droonga/droonga-engine.pid" msgstr "" -msgid "After that the cluster becomes empty." -msgstr "これでクラスタは空になります。" +msgid "After that the cluster becomes empty. Confirm it:" +msgstr "これでクラスタは空になりました。確かめてみましょう:" + +msgid "" +" # endpoint=\"http://192.168.0.10:10041/d\"\n" +" # curl \"${endpoint}/select?table=Store&output_columns=name&limit=10\"\n" +" [[0,1401363465.610241,0],[[[null],[]]]]" +msgstr "" msgid "### Restore data from a dump result, to an empty Droonga cluster" msgstr "### ダンプ結果から空のDroongaクラスタへデータを復元する" @@ -348,6 +335,20 @@ msgstr "" " * `--receiver-host` オプションには、今操作しているコンピュータ自身の正しいホスト名またはIPアドレスを指定します。\n" " この情報は、Droongaクラスタがメッセージを送り返すために使われます。" +msgid "Then the data is completely restored. Confirm it:" +msgstr "これで、データが完全に復元されました。確かめてみましょう:" + +msgid "" +" # ${endpoint}/select?table=Store&output_columns=name&limit=10\"\n" +" [[0,1401363556.0294158,0.0000762939453125],[[[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 - Ne" +"w York NY (W)\"],[\"45th & Broadway - New York NY (W)\"],[\"Marriott Marquis - L" +"obby - New York NY\"],[\"Second @ 81st - New York NY (W)\"],[\"52nd & Seventh - N" +"ew York NY (W)\"]]]]" +msgstr "" + msgid "## Duplicate an existing Droonga cluster to another empty cluster" msgstr "## 既存のクラスタを別の空のクラスタに複製する" @@ -397,7 +398,6 @@ msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)\n" " # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -r ~/droonga/000\n" " # host=192.168.0.11\n" @@ -406,16 +406,7 @@ msgid "" " # droonga-engine --host=$host \\\n" " --log-file=~/droonga/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" -" # droonga-http-server --port=10041 \\\n" -" --receive-host-name=$host \\\n" -" --droonga-engine-host-name=$host \\\n" -" --access-log-file=~/droonga/droonga-http-server.acce" -"ss.log \\\n" -" --system-log-file=~/droonga/droonga-http-server.syst" -"em.log \\\n" -" --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=~/droonga/droonga-engine.pid" msgstr "" msgid "" Modified: _po/ja/tutorial/1.0.3/groonga/index.po (+1 -0) =================================================================== --- _po/ja/tutorial/1.0.3/groonga/index.po 2014-05-29 20:32:53 +0900 (7f1b331) +++ _po/ja/tutorial/1.0.3/groonga/index.po 2014-05-29 20:48:09 +0900 (22933d7) @@ -254,6 +254,7 @@ msgid "" " droonga-http-server --port=10041 \\\n" " --receive-host-name=$host \\\n" " --droonga-engine-host-name=$host \\\n" +" --cache-size=-1 \\\n" " --daemon \\\n" " --pid-file=~/droonga/droonga-http-server.pid" msgstr "" Modified: _po/ja/tutorial/1.0.4/dump-restore/index.po (+31 -40) =================================================================== --- _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-05-29 20:32:53 +0900 (b159c19) +++ _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-05-29 20:48:09 +0900 (09d0516) @@ -121,7 +121,7 @@ msgid "" " \"dataset\": \"Default\",\n" " \"body\": {\n" " \"name\": \"Location\",\n" -" \"flags\": \"TABLE_HASH_KEY\",\n" +" \"flags\": \"TABLE_PAT_KEY\",\n" " \"key_type\": \"WGS84GeoPoint\"\n" " }\n" "}\n" @@ -130,9 +130,10 @@ msgid "" " \"dataset\": \"Default\",\n" " \"body\": {\n" " \"table\": \"Store\",\n" -" \"key\": \"Fashion Inst of Technology - New York NY\",\n" +" \"key\": \"store9\",\n" " \"values\": {\n" -" \"location\": \"146689013x-266380405\"\n" +" \"location\": \"146702531x-266363233\",\n" +" \"name\": \"Macy's 6th Floor - Herald Square - New York NY (W)\"\n" " }\n" " },\n" " \"type\": \"add\"\n" @@ -153,10 +154,10 @@ msgid "" " \"dataset\": \"Default\",\n" " \"body\": {\n" " \"table\": \"Term\",\n" -" \"name\": \"store__key\",\n" +" \"name\": \"store_name\",\n" " \"type\": \"Store\",\n" " \"flags\": \"COLUMN_INDEX|WITH_POSITION\",\n" -" \"source\": \"_key\"\n" +" \"source\": \"name\"\n" " }\n" "}\n" "~~~" @@ -240,48 +241,34 @@ msgstr "もし順番にこのチュートリアルを読み進めているので msgid "" " (on 192.168.0.10)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)\n" " # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -r ~/droonga/000\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" " --log-file=~/droonga/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" -" # droonga-http-server --port=10041 \\\n" -" --receive-host-name=$host \\\n" -" --droonga-engine-host-name=$host \\\n" -" --access-log-file=~/droonga/droonga-http-server.acce" -"ss.log \\\n" -" --system-log-file=~/droonga/droonga-http-server.syst" -"em.log \\\n" -" --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=~/droonga/droonga-engine.pid" msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)\n" " # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -r ~/droonga/000\n" " # host=192.168.0.11\n" " # droonga-engine --host=$host \\\n" " --log-file=~/droonga/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" -" # droonga-http-server --port=10041 \\\n" -" --receive-host-name=$host \\\n" -" --droonga-engine-host-name=$host \\\n" -" --access-log-file=~/droonga/droonga-http-server.acce" -"ss.log \\\n" -" --system-log-file=~/droonga/droonga-http-server.syst" -"em.log \\\n" -" --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=~/droonga/droonga-engine.pid" msgstr "" -msgid "After that the cluster becomes empty." -msgstr "これでクラスタは空になります。" +msgid "After that the cluster becomes empty. Confirm it:" +msgstr "これでクラスタは空になりました。確かめてみましょう:" + +msgid "" +" # endpoint=\"http://192.168.0.10:10041/d\"\n" +" # curl \"${endpoint}/select?table=Store&output_columns=name&limit=10\"\n" +" [[0,1401363465.610241,0],[[[null],[]]]]" +msgstr "" msgid "### Restore data from a dump result, to an empty Droonga cluster" msgstr "### ダンプ結果から空のDroongaクラスタへデータを復元する" @@ -348,6 +335,20 @@ msgstr "" " * `--receiver-host` オプションには、今操作しているコンピュータ自身の正しいホスト名またはIPアドレスを指定します。\n" " この情報は、Droongaクラスタがメッセージを送り返すために使われます。" +msgid "Then the data is completely restored. Confirm it:" +msgstr "これで、データが完全に復元されました。確かめてみましょう:" + +msgid "" +" # ${endpoint}/select?table=Store&output_columns=name&limit=10\"\n" +" [[0,1401363556.0294158,0.0000762939453125],[[[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 - Ne" +"w York NY (W)\"],[\"45th & Broadway - New York NY (W)\"],[\"Marriott Marquis - L" +"obby - New York NY\"],[\"Second @ 81st - New York NY (W)\"],[\"52nd & Seventh - N" +"ew York NY (W)\"]]]]" +msgstr "" + msgid "## Duplicate an existing Droonga cluster to another empty cluster" msgstr "## 既存のクラスタを別の空のクラスタに複製する" @@ -397,7 +398,6 @@ msgstr "" msgid "" " (on 192.168.0.11)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)\n" " # kill $(cat ~/droonga/droonga-engine.pid)\n" " # rm -r ~/droonga/000\n" " # host=192.168.0.11\n" @@ -407,16 +407,7 @@ msgid "" " # droonga-engine --host=$host \\\n" " --log-file=~/droonga/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=~/droonga/droonga-engine.pid\n" -" # droonga-http-server --port=10041 \\\n" -" --receive-host-name=$host \\\n" -" --droonga-engine-host-name=$host \\\n" -" --access-log-file=~/droonga/droonga-http-server.acce" -"ss.log \\\n" -" --system-log-file=~/droonga/droonga-http-server.syst" -"em.log \\\n" -" --daemon \\\n" -" --pid-file=~/droonga/droonga-http-server.pid" +" --pid-file=~/droonga/droonga-engine.pid" msgstr "" msgid "" Modified: _po/ja/tutorial/1.0.4/groonga/index.po (+1 -0) =================================================================== --- _po/ja/tutorial/1.0.4/groonga/index.po 2014-05-29 20:32:53 +0900 (ac9d7a5) +++ _po/ja/tutorial/1.0.4/groonga/index.po 2014-05-29 20:48:09 +0900 (22b31bb) @@ -254,6 +254,7 @@ msgid "" " droonga-http-server --port=10041 \\\n" " --receive-host-name=$host \\\n" " --droonga-engine-host-name=$host \\\n" +" --cache-size=-1 \\\n" " --daemon \\\n" " --pid-file=~/droonga/droonga-http-server.pid" msgstr "" Modified: ja/tutorial/1.0.3/dump-restore/index.md (+17 -30) =================================================================== --- ja/tutorial/1.0.3/dump-restore/index.md 2014-05-29 20:32:53 +0900 (ade7acc) +++ ja/tutorial/1.0.3/dump-restore/index.md 2014-05-29 20:48:09 +0900 (c986cb2) @@ -69,7 +69,7 @@ layout: ja "dataset": "Default", "body": { "name": "Location", - "flags": "TABLE_HASH_KEY", + "flags": "TABLE_PAT_KEY", "key_type": "WGS84GeoPoint" } } @@ -78,9 +78,10 @@ layout: ja "dataset": "Default", "body": { "table": "Store", - "key": "Fashion Inst of Technology - New York NY", + "key": "store9", "values": { - "location": "146689013x-266380405" + "location": "146702531x-266363233", + "name": "Macy's 6th Floor - Herald Square - New York NY (W)" } }, "type": "add" @@ -101,10 +102,10 @@ layout: ja "dataset": "Default", "body": { "table": "Term", - "name": "store__key", + "name": "store_name", "type": "Store", "flags": "COLUMN_INDEX|WITH_POSITION", - "source": "_key" + "source": "name" } } ~~~ @@ -147,7 +148,6 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong もし順番にこのチュートリアルを読み進めているのであれば、クラスタとダンプファイルが既に手元にあるはずです。以下の操作でクラスタを空にしましょう: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.10 @@ -155,16 +155,8 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -172,15 +164,12 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid -これでクラスタは空になります。 +これでクラスタは空になりました。確かめてみましょう: + + # endpoint="http://192.168.0.10:10041/d" + # curl "${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363465.610241,0],[[[null],[]]]] ### ダンプ結果から空のDroongaクラスタへデータを復元する @@ -230,6 +219,12 @@ Elapsed time: 0.008678467 * `--receiver-host` オプションには、今操作しているコンピュータ自身の正しいホスト名またはIPアドレスを指定します。 この情報は、Droongaクラスタがメッセージを送り返すために使われます。 +これで、データが完全に復元されました。確かめてみましょう: + + # ${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363556.0294158,0.0000762939453125],[[[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)"]]]] + + ## 既存のクラスタを別の空のクラスタに複製する 複数のDroongaクラスタが存在する時に、`drndump` と `droonga-request` の2つのコマンドを併用すると、片方のクラスタの内容をもう片方に複製する事ができます。 @@ -250,7 +245,6 @@ Elapsed time: 0.008678467 --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -260,13 +254,6 @@ Elapsed time: 0.008678467 --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid これで、ノード `192.168.0.10` を含む複製元クラスタと、ノード `192.168.0.11` を含む複製先の空のクラスタの、2つのクラスタができます。 Modified: ja/tutorial/1.0.3/groonga/index.md (+1 -0) =================================================================== --- ja/tutorial/1.0.3/groonga/index.md 2014-05-29 20:32:53 +0900 (26cf059) +++ ja/tutorial/1.0.3/groonga/index.md 2014-05-29 20:48:09 +0900 (b11d0f6) @@ -126,6 +126,7 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --cache-size=-1 \ --daemon \ --pid-file=~/droonga/droonga-http-server.pid Modified: ja/tutorial/1.0.4/dump-restore/index.md (+15 -30) =================================================================== --- ja/tutorial/1.0.4/dump-restore/index.md 2014-05-29 20:32:53 +0900 (0aa2571) +++ ja/tutorial/1.0.4/dump-restore/index.md 2014-05-29 20:48:09 +0900 (8a256ca) @@ -69,7 +69,7 @@ layout: ja "dataset": "Default", "body": { "name": "Location", - "flags": "TABLE_HASH_KEY", + "flags": "TABLE_PAT_KEY", "key_type": "WGS84GeoPoint" } } @@ -78,9 +78,10 @@ layout: ja "dataset": "Default", "body": { "table": "Store", - "key": "Fashion Inst of Technology - New York NY", + "key": "store9", "values": { - "location": "146689013x-266380405" + "location": "146702531x-266363233", + "name": "Macy's 6th Floor - Herald Square - New York NY (W)" } }, "type": "add" @@ -101,10 +102,10 @@ layout: ja "dataset": "Default", "body": { "table": "Term", - "name": "store__key", + "name": "store_name", "type": "Store", "flags": "COLUMN_INDEX|WITH_POSITION", - "source": "_key" + "source": "name" } } ~~~ @@ -147,7 +148,6 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong もし順番にこのチュートリアルを読み進めているのであれば、クラスタとダンプファイルが既に手元にあるはずです。以下の操作でクラスタを空にしましょう: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.10 @@ -155,16 +155,8 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -172,15 +164,12 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid -これでクラスタは空になります。 +これでクラスタは空になりました。確かめてみましょう: + + # endpoint="http://192.168.0.10:10041/d" + # curl "${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363465.610241,0],[[[null],[]]]] ### ダンプ結果から空のDroongaクラスタへデータを復元する @@ -230,6 +219,10 @@ Elapsed time: 0.008678467 * `--receiver-host` オプションには、今操作しているコンピュータ自身の正しいホスト名またはIPアドレスを指定します。 この情報は、Droongaクラスタがメッセージを送り返すために使われます。 +これで、データが完全に復元されました。確かめてみましょう: + + # ${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363556.0294158,0.0000762939453125],[[[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)"]]]] ## 既存のクラスタを別の空のクラスタに複製する @@ -251,7 +244,6 @@ Elapsed time: 0.008678467 --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -262,13 +254,6 @@ Elapsed time: 0.008678467 --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid これで、ノード `192.168.0.10` を含む複製元クラスタと、ノード `192.168.0.11` を含む複製先の空のクラスタの、2つのクラスタができます。 Modified: ja/tutorial/1.0.4/groonga/index.md (+1 -0) =================================================================== --- ja/tutorial/1.0.4/groonga/index.md 2014-05-29 20:32:53 +0900 (2ed49eb) +++ ja/tutorial/1.0.4/groonga/index.md 2014-05-29 20:48:09 +0900 (acc77ee) @@ -126,6 +126,7 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --cache-size=-1 \ --daemon \ --pid-file=~/droonga/droonga-http-server.pid Modified: tutorial/1.0.3/dump-restore/index.md (+17 -30) =================================================================== --- tutorial/1.0.3/dump-restore/index.md 2014-05-29 20:32:53 +0900 (0df3bde) +++ tutorial/1.0.3/dump-restore/index.md 2014-05-29 20:48:09 +0900 (df25794) @@ -61,7 +61,7 @@ For example, if your cluster is constructed from two nodes `192.168.0.10` and `1 "dataset": "Default", "body": { "name": "Location", - "flags": "TABLE_HASH_KEY", + "flags": "TABLE_PAT_KEY", "key_type": "WGS84GeoPoint" } } @@ -70,9 +70,10 @@ For example, if your cluster is constructed from two nodes `192.168.0.10` and `1 "dataset": "Default", "body": { "table": "Store", - "key": "Fashion Inst of Technology - New York NY", + "key": "store9", "values": { - "location": "146689013x-266380405" + "location": "146702531x-266363233", + "name": "Macy's 6th Floor - Herald Square - New York NY (W)" } }, "type": "add" @@ -93,10 +94,10 @@ For example, if your cluster is constructed from two nodes `192.168.0.10` and `1 "dataset": "Default", "body": { "table": "Term", - "name": "store__key", + "name": "store_name", "type": "Store", "flags": "COLUMN_INDEX|WITH_POSITION", - "source": "_key" + "source": "name" } } ~~~ @@ -140,7 +141,6 @@ If you are reading this tutorial sequentially, you'll have an existing cluster a Make it empty with these commands: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.10 @@ -148,16 +148,8 @@ Make it empty with these commands: --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -165,15 +157,12 @@ Make it empty with these commands: --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid -After that the cluster becomes empty. +After that the cluster becomes empty. Confirm it: + + # endpoint="http://192.168.0.10:10041/d" + # curl "${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363465.610241,0],[[[null],[]]]] ### Restore data from a dump result, to an empty Droonga cluster @@ -223,6 +212,12 @@ Note to these things: * You must specify valid host name or IP address of the computer you are logged in, via the option `--receiver-host`. It is used by the Droonga cluster, to send response messages. +Then the data is completely restored. Confirm it: + + # ${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363556.0294158,0.0000762939453125],[[[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)"]]]] + + ## Duplicate an existing Droonga cluster to another empty cluster If you have multiple Droonga clusters, then you can duplicate one to another with `drndump` and `droonga-request` commands. @@ -244,7 +239,6 @@ Construct two clusters and make one empty, with these commands: --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -254,13 +248,6 @@ Construct two clusters and make one empty, with these commands: --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid After that there are two clusters: one contains `192.168.0.10` with data, another contains `192.168.0.11` with no data. Modified: tutorial/1.0.3/groonga/index.md (+1 -0) =================================================================== --- tutorial/1.0.3/groonga/index.md 2014-05-29 20:32:53 +0900 (546fdd1) +++ tutorial/1.0.3/groonga/index.md 2014-05-29 20:48:09 +0900 (b869b8b) @@ -117,6 +117,7 @@ To start them, run commands like following on each Droonga node: droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --cache-size=-1 \ --daemon \ --pid-file=~/droonga/droonga-http-server.pid Modified: tutorial/1.0.4/dump-restore/index.md (+15 -30) =================================================================== --- tutorial/1.0.4/dump-restore/index.md 2014-05-29 20:32:53 +0900 (07d2473) +++ tutorial/1.0.4/dump-restore/index.md 2014-05-29 20:48:09 +0900 (279dcd2) @@ -61,7 +61,7 @@ For example, if your cluster is constructed from two nodes `192.168.0.10` and `1 "dataset": "Default", "body": { "name": "Location", - "flags": "TABLE_HASH_KEY", + "flags": "TABLE_PAT_KEY", "key_type": "WGS84GeoPoint" } } @@ -70,9 +70,10 @@ For example, if your cluster is constructed from two nodes `192.168.0.10` and `1 "dataset": "Default", "body": { "table": "Store", - "key": "Fashion Inst of Technology - New York NY", + "key": "store9", "values": { - "location": "146689013x-266380405" + "location": "146702531x-266363233", + "name": "Macy's 6th Floor - Herald Square - New York NY (W)" } }, "type": "add" @@ -93,10 +94,10 @@ For example, if your cluster is constructed from two nodes `192.168.0.10` and `1 "dataset": "Default", "body": { "table": "Term", - "name": "store__key", + "name": "store_name", "type": "Store", "flags": "COLUMN_INDEX|WITH_POSITION", - "source": "_key" + "source": "name" } } ~~~ @@ -140,7 +141,6 @@ If you are reading this tutorial sequentially, you'll have an existing cluster a Make it empty with these commands: (on 192.168.0.10) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.10 @@ -148,16 +148,8 @@ Make it empty with these commands: --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -165,15 +157,12 @@ Make it empty with these commands: --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid -After that the cluster becomes empty. +After that the cluster becomes empty. Confirm it: + + # endpoint="http://192.168.0.10:10041/d" + # curl "${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363465.610241,0],[[[null],[]]]] ### Restore data from a dump result, to an empty Droonga cluster @@ -223,6 +212,10 @@ Note to these things: * You must specify valid host name or IP address of the computer you are logged in, via the option `--receiver-host`. It is used by the Droonga cluster, to send response messages. +Then the data is completely restored. Confirm it: + + # ${endpoint}/select?table=Store&output_columns=name&limit=10" + [[0,1401363556.0294158,0.0000762939453125],[[[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)"]]]] ## Duplicate an existing Droonga cluster to another empty cluster @@ -245,7 +238,6 @@ Construct two clusters and make one empty, with these commands: --output=~/droonga/catalog.json (on 192.168.0.11) - # kill $(cat ~/droonga/droonga-http-server.pid) # kill $(cat ~/droonga/droonga-engine.pid) # rm -r ~/droonga/000 # host=192.168.0.11 @@ -256,13 +248,6 @@ Construct two clusters and make one empty, with these commands: --log-file=~/droonga/droonga-engine.log \ --daemon \ --pid-file=~/droonga/droonga-engine.pid - # droonga-http-server --port=10041 \ - --receive-host-name=$host \ - --droonga-engine-host-name=$host \ - --access-log-file=~/droonga/droonga-http-server.access.log \ - --system-log-file=~/droonga/droonga-http-server.system.log \ - --daemon \ - --pid-file=~/droonga/droonga-http-server.pid After that there are two clusters: one contains `192.168.0.10` with data, another contains `192.168.0.11` with no data. Modified: tutorial/1.0.4/groonga/index.md (+1 -0) =================================================================== --- tutorial/1.0.4/groonga/index.md 2014-05-29 20:32:53 +0900 (24d4081) +++ tutorial/1.0.4/groonga/index.md 2014-05-29 20:48:09 +0900 (7ce3b6a) @@ -117,6 +117,7 @@ To start them, run commands like following on each Droonga node: droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ + --cache-size=-1 \ --daemon \ --pid-file=~/droonga/droonga-http-server.pid -------------- next part -------------- HTML����������������������������...下載
