Kouhei Sutou
null+****@clear*****
Thu Mar 17 17:01:32 JST 2016
Kouhei Sutou 2016-03-17 17:01:32 +0900 (Thu, 17 Mar 2016) New Revision: 63fe53177fd3a6912af854cbea08edfd0a2fd1a7 https://github.com/groonga/groonga/commit/63fe53177fd3a6912af854cbea08edfd0a2fd1a7 Message: doc: fix path Added files: doc/source/example/reference/alias/existing_name.log doc/source/example/reference/alias/register.log doc/source/example/reference/alias/schema.log doc/source/example/reference/alias/select_age.log doc/source/example/reference/alias/select_age_after_rename.log doc/source/example/reference/alias/select_age_by_alias.log doc/source/example/reference/alias/table_and_column.log Modified files: doc/files.am doc/source/reference/alias.rst Modified: doc/files.am (+14 -0) =================================================================== --- doc/files.am 2016-03-17 16:59:59 +0900 (da2081d) +++ doc/files.am 2016-03-17 17:01:32 +0900 (a69c9fe) @@ -23,6 +23,13 @@ absolute_source_files = \ $(top_srcdir)/doc/source/contribution/report.rst \ $(top_srcdir)/doc/source/development.rst \ $(top_srcdir)/doc/source/development/travis-ci.rst \ + $(top_srcdir)/doc/source/example/reference/alias/existing_name.log \ + $(top_srcdir)/doc/source/example/reference/alias/register.log \ + $(top_srcdir)/doc/source/example/reference/alias/schema.log \ + $(top_srcdir)/doc/source/example/reference/alias/select_age.log \ + $(top_srcdir)/doc/source/example/reference/alias/select_age_after_rename.log \ + $(top_srcdir)/doc/source/example/reference/alias/select_age_by_alias.log \ + $(top_srcdir)/doc/source/example/reference/alias/table_and_column.log \ $(top_srcdir)/doc/source/example/reference/columns/vector/usage_adjuster_weight.log \ $(top_srcdir)/doc/source/example/reference/columns/vector/usage_create_normal.log \ $(top_srcdir)/doc/source/example/reference/columns/vector/usage_create_weight.log \ @@ -832,6 +839,13 @@ source_files_relative_from_doc_dir = \ source/contribution/report.rst \ source/development.rst \ source/development/travis-ci.rst \ + source/example/reference/alias/existing_name.log \ + source/example/reference/alias/register.log \ + source/example/reference/alias/schema.log \ + source/example/reference/alias/select_age.log \ + source/example/reference/alias/select_age_after_rename.log \ + source/example/reference/alias/select_age_by_alias.log \ + source/example/reference/alias/table_and_column.log \ source/example/reference/columns/vector/usage_adjuster_weight.log \ source/example/reference/columns/vector/usage_create_normal.log \ source/example/reference/columns/vector/usage_create_weight.log \ Added: doc/source/example/reference/alias/existing_name.log (+38 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/existing_name.log 2016-03-17 17:01:32 +0900 (ba6e867) @@ -0,0 +1,38 @@ +Execution example:: + + column_rename Users years years_old + # [[0, 1337566253.89858, 0.000355720520019531], true] + select Users --filter 'age < 20' + # [ + # [ + # 0, + # 1337566253.89858, + # 0.000355720520019531 + # ], + # [ + # [ + # [ + # 1 + # ], + # [ + # [ + # "_id", + # "UInt32" + # ], + # [ + # "_key", + # "ShortText" + # ], + # [ + # "years_old", + # "UInt8" + # ] + # ], + # [ + # 1, + # "alice", + # 14 + # ] + # ] + # ] + # ] Added: doc/source/example/reference/alias/register.log (+4 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/register.log 2016-03-17 17:01:32 +0900 (844ca01) @@ -0,0 +1,4 @@ +Execution example:: + + config_set alias.column Aliases.real_name + # [[0, 1337566253.89858, 0.000355720520019531], true] Added: doc/source/example/reference/alias/schema.log (+12 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/schema.log 2016-03-17 17:01:32 +0900 (2833867) @@ -0,0 +1,12 @@ +Execution example:: + + table_create Users TABLE_HASH_KEY ShortText + # [[0, 1337566253.89858, 0.000355720520019531], true] + column_create Users age COLUMN_SCALAR UInt8 + # [[0, 1337566253.89858, 0.000355720520019531], true] + load --table Users + [ + {"_key": "alice", "age": 14}, + {"_key": "bob", "age": 29} + ] + # [[0, 1337566253.89858, 0.000355720520019531], 2] Added: doc/source/example/reference/alias/select_age.log (+36 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/select_age.log 2016-03-17 17:01:32 +0900 (d1b6819) @@ -0,0 +1,36 @@ +Execution example:: + + select Users --filter 'age < 20' + # [ + # [ + # 0, + # 1337566253.89858, + # 0.000355720520019531 + # ], + # [ + # [ + # [ + # 1 + # ], + # [ + # [ + # "_id", + # "UInt32" + # ], + # [ + # "_key", + # "ShortText" + # ], + # [ + # "age", + # "UInt8" + # ] + # ], + # [ + # 1, + # "alice", + # 14 + # ] + # ] + # ] + # ] Added: doc/source/example/reference/alias/select_age_after_rename.log (+21 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/select_age_after_rename.log 2016-03-17 17:01:32 +0900 (e797f10) @@ -0,0 +1,21 @@ +Execution example:: + + column_rename Users age years + # [[0, 1337566253.89858, 0.000355720520019531], true] + select Users --filter 'age < 20' + # [ + # [ + # -63, + # 1337566253.89858, + # 0.000355720520019531, + # "Syntax error: <age| |< 20>", + # [ + # [ + # "yy_syntax_error", + # "grn_ecmascript.lemon", + # 34 + # ] + # ] + # ], + # [] + # ] Added: doc/source/example/reference/alias/select_age_by_alias.log (+41 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/select_age_by_alias.log 2016-03-17 17:01:32 +0900 (f236f77) @@ -0,0 +1,41 @@ +Execution example:: + + load --table Aliases + [ + {"_key": "Users.age", "real_name": "Users.years"} + ] + # [[0, 1337566253.89858, 0.000355720520019531], 1] + select Users --filter 'age < 20' + # [ + # [ + # 0, + # 1337566253.89858, + # 0.000355720520019531 + # ], + # [ + # [ + # [ + # 1 + # ], + # [ + # [ + # "_id", + # "UInt32" + # ], + # [ + # "_key", + # "ShortText" + # ], + # [ + # "years", + # "UInt8" + # ] + # ], + # [ + # 1, + # "alice", + # 14 + # ] + # ] + # ] + # ] Added: doc/source/example/reference/alias/table_and_column.log (+6 -0) 100644 =================================================================== --- /dev/null +++ doc/source/example/reference/alias/table_and_column.log 2016-03-17 17:01:32 +0900 (37eb973) @@ -0,0 +1,6 @@ +Execution example:: + + table_create Aliases TABLE_HASH_KEY ShortText + # [[0, 1337566253.89858, 0.000355720520019531], true] + column_create Aliases real_name COLUMN_SCALAR ShortText + # [[0, 1337566253.89858, 0.000355720520019531], true] Modified: doc/source/reference/alias.rst (+8 -8) =================================================================== --- doc/source/reference/alias.rst 2016-03-17 16:59:59 +0900 (9254380) +++ doc/source/reference/alias.rst 2016-03-17 17:01:32 +0900 (0e7cf37) @@ -55,7 +55,7 @@ they are meaningless. Because the max table/column name size is Here are example definitions of table and column for managing aliases: .. groonga-command -.. include:: ../../example/reference/alias/table_and_column.log +.. include:: ../example/reference/alias/table_and_column.log .. table_create Aliases TABLE_HASH_KEY ShortText .. column_create Aliases real_name COLUMN_SCALAR ShortText @@ -65,13 +65,13 @@ register the table and column by the following :doc:`/reference/commands/config_set`: .. groonga-command -.. include:: ../../example/reference/alias/register.log +.. include:: ../example/reference/alias/register.log .. config_set alias.column Aliases.real_name Here are schema and data to show how to use alias: .. groonga-command -.. include:: ../../example/reference/alias/schema.log +.. include:: ../example/reference/alias/schema.log .. table_create Users TABLE_HASH_KEY ShortText .. column_create Users age COLUMN_SCALAR UInt8 .. @@ -84,14 +84,14 @@ Here are schema and data to show how to use alias: You can use ``Users.age`` in :doc:`/reference/commands/select`: .. groonga-command -.. include:: ../../example/reference/alias/select_age.log +.. include:: ../example/reference/alias/select_age.log .. select Users --filter 'age < 20' You can't use ``Users.age`` when you rename ``Users.age`` to ``Users.years`` by :doc:`/reference/commands/column_rename`: .. groonga-command -.. include:: ../../example/reference/alias/select_age_after_rename.log +.. include:: ../example/reference/alias/select_age_after_rename.log .. column_rename Users age years .. select Users --filter 'age < 20' @@ -99,7 +99,7 @@ But you can use ``Users.age`` by registering ``Users.age`` to ``Users.years`` mapping to ``Aliases``. .. groonga-command -.. include:: ../../example/reference/alias/select_age_by_alias.log +.. include:: ../example/reference/alias/select_age_by_alias.log .. load --table Aliases .. [ .. {"_key": "Users.age", "real_name": "Users.years"} @@ -123,7 +123,7 @@ For example, alias isn't resolved in the following example because ``Users.years`` exists: .. groonga-command -.. include:: ../../example/reference/alias/existing_name.log +.. include:: ../example/reference/alias/existing_name.log .. load --table Aliases .. [ .. {"_key": "Users.years", "real_name": "Users.years_old"} @@ -150,7 +150,7 @@ records: Here is an example to ``Users.age`` is resolved recursively: .. groonga-command -.. include:: ../../example/reference/alias/existing_name.log +.. include:: ../example/reference/alias/existing_name.log .. column_rename Users years years_old .. select Users --filter 'age < 20' -------------- next part -------------- HTML����������������������������...ダウンロード
