pgpool2.git / summary / log / commit / refs
commit f7f04571e508185a8af16cd69233bbe1b67a2505
Author: Yugo Nagata <nagata@sraoss.co.jp>
Date: Tue Apr 07 08:02:45 2015 +0000
Update table and flowchart of where a query should be sent
doc/pgpool-en.html | 64 ++++++++++++------------------------------
doc/pgpool-ja.html | 52 +++++++++++++++-------------------
doc/pgpool.css | 3 ++
doc/where_to_send_queries.odg | Bin 21092 -> 22505 bytes
doc/where_to_send_queries.pdf | Bin 37006 -> 49506 bytes
5 files changed, 44 insertions(+), 75 deletions(-)
diff --git a/doc/pgpool-en.html b/doc/pgpool-en.html
index 6a3a9678b..d2c4bd253 100644
--- a/doc/pgpool-en.html
+++ b/doc/pgpool-en.html
@@ -1672,8 +1672,8 @@ black_function_list = 'nextval,setval,lastval,currval'
<dt><a name="REPLICATE_SELECT"></a>replicate_select</dt>
<dd>
- <p>When set to true, pgpool-II replicates SELECTs in replication mode. If false,
- pgpool-II only sends them to the Master DB. Default is false.
+ <p>When set to true, pgpool-II replicates SELECTs replication mode. If false,
+ pgpool-II sends SELECTs without writing function to the Master DB only. Default is false.
</p>
<p>
If a SELECT query is inside an explicit transaction block, replicate_select and
@@ -1682,53 +1682,25 @@ black_function_list = 'nextval,setval,lastval,currval'
</p>
<table border>
-
- <tr>
- <th class="nodec">SELECT is inside a transaction block</th>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
+ <tr class="center">
+ <th class="nodec">replicate_select is true</th>
+ <td>Y</td><td colspan="4">N</td>
</tr>
-
- <tr>
- <th class="nodec">replicate_select is true</th>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
+ <tr class="center">
+ <th class="nodec">load_balance_mode is true</th>
+ <td>any</td><td colspan="3">Y</td><td>N</td>
+ <tr class="center">
+ <th class="nodec">SELECT is inside a transaction block</th>
+ <td>any</td><td colspan="2">Y</td><td>N</td><td>any</td>
</tr>
-
- <tr>
- <th class="nodec">load_balance_mode is true</th>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
+ <tr class="center">
+ <th class="nodec">transaction isolation level is SERIALIZABLE and<br>
+ the transaction has issued a write query</th>
+ <td>any</td><td>Y</td><td>N</td><td>any</td><td>any</td>
</tr>
-
- <tr>
- <th class="nodec">results(R:replication, M: send only to master, L: load balance)</th>
- <td>R</td>
- <td>R</td>
- <td>M</td>
- <td>M</td>
- <td>R</td>
- <td>R</td>
- <td>M</td>
- <td>L</td>
+ <tr class="footer center">
+ <th class="nodec">results(R:replication, M: send only to master, L: load balance)</th>
+ <td>R</td><td>M</td><td>L</td><td>L</td><td>M</td>
</tr>
</table>
</dd>
diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index 07febcaa9..7b95ee630 100644
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -1730,7 +1730,7 @@ black_function_list = 'nextval,setval,lastval,currval'
<p>
true を設定すると、レプリケーションモードでは SELECT 文をレプリケーションします。
これは pgpool-II 1.0 までの挙動と同じになります。
- false を設定すると SELECT 文をマスタのみに送信します。デフォルト値は false です。
+ false を設定すると更新を伴わない SELECT 文をマスタのみに送信します。デフォルト値は false です。
</p>
<p>
replicate_select、<a href="#LOAD_BALANCE_MODE">load_balance_mode</a>、
@@ -1738,34 +1738,28 @@ black_function_list = 'nextval,setval,lastval,currval'
レプリケーションモードの動作が変化します。詳細を表に示します。
</p>
- <table border>
- <tr>
- <th class="nodec">SELECTが明示的なトランザクションブロックの内側にある</th>
- <td>Y</td><td>Y</td><td>Y</td><td>N</td><td>N</td><td>N</td><td>Y</td><td>N</td>
- </tr>
-
- <tr>
- <th class="nodec">replicate_selectがtrue</th>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- </tr>
-
- <tr>
- <th class="nodec">load_balance_modeがtrue</th>
- <td>Y</td><td>N</td><td>N</td><td>N</td><td>Y</td><td>N</td><td>Y</td><td>Y</td>
- </tr>
-
- <tr>
- <th class="nodec">結果(R:レプリケーション, M: マスタのみに送信, L: ロードバランスされる)</th>
- <td>R</td><td>R</td><td>M</td><td>M</td><td>R</td><td>R</td><td>M</td><td>L</td>
- </tr>
- </table>
+ <table border>
+ <tr class="center">
+ <th class="nodec">replicate_selectがtrue</th>
+ <td>Y</td><td colspan="4">N</td>
+ </tr>
+ <tr class="center">
+ <th class="nodec">load_balance_modeがtrue</th>
+ <td>any</td><td colspan="3">Y</td><td>N</td>
+ <tr class="center">
+ <th class="nodec">SELECTが明示的なトランザクションブロックの内側にある</th>
+ <td>any</td><td colspan="2">Y</td><td>N</td><td>any</td>
+ </tr>
+ <tr class="center">
+ <th class="nodec">「トランザクション分離レベルがSERIALIZABLE」または<br>
+ 「トランザクション内で更新を伴うクエリが実行されている」</th>
+ <td>any</td><td>Y</td><td>N</td><td>any</td><td>any</td>
+ </tr>
+ <tr class="footer center">
+ <th class="nodec">結果(R:レプリケーション, M: マスタのみに送信, L: ロードバランスされる)</th>
+ <td>R</td><td>M</td><td>L</td><td>L</td><td>M</td>
+ </tr>
+ </table>
</dd>
<dt><a name="INSERT_LOCK"></a>insert_lock</dt>
diff --git a/doc/pgpool.css b/doc/pgpool.css
index c94662bbf..afafbb4d0 100644
--- a/doc/pgpool.css
+++ b/doc/pgpool.css
@@ -182,6 +182,9 @@ tr.header th {
tr.center td {
text-align: center;
}
+tr.footer {
+ border-top: double;
+}
dd {
margin-left: 0px;
diff --git a/doc/where_to_send_queries.odg b/doc/where_to_send_queries.odg
index ad6aa601f..6f33571b4 100644
Binary files a/doc/where_to_send_queries.odg and b/doc/where_to_send_queries.odg differ
diff --git a/doc/where_to_send_queries.pdf b/doc/where_to_send_queries.pdf
index cfb02737c..7d962054c 100644
Binary files a/doc/where_to_send_queries.pdf and b/doc/where_to_send_queries.pdf differ
[parent: 6e96ad77916e]