Change config type of relcache_query_target from string to enum.

This parameter is implemented as enum, so change samples and docs
accordingly.

diff --git a/doc.ja/src/sgml/misc-config.sgml b/doc.ja/src/sgml/misc-config.sgml
index 9329167ed1260623c13add13d8c608f25f2c4a35..8e78bd591bc02fcef66b28aa664e0cce6025f130 100644 (file)
--- a/doc.ja/src/sgml/misc-config.sgml
+++ b/doc.ja/src/sgml/misc-config.sgml
@@ -154,7 +154,7 @@ onにするとクエリキャッシュを利用して子プロセス間でリレ
     </varlistentry>
 
     <varlistentry id="guc-relcache-query-target" xreflabel="relcache_query_target">
-      <term><varname>relcache_query_target</varname> (<type>string</type>)
+      <term><varname>relcache_query_target</varname> (<type>enum</type>)
         <indexterm>
           <primary><varname>relache_query_target</varname>設定パラメータ</primary>
         </indexterm>
@@ -162,13 +162,13 @@ onにするとクエリキャッシュを利用して子プロセス間でリレ
       <listitem>
         <para>
          リレーションキャッシュを作成するためのクエリを送る先のノードを指定します。
-         <literal>'master'</literal>にすると、クエリはマスタ（プライマリ）に送られます。
+         <literal>master</literal>にすると、クエリはマスタ（プライマリ）に送られます。
          これがデフォルトで、最新のデータを入手できるため、ほとんどのユーザに推奨する設定です。
-         もしマスタ（プライマリ）の負荷を下げたい場合は、このパラメータを<literal>'load_balance_node'</literal>に設定できます。
+         もしマスタ（プライマリ）の負荷を下げたい場合は、このパラメータを<literal>load_balance_node</literal>に設定できます。
          これにより、クエリは負荷分散ノードに送られます。
          これは特に、大陸Aに<productname>Pgpool-II</productname>とプライマリサーバがあり、一方大陸Bに<productname>Pgpool-II</productname>とスタンバイサーバがあるような構成で有効です。
          Bのユーザは地理的にスタンバイサーバが近いため、スタンバイからデータを読みたいと思うでしょう。
-         その場合は、backend_weight0 (これはプライマリの設定です)を0に、backend_weight1(これはスタンバイの設定です)を1にし、relache_query_targetを<literal>'load_balance_node'</literal>にします。
+         その場合は、backend_weight0 (これはプライマリの設定です)を0に、backend_weight1(これはスタンバイの設定です)を1にし、relache_query_targetを<literal>load_balance_node</literal>にします。
        </para>
        <para>
          しかし、スタンバイにクエリを送る場合、レプリケーションの遅延により、最近作られたテーブルや行はスタンバイサーバにはまだないかもしれないことに注意してください。

diff --git a/doc/src/sgml/misc-config.sgml b/doc/src/sgml/misc-config.sgml
index a8c827f85526e9c846b75e6f76f9cc87317c2f08..fc267bb81fed2596c5f46926ecc2f7ed071bde78 100644 (file)
--- a/doc/src/sgml/misc-config.sgml
+++ b/doc/src/sgml/misc-config.sgml
@@ -101,7 +101,7 @@
     </varlistentry>
 
     <varlistentry id="guc-relcache-query-target" xreflabel="relcache_query_target">
-      <term><varname>relcache_query_target</varname> (<type>string</type>)
+      <term><varname>relcache_query_target</varname> (<type>enum</type>)
         <indexterm>
           <primary><varname>relache_query_target</varname> configuration parameter</primary>
         </indexterm>
@@ -109,12 +109,12 @@
       <listitem>
         <para>
          The target node to send queries to create relation cache
-          entries. If set to <literal>'master'</literal>, queries will
+          entries. If set to <literal>master</literal>, queries will
           be sent to master (primary) node. This is the default and
           recommended to most users because the query could get the
           latest information.  If you want to lower the load of master
           (primary) node, you can set the parameter to
-          <literal>'load_balance_node'</literal>, which will send
+          <literal>load_balance_node</literal>, which will send
           queries to the load balance node. This is especially useful
           for such a system
           where <productname>Pgpool-II</productname>/primary server is
