null+****@clear*****
null+****@clear*****
2011年 11月 30日 (水) 10:36:51 JST
Susumu Yata 2011-11-30 01:36:51 +0000 (Wed, 30 Nov 2011)
New Revision: 183df30ebe5ccf1f41a265f1c5a045bb64ea7a5e
Log:
[doc] fixed execution examples (introduction-1, 2 and 3).
Modified files:
doc/source/example/tutorial/data-1.log
doc/source/example/tutorial/data-2.log
doc/source/example/tutorial/data-3.log
doc/source/example/tutorial/introduction-1.log
doc/source/example/tutorial/introduction-2.log
doc/source/example/tutorial/introduction-3.log
doc/source/tutorial/data.txt
Modified: doc/source/example/tutorial/data-1.log (+8 -8)
===================================================================
--- doc/source/example/tutorial/data-1.log 2011-11-29 08:10:37 +0000 (9f6ca1d)
+++ doc/source/example/tutorial/data-1.log 2011-11-30 01:36:51 +0000 (18325aa)
@@ -1,18 +1,18 @@
-実行例 ::
+Execution example::
> table_create --name Type --flags TABLE_HASH_KEY --key_type ShortText
- [[0,1308820985.62521,0.057448585],true]
+ [[0,1322616293.7274,0.012551106],true]
> column_create --table Type --name number --type Int32
- [[0,1308820985.88435,0.0506424],true]
+ [[0,1322616293.94115,0.008619605],true]
> column_create --table Type --name float --type Float
- [[0,1308820986.13667,0.06274076],true]
+ [[0,1322616294.15095,0.004959989],true]
> column_create --table Type --name string --type ShortText
+ [[0,1322616294.35693,0.005551818],true]
> column_create --table Type --name time --type Time
- [[0,1308820986.40111,0.207566663],true]
- [[0,1308820986.60872,0.060231324],true]
+ [[0,1322616294.56333,0.006356953],true]
> load --table Type
> [{"_key":"sample","number":12345,"float":42.195,"string":"GROONGA","time":1234567890.12}]
- [[0,1308820986.87067,0.202168318],1]
+ [[0,1322616294.77086,0.202357708],1]
> select --table Type
- [[0,1308820987.27451,0.000171948],[[[1],[["_id","UInt32"],["_key","ShortText"],["time","Time"],["string","ShortText"],["number","Int32"],["float","Float"]],[1,"sample",1234567890.12,"GROONGA",12345,42.195]]]]
+ [[0,1322616295.1744,0.000340057],[[[1],[["_id","UInt32"],["_key","ShortText"],["float","Float"],["number","Int32"],["string","ShortText"],["time","Time"]],[1,"sample",42.195,12345,"GROONGA",1234567890.12]]]]
\ No newline at end of file
Modified: doc/source/example/tutorial/data-2.log (+4 -4)
===================================================================
--- doc/source/example/tutorial/data-2.log 2011-11-29 08:10:37 +0000 (e6be26b)
+++ doc/source/example/tutorial/data-2.log 2011-11-30 01:36:51 +0000 (c08d61b)
@@ -1,10 +1,10 @@
-実行例 ::
+Execution example::
> column_create --table Site --name link --type Site
- [[0,1308820987.47796,0.067493639],true]
+ [[0,1322616295.37864,0.005674045],true]
> load --table Site
> [{"_key":"http://example.org/","link":"http://example.net/"}]
- [[0,1308820987.74711,0.201407365],1]
+ [[0,1322616295.5854,0.200879317],1]
> select --table Site --output_columns _key,title,link._key,link.title --query title:@this
- [[0,1308820988.15016,0.000502207],[[[1],[["_key","ShortText"],["title","ShortText"],["link._key","ShortText"],["link.title","ShortText"]],["http://example.org/","This is test record 1!","http://example.net/","test record 2."]]]]
+ [[0,1322616295.98732,0.000872177],[[[1],[["_key","ShortText"],["title","ShortText"],["link._key","ShortText"],["link.title","ShortText"]],["http://example.org/","This is test record 1!","http://example.net/","test record 2."]]]]
\ No newline at end of file
Modified: doc/source/example/tutorial/data-3.log (+4 -4)
===================================================================
--- doc/source/example/tutorial/data-3.log 2011-11-29 08:10:37 +0000 (01b97b1)
+++ doc/source/example/tutorial/data-3.log 2011-11-30 01:36:51 +0000 (27def94)
@@ -1,10 +1,10 @@
-実行例 ::
+Execution example::
> column_create --table Site --name links --flags COLUMN_VECTOR --type Site
- [[0,1308820988.35428,0.055857261],true]
+ [[0,1322616296.19238,0.007598942],true]
> load --table Site
> [{"_key":"http://example.org/","links":["http://example.net/","http://example.org/","http://example.com/"]}]
- [[0,1308820988.61189,0.20152687],1]
+ [[0,1322616296.40092,0.201036234],1]
> select --table Site --output_columns _key,title,links._key,links.title --query title:@this
- [[0,1308820989.01506,0.000477611],[[[1],[["_key","ShortText"],["title","ShortText"],["links._key","ShortText"],["links.title","ShortText"]],["http://example.org/","This is test record 1!",["http://example.net/","http://example.org/","http://example.com/"],["test record 2.","This is test record 1!","test test record three."]]]]]
+ [[0,1322616296.80305,0.000899975],[[[1],[["_key","ShortText"],["title","ShortText"],["links._key","ShortText"],["links.title","ShortText"]],["http://example.org/","This is test record 1!",["http://example.net/","http://example.org/","http://example.com/"],["test record 2.","This is test record 1!","test test record three."]]]]]
\ No newline at end of file
Modified: doc/source/example/tutorial/introduction-1.log (+3 -15)
===================================================================
--- doc/source/example/tutorial/introduction-1.log 2011-11-29 08:10:37 +0000 (b028f26)
+++ doc/source/example/tutorial/introduction-1.log 2011-11-30 01:36:51 +0000 (9308c5c)
@@ -1,18 +1,6 @@
Execution example::
- > table_create --name Type --flags TABLE_HASH_KEY --key_type ShortText
- [[0,1317212791.02322,0.03942904],true]
- > column_create --table Type --name number --type Int32
- [[0,1317212791.26314,0.124383285],true]
- > column_create --table Type --name float --type Float
- [[0,1317212791.58803,0.027924039],true]
- > column_create --table Type --name string --type ShortText
- [[0,1317212791.81654,0.040399047],true]
- > column_create --table Type --name time --type Time
- [[0,1317212792.05751,0.027354067],true]
- > load --table Type
- > [{"_key":"sample","number":12345,"float":42.195,"string":"GROONGA","time":1234567890.12}]
- [[0,1317212792.28516,0.200775839],1]
- > select --table Type
- [[0,1317212792.68655,0.000199477],[[[1],[["_id","UInt32"],["_key","ShortText"],["time","Time"],["string","ShortText"],["number","Int32"],["float","Float"]],[1,"sample",1234567890.12,"GROONGA",12345,42.195]]]]
+ % groonga -n /tmp/groonga-databases/introduction.db
+ > status
+ [[0,1322616280.40348,0.000158121],{"alloc_count":127,"starttime":1322616279,"uptime":1,"version":"1.2.8-9-gbf05b82","n_queries":0,"cache_hit_rate":0.0,"command_version":1,"default_command_version":1,"max_command_version":2}]
\ No newline at end of file
Modified: doc/source/example/tutorial/introduction-2.log (+2 -7)
===================================================================
--- doc/source/example/tutorial/introduction-2.log 2011-11-29 08:10:37 +0000 (9d52ea7)
+++ doc/source/example/tutorial/introduction-2.log 2011-11-30 01:36:51 +0000 (5f95014)
@@ -1,10 +1,5 @@
Execution example::
- > column_create --table Site --name link --type Site
- [[0,1317212792.88872,0.060705006],true]
- > load --table Site
- > [{"_key":"http://example.org/","link":"http://example.net/"}]
- [[0,1317212793.14984,0.200481934],1]
- > select --table Site --output_columns _key,title,link._key,link.title --query title:@this
- [[0,1317212793.55084,0.000485897],[[[1],[["_key","ShortText"],["title","ShortText"],["link._key","ShortText"],["link.title","ShortText"]],["http://example.org/","This is test record 1!","http://example.net/","test record 2."]]]]
+ > table_create --name Site --flags TABLE_HASH_KEY --key_type ShortText
+ [[0,1322616280.60791,0.01234375],true]
\ No newline at end of file
Modified: doc/source/example/tutorial/introduction-3.log (+2 -7)
===================================================================
--- doc/source/example/tutorial/introduction-3.log 2011-11-29 08:10:37 +0000 (8088777)
+++ doc/source/example/tutorial/introduction-3.log 2011-11-30 01:36:51 +0000 (eddf758)
@@ -1,10 +1,5 @@
Execution example::
- > column_create --table Site --name links --flags COLUMN_VECTOR --type Site
- [[0,1317212793.75262,0.049658904],true]
- > load --table Site
- > [{"_key":"http://example.org/","links":["http://example.net/","http://example.org/","http://example.com/"]}]
- [[0,1317212794.00274,0.200473621],1]
- > select --table Site --output_columns _key,title,links._key,links.title --query title:@this
- [[0,1317212794.40349,0.000384272],[[[1],[["_key","ShortText"],["title","ShortText"],["links._key","ShortText"],["links.title","ShortText"]],["http://example.org/","This is test record 1!",["http://example.net/","http://example.org/","http://example.com/"],["test record 2.","This is test record 1!","test test record three."]]]]]
+ > select --table Site
+ [[0,1322616280.82196,0.000451873],[[[0],[["_id","UInt32"],["_key","ShortText"]]]]]
\ No newline at end of file
Modified: doc/source/tutorial/data.txt (+3 -3)
===================================================================
--- doc/source/tutorial/data.txt 2011-11-29 08:10:37 +0000 (42d9360)
+++ doc/source/tutorial/data.txt 2011-11-30 01:36:51 +0000 (a7cc086)
@@ -20,7 +20,7 @@ groongaでは、数値（整数・小数）や文字列や時刻や経緯度な
.. groonga-command
.. table_remove Type
-.. include:: ../example/tutorial/introduction-1.log
+.. include:: ../example/tutorial/data-1.log
.. table_create --name Type --flags TABLE_HASH_KEY --key_type ShortText
.. column_create --table Type --name number --type Int32
.. column_create --table Type --name float --type Float
@@ -43,7 +43,7 @@ table_createで作成したテーブルを、カラムの型として使うこ
他のテーブルを参照するカラムにデータを入力する場合には、参照先のテーブルの_keyカラムの値を代入する必要があります。
.. groonga-command
-.. include:: ../example/tutorial/introduction-2.log
+.. include:: ../example/tutorial/data-2.log
.. column_create --table Site --name link --type Site
.. load --table Site
.. [{"_key":"http://example.org/","link":"http://example.net/"}]
@@ -65,7 +65,7 @@ column_createコマンドでカラムを作成するとき、--flagsオプショ
.. FIXME: _idの配列ではダメなのかどうか。検証する。
.. groonga-command
-.. include:: ../example/tutorial/introduction-3.log
+.. include:: ../example/tutorial/data-3.log
.. column_create --table Site --name links --flags COLUMN_VECTOR --type Site
.. load --table Site
.. [{"_key":"http://example.org/","links":["http://example.net/","http://example.org/","http://example.com/"]}]