Navigation Menu

Skip to content

Commit

Permalink
doc logical_table_remove: update
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Aug 31, 2016
1 parent 3603108 commit 87a82f4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
23 changes: 10 additions & 13 deletions doc/locale/ja/LC_MESSAGES/reference.po
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.2.1\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2016-08-31 16:51+0900\n"
"PO-Revision-Date: 2016-08-31 18:44+0900\n"
"Last-Translator: Masafumi Yokoyama <yokoyama@clear-code.com>\n"
"Language-Team: Japanese\n"
"Language: ja\n"
Expand Down Expand Up @@ -7330,16 +7330,14 @@ msgstr ""
"ターを指定することで可能な限り削除することができます。"

msgid ""
"If you specify ``--force yes``, they are removed as much as possible. In "
"some cases, some tables and/or columns may not be removed. For example, "
"broken index column can't be removed."
"If you specify ``--force yes``, they are removed as much as possible. You "
"can also use ``--dependent yes`` with ``--force yes``."
msgstr ""
"``--force yes`` を指定すると、対象テーブルを可能な限り削除します。いくつかの"
"ケースでは削除できないテーブル・カラムがあります。たとえば、インデックスカラ"
"ムが壊れている場合はそのインデックスカラムを削除できません。"
"``--force yes`` を指定すると、対象テーブルを可能な限り削除します。 ``--force "
"yes`` と一緒に ``--dependent yes`` も指定することができます。"

msgid "Here is a sample schema to show this case:"
msgstr "以下はこのケースを示すサンプルスキーマです。"
msgid "Here is a sample schema to show how ``--force yes`` behavior:"
msgstr "以下は ``--force yes`` の挙動を示すサンプルスキーマです。"

msgid ""
"You can't remove ``Logs_20160320`` when ``Timestamps."
Expand All @@ -7357,11 +7355,10 @@ msgstr ""
"ラムを削除できます。"

msgid ""
"``Logs_20160320`` and its columns are removed but ``Timestamps."
"logs_20160320_timestamp`` isn't removed:"
"``Logs_20160320``, its columns and ``Timestamps.logs_20160320_timestamp`` "
"are removed:"
msgstr ""
"``Logs_20160320`` とそのテーブルのカラムは削除されますが ``Timestamps."
"logs_20160320_timestamp`` は削除されません。"
"``Logs_20160320`` とそのテーブルのカラムと ``Timestamps.logs_20160320_timestamp``が削除されます。"

msgid ""
"``--force yes`` parameter is a dangerous parameter. Normally, you don't need "
Expand Down
Expand Up @@ -5,4 +5,4 @@ Execution example::
object_exist Logs_20160320.timestamp
# [[0, 1337566253.89858, 0.000355720520019531], false]
object_exist Timestamps.logs_20160320_timestamp
# [[0, 1337566253.89858, 0.000355720520019531], true]
# [[0, 1337566253.89858, 0.000355720520019531], false]
Expand Up @@ -13,7 +13,7 @@ Execution example::
# [
# "Groonga::Sharding::LogicalTableRemoveCommand.remove_table",
# "/home/kou/work/c/groonga.clean/plugins/sharding/logical_table_remove.rb",
# 139
# 156
# ]
# ]
# ]
Expand Down
Expand Up @@ -13,7 +13,7 @@ Execution example::
# [
# "Groonga::Sharding::LogicalTableRemoveCommand.remove_table",
# "/home/kou/work/c/groonga.clean/plugins/sharding/logical_table_remove.rb",
# 139
# 156
# ]
# ]
# ]
Expand Down
9 changes: 4 additions & 5 deletions doc/source/reference/commands/logical_table_remove.rst
Expand Up @@ -350,10 +350,9 @@ If the target tables are broken, you can't remove them. But you can
remove them as much as possible by using ``force`` parameter.

If you specify ``--force yes``, they are removed as much as
possible. In some cases, some tables and/or columns may not be
removed. For example, broken index column can't be removed.
possible. You can also use ``--dependent yes`` with ``--force yes``.

Here is a sample schema to show this case:
Here is a sample schema to show how ``--force yes`` behavior:

.. groonga-command
.. include:: ../../example/reference/commands/logical_table_remove/remove_broken_tables_create.log
Expand Down Expand Up @@ -391,8 +390,8 @@ broken:
.. --shard_key timestamp \
.. --force yes
``Logs_20160320`` and its columns are removed but
``Timestamps.logs_20160320_timestamp`` isn't removed:
``Logs_20160320``, its columns and
``Timestamps.logs_20160320_timestamp`` are removed:

.. groonga-command
.. include:: ../../example/reference/commands/logical_table_remove/remove_broken_tables_index_column_exist.log
Expand Down

0 comments on commit 87a82f4

Please sign in to comment.