@@ -125,7 +125,7 @@
           case you can set backend_weight0 (this represents primary)
           to 0, backend_weight1 to 1 (this represents standby) and set
           relache_query_target
-          to <literal>'load_balance_node'</literal>.
+          to <literal>load_balance_node</literal>.
        </para>
        <para>
          Note, however, if you send query to the standby node,

diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index 41dfa68d5899f296ffeec092c850963b2b0d990c..b6176b7bd028f5fa55626a14b29dd41513062d1b 100644 (file)
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -762,8 +762,8 @@ enable_shared_relcache = off
                                    # Default is off.
                                    # (change requires restart)
 
-relcache_query_target = 'master'   # Target node to send relcache queries. Default is master (primary) node.
-                                  # If 'load_balance_node' is specified, queries will be sent to load balance node.
+relcache_query_target = master    # Target node to send relcache queries. Default is master (primary) node.
+                                  # If load_balance_node is specified, queries will be sent to load balance node.
 #------------------------------------------------------------------------------
 # IN MEMORY QUERY MEMORY CACHE
 #------------------------------------------------------------------------------

diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
index ff1cc21faa05977706623f9ac5745381598b5eab..ecd422602e517157f5b87fe2dbb033c1d3f142c0 100644 (file)
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -739,8 +739,8 @@ enable_shared_relcache = off
                                    # Default is off.
                                    # (change requires restart)
 
-relcache_query_target = 'master'   # Target node to send relcache queries. Default is master (primary) node.
-                                  # If 'load_balance_node' is specified, queries will be sent to load balance node.
+relcache_query_target = master    # Target node to send relcache queries. Default is master (primary) node.
+                                  # If load_balance_node is specified, queries will be sent to load balance node.
 #------------------------------------------------------------------------------
 # IN MEMORY QUERY MEMORY CACHE
 #------------------------------------------------------------------------------

diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
index 8f00e8ffca64466e58d831363a6096447e5fb075..6e8860ca2380a7721e1d8ffe17bf5ffe491434a7 100644 (file)
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -757,8 +757,8 @@ enable_shared_relcache = off
                                    # Default is off.
                                    # (change requires restart)
 
-relcache_query_target = 'master'   # Target node to send relcache queries. Default is master (primary) node.
-                                  # If 'load_balance_node' is specified, queries will be sent to load balance node.
+relcache_query_target = master    # Target node to send relcache queries. Default is master (primary) node.
+                                  # If load_balance_node is specified, queries will be sent to load balance node.
 #------------------------------------------------------------------------------
 # IN MEMORY QUERY MEMORY CACHE
 #------------------------------------------------------------------------------

diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index 6a77b9f3fcd8f12bf3446e8339c7c86a2bd88032..9f9881afb19e4707404c85245d339cd1f468c9ba 100644 (file)
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -756,8 +756,8 @@ enable_shared_relcache = off
                                    # Default is off.
                                    # (change requires restart)
 
-relcache_query_target = 'master'   # Target node to send relcache queries. Default is master (primary) node.
-                                  # If 'load_balance_node' is specified, queries will be sent to load balance node.
+relcache_query_target = master    # Target node to send relcache queries. Default is master (primary) node.
+                                  # If load_balance_node is specified, queries will be sent to load balance node.
 #------------------------------------------------------------------------------
 # IN MEMORY QUERY MEMORY CACHE
 #------------------------------------------------------------------------------

diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index 040ded0d5bc350deb3ff3e24b885f20da38db6f1..0f3e45b3cc715e99d651be6434b759418f6f8521 100644 (file)
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -759,8 +759,8 @@ enable_shared_relcache = off
                                    # Default is off.
                                    # (change requires restart)
 
-relcache_query_target = 'master'   # Target node to send relcache queries. Default is master (primary) node.
-                                  # If 'load_balance_node' is specified, queries will be sent to load balance node.
+relcache_query_target = master    # Target node to send relcache queries. Default is master (primary) node.
+                                  # If load_balance_node is specified, queries will be sent to load balance node.
 #------------------------------------------------------------------------------
 # IN MEMORY QUERY MEMORY CACHE
 #------------------------------------------------------------------------------