diff --git a/doc.ja/src/sgml/advanced.sgml b/doc.ja/src/sgml/advanced.sgml index 728cb0a3..e240ae31 100644 --- a/doc.ja/src/sgml/advanced.sgml +++ b/doc.ja/src/sgml/advanced.sgml @@ -658,7 +658,7 @@ @@ -851,7 +851,7 @@ watchdogの構造 diff --git a/doc.ja/src/sgml/ref/pcp_proc_info.sgml b/doc.ja/src/sgml/ref/pcp_proc_info.sgml index 4e41d0bf..c37b3dd0 100644 --- a/doc.ja/src/sgml/ref/pcp_proc_info.sgml +++ b/doc.ja/src/sgml/ref/pcp_proc_info.sgml @@ -151,7 +151,7 @@ test kawamoto 2021-09-28 04:16:00 0 3 0 2021-09-28 04:16:03 2021-09-28 04:16:03 14. pgpool child process id 15. PostgreSQL backend id 16. process status - 17. 1 if backend is load balance node and frontend connected, 0 othewise + 17. 1 if backend is load balance node and frontend connected, 0 otherwise --> 1. 接続先のデータベース名 2. 接続先のユーザ名 diff --git a/doc.ja/src/sgml/ref/show_pool_nodes.sgml b/doc.ja/src/sgml/ref/show_pool_nodes.sgml index 9ccecc44..b184daa8 100644 --- a/doc.ja/src/sgml/ref/show_pool_nodes.sgml +++ b/doc.ja/src/sgml/ref/show_pool_nodes.sgml @@ -42,7 +42,7 @@ hostname, the port, the status, the weight (only meaningful if you use the load balancing mode), the role, the SELECT query counts issued to each backend, whether each node is the load - bakance node or not, the replication delay (only if in streaming + balance node or not, the replication delay (only if in streaming replication mode) and last status change time. The possible values in the status column are explained in the reference. If the hostname is diff --git a/doc.ja/src/sgml/release-3.3.sgml b/doc.ja/src/sgml/release-3.3.sgml index 59c51e1f..9606c837 100644 --- a/doc.ja/src/sgml/release-3.3.sgml +++ b/doc.ja/src/sgml/release-3.3.sgml @@ -185,7 +185,7 @@ diff --git a/doc.ja/src/sgml/release-3.4.sgml b/doc.ja/src/sgml/release-3.4.sgml index 5fa7c835..d8a9a613 100644 --- a/doc.ja/src/sgml/release-3.4.sgml +++ b/doc.ja/src/sgml/release-3.4.sgml @@ -349,7 +349,7 @@ @@ -929,7 +929,7 @@ 明示的なトランザクションでは、SELECTの結果は一時バッファにキャッシュされます。 テーブルを変更する書込みSQLが送信されると、一時的なバッファをリセットしなければなりません。 @@ -1403,7 +1403,7 @@ diff --git a/doc.ja/src/sgml/release-3.5.sgml b/doc.ja/src/sgml/release-3.5.sgml index c07c8dc7..2db45096 100644 --- a/doc.ja/src/sgml/release-3.5.sgml +++ b/doc.ja/src/sgml/release-3.5.sgml @@ -448,7 +448,7 @@ --> 起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、 PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng) @@ -795,7 +795,7 @@ --> クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(bug 525) (Tatsuo Ishii) @@ -962,7 +962,7 @@ @@ -1663,7 +1663,7 @@ 明示的なトランザクションでは、SELECTの結果は一時バッファにキャッシュされます。 テーブルを変更する書込みSQLが送信されると、一時的なバッファをリセットしなければなりません。 @@ -2276,7 +2276,7 @@ @@ -2473,7 +2473,7 @@ @@ -2947,7 +2947,7 @@ Pgpool-IIが "Row description" メッセージを受信した際に、クエリ処理中のフラグをリセットするように修正しました。"no data" メッセージと同じ扱いにする必要がありました。 - 詳細は[pgpo ol-general: 5555]を参照してください。 + 詳細は[pgpool-general: 5555]を参照してください。 @@ -3158,7 +3158,7 @@ 2017-04-06 [7859f06] --> - リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsu Ishii) + リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsuo Ishii) diff --git a/doc.ja/src/sgml/release-3.6.sgml b/doc.ja/src/sgml/release-3.6.sgml index 19d7054a..f0c9e956 100644 --- a/doc.ja/src/sgml/release-3.6.sgml +++ b/doc.ja/src/sgml/release-3.6.sgml @@ -20,7 +20,7 @@ サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。 - これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。 + これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。 PostgreSQLのCVE-2021-23214と似た脆弱性です。 @@ -1116,7 +1116,7 @@ --> 起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、 PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng) @@ -1341,7 +1341,7 @@ --> Doc: クォーラムが存在しない場合、VIPは起動されないことをドキュメントに追加しました。(Tatsuo Ishii) @@ -1575,7 +1575,7 @@ --> クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(bug 525) (Tatsuo Ishii) @@ -1796,7 +1796,7 @@ @@ -2634,7 +2634,7 @@ 明示的なトランザクションでは、SELECTの結果は一時バッファにキャッシュされます。 テーブルを変更する書込みSQLが送信されると、一時的なバッファをリセットしなければなりません。 @@ -3459,7 +3459,7 @@ @@ -3715,7 +3715,7 @@ @@ -4456,7 +4456,7 @@ 2017-04-14 [50fb9a4] --> - pool_config_vatiable.cから「定義されたが未使用の関数」という警告を削除しました。(Muhammad Usama) + pool_config_variable.cから「定義されたが未使用の関数」という警告を削除しました。(Muhammad Usama) @@ -4568,7 +4568,7 @@ 2017-04-06 [d87f93d] --> - リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsu Ishii) + リグレッションの失敗を防ぐために、サポートされていないJavaメソッドを新しいJDBCドライバでコメントアウトしました。(Tatsuo Ishii) @@ -5499,7 +5499,7 @@ --> 他のノードが利用できない場合、Pgpool-II が IPアドレスをエスカレートしない不具合を修正しました。(bug 215) (Muhammad Usama) @@ -6546,20 +6546,20 @@ ヘルスチェックで発生し得るハングアップを修正しました。(bug 204) (Yugo Nagata) connect(2) が成功し、 その後バックエンドからデータが送信されない場合、ヘルスチェックがハングしていました。 @@ -6680,17 +6680,17 @@ 日本語と中国語ドキュメントのraw モードに関する内容の誤りを修正しました。(Yugo Nagata, Bo Peng) raw モードでも、コネクションプーリングが有効です。 @@ -6868,7 +6868,7 @@ これは拡張プロトコル問い合わせを実行しそれが失敗したときに発生し得ました。 diff --git a/doc.ja/src/sgml/release-3.7.sgml b/doc.ja/src/sgml/release-3.7.sgml index 30c500f4..47cc2e0a 100644 --- a/doc.ja/src/sgml/release-3.7.sgml +++ b/doc.ja/src/sgml/release-3.7.sgml @@ -667,7 +667,7 @@ サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。 - これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。 + これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。 PostgreSQLのCVE-2021-23214と似た脆弱性です。 @@ -1942,7 +1942,7 @@ --> 起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、 PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng) @@ -2265,7 +2265,7 @@ --> Doc: クォーラムが存在しない場合、VIPは起動されないことをドキュメントに追加しました。(Tatsuo Ishii) @@ -2549,7 +2549,7 @@ --> クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(bug 525) (Tatsuo Ishii) @@ -2782,7 +2782,7 @@ @@ -3658,7 +3658,7 @@ 明示的なトランザクションでは、SELECTの結果は一時バッファにキャッシュされます。 テーブルを変更する書込みSQLが送信されると、一時的なバッファをリセットしなければなりません。 @@ -4791,7 +4791,7 @@ @@ -5264,7 +5264,7 @@ Supporting per node health check parameters. (Tatsuo Ishii, Muhammad Usama) --> - PostgreSQLノードごとにヘルスチェックパラメータを設定できるようになりました。(Tatsuo Ishi, Muhammad Usama) + PostgreSQLノードごとにヘルスチェックパラメータを設定できるようになりました。(Tatsuo Ishii, Muhammad Usama) 起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、 PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng) @@ -2838,7 +2838,7 @@ --> Doc: follow_master_command サンプルスクリプトの %M と %H パラメータの順序を変更しました。(Bo Peng) @@ -3120,7 +3120,7 @@ --> Doc: クォーラムが存在しない場合、VIPは起動されないことをドキュメントに追加しました。(Tatsuo Ishii) @@ -3471,7 +3471,7 @@ --> クエリキャッシュが有効な場合に発生するセグメンテーション違反を修正しました。(bug 525) (Tatsuo Ishii) @@ -3704,7 +3704,7 @@ @@ -4609,7 +4609,7 @@ 概要 @@ -5090,7 +5090,7 @@ プライマリノードだけに送るSQLのパターンをセミコロンで区切られたリストで指定できます。 SQLのパターンには正規表現を使用することができます。 @@ -5328,7 +5328,7 @@ - 大半のDBUG1のメッセージをDEBUG5に変更しました。(Tatsuo Ishii) + 大半のDEBUG1のメッセージをDEBUG5に変更しました。(Tatsuo Ishii) 必要プロセスメモリを修正しました。以前の式はRSSを基にしていましたが、RSSはライブラリに使用されるメモリなどの共有メモリも含むため、PSSを使用するべきです。 @@ -2040,7 +2040,7 @@ サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。 - これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。 + これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。 PostgreSQLのCVE-2021-23214と似た脆弱性です。 @@ -3769,7 +3769,7 @@ --> 起動時のbind()エラーを回避するために、ソケットファイルが存在するかどうかを確認し、 PIDファイルが存在しない場合、それらのソケットファイルを削除するように修正しました。(Bo Peng) @@ -3874,7 +3874,7 @@ --> Doc: follow_master_command サンプルスクリプトの%Mと%Hパラメータの順序を変更しました。(Bo Peng) @@ -4133,7 +4133,7 @@ 2019-08-29 [69419ac4] --> - 多数決ルールを設定するパラメータを追加しました。 (Muhammd Usama, Tatsuo Ishii) + 多数決ルールを設定するパラメータを追加しました。 (Muhammad Usama, Tatsuo Ishii) これは、偶数(すなわち、2, 4, 6...) watchdogクラスタにおけるクォーラムの存在および多数決の決定における振る舞いを変更します。 @@ -4169,7 +4169,7 @@ - 大規模なINSERTとUPDATE文のパフォーマンスの強化。(Muhammd Usama) + 大規模なINSERTとUPDATE文のパフォーマンスの強化。(Muhammad Usama) PostgreSQL12のパーサの主な改善点は以下のとおりです。 @@ -4565,7 +4565,7 @@ we set = transaction, when a write query is issued inside an explicit truncation, subsequent queries should be - sent to primary only until the end of this transactionin in + sent to primary only until the end of this transaction in order to avoid the replication delay. However, the SELECTs having write functions specified in or not specified @@ -4849,9 +4849,9 @@ - プライマリバックエンドノードがqurantine状態になるのであれば、マスタwatchdogノードを辞退します。(Muhammd Usama) + プライマリバックエンドノードがquarantine状態になるのであれば、マスタwatchdogノードを辞退します。(Muhammad Usama) - 多数決ルールの計算方法を設定するパラメータを追加しました。(Muhammd Usama, Tatsuo Ishii) + 多数決ルールの計算方法を設定するパラメータを追加しました。(Muhammad Usama, Tatsuo Ishii) Pgpool-IIはwatchdogクラスタが偶数のノードで構成されている場合、ちょうど50%の賛成を得られたときにクォーラムの存在とフェイルオーバの合意を決定します。 @@ -5008,7 +5008,7 @@ white/black_function_listでスキーマ修飾が使用出来ないことを記述しました。(tatsuo Ishii) @@ -5102,7 +5102,7 @@ Add description to pg_md5 man page how to show pool_passwd ready string. (tatsuo ishii) --> - pg_md5のマニュアルページにpool_paswd文字列の表現の仕方の説明を追加しました。(tatsuo ishii) + pg_md5のマニュアルページにpool_passwd文字列の表現の仕方の説明を追加しました。(tatsuo ishii) diff --git a/doc.ja/src/sgml/release-4.2.sgml b/doc.ja/src/sgml/release-4.2.sgml index eb50fb21..7cc31a3d 100644 --- a/doc.ja/src/sgml/release-4.2.sgml +++ b/doc.ja/src/sgml/release-4.2.sgml @@ -359,7 +359,7 @@ このポータルはPgpool-IIによって管理されないため、Describe fooメッセージは「unable to execute Describe. unable to get the bind message」エラーで失敗していました。 - これを修正するため、Describe()でダミーの書き込みクエリコンテキストを作成し、Desribeメッセージをプライマリ(ストリーミングレプリケーションモード)またはすべてのノード(レプリケーション/スナップショットアイソレーションモード)に送信するようにしました。 + これを修正するため、Describe()でダミーの書き込みクエリコンテキストを作成し、Describeメッセージをプライマリ(ストリーミングレプリケーションモード)またはすべてのノード(レプリケーション/スナップショットアイソレーションモード)に送信するようにしました。 新たなテストケース080も追加しました。 @@ -1622,7 +1622,7 @@ 必要プロセスメモリを修正しました。以前の式はRSSを基にしていましたが、RSSはライブラリに使用されるメモリなどの共有メモリも含むため、PSSを使用するべきです。 @@ -2292,7 +2292,7 @@ サーバサイドのSSLネゴシエーションの実装において、任意のSQLコマンドを実行できる中間者攻撃が可能でした。 - これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hotssl + trust認証の場合に可能でした。 + これはPgpool-IIがクライアント認証で証明書認証を使用しているか、hostssl + trust認証の場合に可能でした。 PostgreSQLのCVE-2021-23214と似た脆弱性です。 @@ -4621,7 +4621,7 @@ Author: Bo Peng PostgreSQLのlib pathをpg_configを使って取得し、regress.shのLD_LIBRARY_PATH環境変数に追加するようにしました。(Bo Peng) diff --git a/doc.ja/src/sgml/release-4.3.sgml b/doc.ja/src/sgml/release-4.3.sgml index a88cc23c..aa208236 100644 --- a/doc.ja/src/sgml/release-4.3.sgml +++ b/doc.ja/src/sgml/release-4.3.sgml @@ -387,7 +387,7 @@ このポータルはPgpool-IIによって管理されないため、Describe fooメッセージは「unable to execute Describe. unable to get the bind message」エラーで失敗していました。 - これを修正するため、Describe()でダミーの書き込みクエリコンテキストを作成し、Desribeメッセージをプライマリ(ストリーミングレプリケーションモード)またはすべてのノード(レプリケーション/スナップショットアイソレーションモード)に送信するようにしました。 + これを修正するため、Describe()でダミーの書き込みクエリコンテキストを作成し、Describeメッセージをプライマリ(ストリーミングレプリケーションモード)またはすべてのノード(レプリケーション/スナップショットアイソレーションモード)に送信するようにしました。 新たなテストケース080も追加しました。 @@ -1768,7 +1768,7 @@ 必要プロセスメモリを修正しました。以前の式はRSSを基にしていましたが、RSSはライブラリに使用されるメモリなどの共有メモリも含むため、PSSを使用するべきです。 diff --git a/doc.ja/src/sgml/release-4.4.sgml b/doc.ja/src/sgml/release-4.4.sgml index 18915791..5bdacc3a 100644 --- a/doc.ja/src/sgml/release-4.4.sgml +++ b/doc.ja/src/sgml/release-4.4.sgml @@ -388,7 +388,7 @@ このポータルはPgpool-IIによって管理されないため、Describe fooメッセージは「unable to execute Describe. unable to get the bind message」エラーで失敗していました。 - これを修正するため、Describe()でダミーの書き込みクエリコンテキストを作成し、Desribeメッセージをプライマリ(ストリーミングレプリケーションモード)またはすべてのノード(レプリケーション/スナップショットアイソレーションモード)に送信するようにしました。 + これを修正するため、Describe()でダミーの書き込みクエリコンテキストを作成し、Describeメッセージをプライマリ(ストリーミングレプリケーションモード)またはすべてのノード(レプリケーション/スナップショットアイソレーションモード)に送信するようにしました。 新たなテストケース080も追加しました。 diff --git a/doc.ja/src/sgml/runtime.sgml b/doc.ja/src/sgml/runtime.sgml index 1e4b7e05..0f40994e 100644 --- a/doc.ja/src/sgml/runtime.sgml +++ b/doc.ja/src/sgml/runtime.sgml @@ -301,7 +301,7 @@ - ストリーミングレプリケーションモードはストリーミングレプリケーションを使用するPostgreSQLサーバ(AWSのAuroa、RDSを含みます)と一緒に使うことができます。 + ストリーミングレプリケーションモードはストリーミングレプリケーションを使用するPostgreSQLサーバ(AWSのAurora、RDSを含みます)と一緒に使うことができます。 このモードでは、PostgreSQLがデータベースを同期する責任を持ちます。 このモードは広く使われており、最も推奨されるPgpool-IIの使用法です。 このモードでは負荷分散が可能です。 @@ -340,7 +340,7 @@ default_transaction_isolation = 'repeatable read' responsible for synchronizing tables. Load balancing is possible in the mode. Since logical replication does not replicate all tables, it's user's responsibility to replicate the table which - could be load balanced. Pgpool-II load balaces + could be load balanced. Pgpool-II load balances all tables. This means that if a table is not replicated, Pgpool-II may lookup outdated tables in the subscriber side. @@ -377,7 +377,7 @@ default_transaction_isolation = 'repeatable read' rawモードでは、Pgpool-IIはデータベースの同期に関しては関与しません。 @@ -444,7 +444,7 @@ default_transaction_isolation = 'repeatable read' backend servers, you need to configure backend* in pgpool.conf. For starters, at least - and paramters are required to + and parameters are required to be set up to start Pgpool-II server. --> Pgpool-IIがPostgreSQLバックエンドサーバを認識するために、pgpool.confbackend*を設定する必要があります。 diff --git a/doc/src/sgml/example-AWS.sgml b/doc/src/sgml/example-AWS.sgml index f18b90e8..497616e5 100644 --- a/doc/src/sgml/example-AWS.sgml +++ b/doc/src/sgml/example-AWS.sgml @@ -140,7 +140,7 @@ if_down_cmd = '<path to script> down $_IP_$ <path to awscli>' - <path to script>: Specify the path to the script used to assgin or remove Elastic IP address. + <path to script>: Specify the path to the script used to assign or remove Elastic IP address. @@ -250,7 +250,7 @@ arping_cmd = 'true' create two route tables associated with the public subnet and the private subnet - respectively. Please refer to this documetation + respectively. Please refer to this documentation for detailed information. @@ -322,7 +322,7 @@ arping_cmd = 'true' Mostly the Pgpool-II configurations for this example will be same as in the , except using and - to assign the virtaul IP and update route tables. + to assign the virtual IP and update route tables. Specify the virtual IP to . @@ -447,7 +447,7 @@ $ aws ec2 modify-network-interface-attribute --network-interface-id ${EC2_NETWOR from the application instance. -[user@appliaction instance]$ psql -h 20.0.0.50 -p 9999 -U postgres -c "show pool_nodes" +[user@application instance]$ psql -h 20.0.0.50 -p 9999 -U postgres -c "show pool_nodes" Stop the leader Pgpool-II. diff --git a/doc/src/sgml/example-cluster.sgml b/doc/src/sgml/example-cluster.sgml index 1700b118..946cfdcd 100644 --- a/doc/src/sgml/example-cluster.sgml +++ b/doc/src/sgml/example-cluster.sgml @@ -1283,7 +1283,7 @@ Password for user pgpool Password: 3 3 YES server1:9999 Linux server1 server1 -server1:9999 Linux server1 server1 9999 9000 4 LEADER 0 MEMBER # The Pgpool-II server started first becames "LEADER". +server1:9999 Linux server1 server1 9999 9000 4 LEADER 0 MEMBER # The Pgpool-II server started first becomes "LEADER". server2:9999 Linux server2 server2 9999 9000 7 STANDBY 0 MEMBER # running as STANDBY server3:9999 Linux server3 server3 9999 9000 7 STANDBY 0 MEMBER # running as STANDBY diff --git a/doc/src/sgml/ref/pcp_proc_info.sgml b/doc/src/sgml/ref/pcp_proc_info.sgml index a79d6eee..df61d551 100644 --- a/doc/src/sgml/ref/pcp_proc_info.sgml +++ b/doc/src/sgml/ref/pcp_proc_info.sgml @@ -114,7 +114,7 @@ test kawamoto 2021-09-28 04:16:00 0 3 0 2021-09-28 04:16:03 2021-09-28 04:16:03 14. pgpool child process id 15. PostgreSQL backend id 16. process status - 17. 1 if backend is load balance node and frontend connected, 0 othewise + 17. 1 if backend is load balance node and frontend connected, 0 otherwise diff --git a/doc/src/sgml/ref/show_pool_cache.sgml b/doc/src/sgml/ref/show_pool_cache.sgml index 8b558f9a..4f489c9b 100644 --- a/doc/src/sgml/ref/show_pool_cache.sgml +++ b/doc/src/sgml/ref/show_pool_cache.sgml @@ -129,7 +129,7 @@ free_cache_entries_size - The size in bytes of the unsed cache. As this value approaches + The size in bytes of the unused cache. As this value approaches 0, it removes the registered cache and registers a new cache, which does not cause an error, but reduces performance. Consider to increase . diff --git a/doc/src/sgml/release-3.6.sgml b/doc/src/sgml/release-3.6.sgml index 9ff8635d..1869c277 100644 --- a/doc/src/sgml/release-3.6.sgml +++ b/doc/src/sgml/release-3.6.sgml @@ -98,7 +98,7 @@ Fix the incorrect display of load balancing node in raw mode. (Bo Peng) - In raw mode, Pgpool-II sends all queies to main node. + In raw mode, Pgpool-II sends all queries to main node. This is harmless, but it may confuse users. @@ -3270,7 +3270,7 @@ - pgpool.conf is configured so that all read queries are sent to the standby. - First, issue a writing query in a transaction block - - After commiting the transaction, issue a select query. + - After committing the transaction, issue a select query. - When processing the query, send Describe (statement) message just after Parse. @@ -5052,7 +5052,7 @@ Fix Pgpool-II doesn't escalate ip in case of another node unavailability. (bug 215) (Muhammad Usama) diff --git a/doc/src/sgml/release-3.7.sgml b/doc/src/sgml/release-3.7.sgml index 6ea299de..fa26fec9 100644 --- a/doc/src/sgml/release-3.7.sgml +++ b/doc/src/sgml/release-3.7.sgml @@ -752,7 +752,7 @@ Fix the incorrect display of load balancing node in raw mode. (Bo Peng) - In raw mode, Pgpool-II sends all queies to main node. + In raw mode, Pgpool-II sends all queries to main node. This is harmless, but it may confuse users. diff --git a/doc/src/sgml/release-4.0.sgml b/doc/src/sgml/release-4.0.sgml index a0d5e7a1..4160ab65 100644 --- a/doc/src/sgml/release-4.0.sgml +++ b/doc/src/sgml/release-4.0.sgml @@ -223,11 +223,11 @@ 2023-01-31 [633bdca] --> - Fix kind mimatch error with DEALLOCATE. + Fix kind mismatch error with DEALLOCATE. (bug 780) (Tatsuo Ishii) - Kind mimatch error occurs when conditions below are all met: + Kind mismatch error occurs when conditions below are all met: @@ -652,7 +652,7 @@ To deal with idle_session_timeout detect_idle_session_timeout_error() is added to detect the error code for idle_session_timeout. If the - error is detected, Pgpool-II returns the error code to frondend as a + error is detected, Pgpool-II returns the error code to frontend as a fatal error and disconnects the session. This is a similar fix implemented for idle_in_transaction_session_timeout. 3f5986eee360f12e6a0bb77aa46f95abf5f6bc10 @@ -1092,7 +1092,7 @@ 2022-04-17 [72d31b0] --> - Enhance regression test 074.bug700_memqcache_segfault to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 074.bug700_memqcache_segfault to avoid the timeout error. (Tatsuo Ishii) @@ -1494,7 +1494,7 @@ Fix the incorrect display of load balancing node in raw mode. (Bo Peng) - In raw mode, Pgpool-II sends all queies to main node. + In raw mode, Pgpool-II sends all queries to main node. This is harmless, but it may confuse users. @@ -1520,7 +1520,7 @@ 2021-10-06 [42a77d8c] --> - Doc: fix documentaion typos. (Bo Peng) + Doc: fix documentation typos. (Bo Peng) diff --git a/doc/src/sgml/release-4.1.sgml b/doc/src/sgml/release-4.1.sgml index c3b2457d..3c085ab0 100644 --- a/doc/src/sgml/release-4.1.sgml +++ b/doc/src/sgml/release-4.1.sgml @@ -460,7 +460,7 @@ 2023-08-09 [30db44e] --> - Fix covery warning. (Tatsuo Ishii) + Fix coverity warning. (Tatsuo Ishii) Fix query cache module assigned time_t value to int32 variable. Change @@ -796,11 +796,11 @@ 2023-01-31 [633bdca] --> - Fix kind mimatch error with DEALLOCATE. + Fix kind mismatch error with DEALLOCATE. (bug 780) (Tatsuo Ishii) - Kind mimatch error occurs when conditions below are all met: + Kind mismatch error occurs when conditions below are all met: @@ -1225,7 +1225,7 @@ To deal with idle_session_timeout detect_idle_session_timeout_error() is added to detect the error code for idle_session_timeout. If the - error is detected, Pgpool-II returns the error code to frondend as a + error is detected, Pgpool-II returns the error code to frontend as a fatal error and disconnects the session. This is a similar fix implemented for idle_in_transaction_session_timeout. 3f5986eee360f12e6a0bb77aa46f95abf5f6bc10 @@ -1386,7 +1386,7 @@ 2022-05-31 [5cacb7db] --> - When CloseComplete is received, foward to frontend without buffering. (Tatsuo Ishii) + When CloseComplete is received, forward to frontend without buffering. (Tatsuo Ishii) It seems this caused occasional timeout error in 074.bug700_memqcache_segfault. @@ -1497,7 +1497,7 @@ Fix process memory requirement. Previously the formula was based on RSS. However PSS should be used because RSS includes shared memory - such as the memory used for libraries. This resuls in lot smaller + such as the memory used for libraries. This results in lot smaller memory requirement than before. @@ -1742,7 +1742,7 @@ 2022-04-17 [29734b5] --> - Enhance regression test 018.detach_primary to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 018.detach_primary to avoid the timeout error. (Tatsuo Ishii) @@ -1751,7 +1751,7 @@ 2022-04-17 [72d31b0] --> - Enhance regression test 074.bug700_memqcache_segfault to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 074.bug700_memqcache_segfault to avoid the timeout error. (Tatsuo Ishii) @@ -2229,7 +2229,7 @@ Fix the incorrect display of load balancing node in raw mode. (Bo Peng) - In raw mode, Pgpool-II sends all queies to main node. + In raw mode, Pgpool-II sends all queries to main node. This is harmless, but it may confuse users. @@ -2708,7 +2708,7 @@ Fix race condition between and . (Tatsuo Ishii) - If and are running concurrently, many problem occured. + If and are running concurrently, many problem occurred. Typical problem is, no primary node is found at the end. @@ -3948,7 +3948,7 @@ startup user is changed to postgres user. - If installing from RPMs, postrges user will be allowed to + If installing from RPMs, postgres user will be allowed to run if_up/down_cmd and arping_cmd with sudo without a password. If if_up/down_cmd or arping_cmd starts with "/", diff --git a/doc/src/sgml/release-4.2.sgml b/doc/src/sgml/release-4.2.sgml index 265e2921..b01391a4 100644 --- a/doc/src/sgml/release-4.2.sgml +++ b/doc/src/sgml/release-4.2.sgml @@ -516,7 +516,7 @@ 2023-08-09 [30db44e] --> - Fix covery warning. (Tatsuo Ishii) + Fix coverity warning. (Tatsuo Ishii) Fix query cache module assigned time_t value to int32 variable. Change @@ -913,11 +913,11 @@ 2023-01-31 [633bdca] --> - Fix kind mimatch error with DEALLOCATE. + Fix kind mismatch error with DEALLOCATE. (bug 780) (Tatsuo Ishii) - Kind mimatch error occurs when conditions below are all met: + Kind mismatch error occurs when conditions below are all met: @@ -1397,7 +1397,7 @@ To deal with idle_session_timeout detect_idle_session_timeout_error() is added to detect the error code for idle_session_timeout. If the - error is detected, Pgpool-II returns the error code to frondend as a + error is detected, Pgpool-II returns the error code to frontend as a fatal error and disconnects the session. This is a similar fix implemented for idle_in_transaction_session_timeout. 3f5986eee360f12e6a0bb77aa46f95abf5f6bc10 @@ -1591,7 +1591,7 @@ 2022-05-31 [a8b4904e] --> - When CloseComplete is received, foward to frontend without buffering. (Tatsuo Ishii) + When CloseComplete is received, forward to frontend without buffering. (Tatsuo Ishii) It seems this caused occasional timeout error in 074.bug700_memqcache_segfault. @@ -1713,7 +1713,7 @@ Fix process memory requirement. Previously the formula was based on RSS. However PSS should be used because RSS includes shared memory - such as the memory used for libraries. This resuls in lot smaller + such as the memory used for libraries. This results in lot smaller memory requirement than before. @@ -2004,7 +2004,7 @@ 2022-04-17 [29734b5] --> - Enhance regression test 018.detach_primary to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 018.detach_primary to avoid the timeout error. (Tatsuo Ishii) @@ -2013,7 +2013,7 @@ 2022-04-17 [72d31b0] --> - Enhance regression test 074.bug700_memqcache_segfault to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 074.bug700_memqcache_segfault to avoid the timeout error. (Tatsuo Ishii) @@ -2654,7 +2654,7 @@ Fix the incorrect display of load balancing node in raw mode. (Bo Peng) - In raw mode, Pgpool-II sends all queies to main node. + In raw mode, Pgpool-II sends all queries to main node. This is harmless, but it may confuse users. @@ -3145,7 +3145,7 @@ Fix race condition between and . (Tatsuo Ishii) - If and are running concurrently, many problem occured. + If and are running concurrently, many problem occurred. Typical problem is, no primary node is found at the end. diff --git a/doc/src/sgml/release-4.3.sgml b/doc/src/sgml/release-4.3.sgml index 4c89ca37..70772fd2 100644 --- a/doc/src/sgml/release-4.3.sgml +++ b/doc/src/sgml/release-4.3.sgml @@ -561,7 +561,7 @@ 2023-08-09 [30db44e] --> - Fix covery warning. (Tatsuo Ishii) + Fix coverity warning. (Tatsuo Ishii) Fix query cache module assigned time_t value to int32 variable. Change @@ -983,11 +983,11 @@ 2023-01-31 [633bdca] --> - Fix kind mimatch error with DEALLOCATE. + Fix kind mismatch error with DEALLOCATE. (bug 780) (Tatsuo Ishii) - Kind mimatch error occurs when conditions below are all met: + Kind mismatch error occurs when conditions below are all met: @@ -1537,7 +1537,7 @@ To deal with idle_session_timeout detect_idle_session_timeout_error() is added to detect the error code for idle_session_timeout. If the - error is detected, Pgpool-II returns the error code to frondend as a + error is detected, Pgpool-II returns the error code to frontend as a fatal error and disconnects the session. This is a similar fix implemented for idle_in_transaction_session_timeout. 3f5986eee360f12e6a0bb77aa46f95abf5f6bc10 @@ -1744,7 +1744,7 @@ 2022-05-31 [f08ef22b] --> - When CloseComplete is received, foward to frontend without buffering. (Tatsuo Ishii) + When CloseComplete is received, forward to frontend without buffering. (Tatsuo Ishii) It seems this caused occasional timeout error in 074.bug700_memqcache_segfault. @@ -1874,7 +1874,7 @@ Fix process memory requirement. Previously the formula was based on RSS. However PSS should be used because RSS includes shared memory - such as the memory used for libraries. This resuls in lot smaller + such as the memory used for libraries. This results in lot smaller memory requirement than before. @@ -2213,7 +2213,7 @@ 2022-04-17 [29734b5] --> - Enhance regression test 018.detach_primary to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 018.detach_primary to avoid the timeout error. (Tatsuo Ishii) @@ -2222,7 +2222,7 @@ 2022-04-17 [72d31b0] --> - Enhance regression test 074.bug700_memqcache_segfault to avoid the timeut error. (Tatsuo Ishii) + Enhance regression test 074.bug700_memqcache_segfault to avoid the timeout error. (Tatsuo Ishii) diff --git a/doc/src/sgml/release-4.4.sgml b/doc/src/sgml/release-4.4.sgml index fad06793..0c8f4faf 100644 --- a/doc/src/sgml/release-4.4.sgml +++ b/doc/src/sgml/release-4.4.sgml @@ -600,7 +600,7 @@ 2023-08-09 [30db44e] --> - Fix covery warning. (Tatsuo Ishii) + Fix coverity warning. (Tatsuo Ishii) Fix query cache module assigned time_t value to int32 variable. Change @@ -1011,11 +1011,11 @@ 2023-01-31 [38225a7] --> - Fix kind mimatch error with DEALLOCATE. + Fix kind mismatch error with DEALLOCATE. (bug 780) (Tatsuo Ishii) - Kind mimatch error occurs when conditions below are all met: + Kind mismatch error occurs when conditions below are all met: @@ -1057,7 +1057,7 @@ 2023-01-30 [93f5585] --> - Obtain stronger lock while commiting shared relcache. (Tatsuo Ishii) + Obtain stronger lock while committing shared relcache. (Tatsuo Ishii) @@ -1741,8 +1741,8 @@ Configuration parameter delegate_IP is renamed to . For compatibility with the - old versions, the old paramter delegate_IP can still work. If - the old paramter delegate_IP is + old versions, the old parameter delegate_IP can still work. If + the old parameter delegate_IP is used, Pgpool-II will set the value to delegate_ip and throw a warning message. diff --git a/src/auth/pool_passwd.c b/src/auth/pool_passwd.c index 5d93e54b..cb37fdea 100644 --- a/src/auth/pool_passwd.c +++ b/src/auth/pool_passwd.c @@ -464,7 +464,7 @@ pool_reopen_passwd_file(void) /* * function first uses the password in the argument, if the argument is empty - * string or NULL, it looks for the password for uset in pool_passwd file. + * string or NULL, it looks for the password for user in pool_passwd file. * The returned password is always in plain text or md5 hashed and palloc'd * (if not null) */ diff --git a/src/config/README b/src/config/README index a6110696..e89820ba 100644 --- a/src/config/README +++ b/src/config/README @@ -37,7 +37,7 @@ defined above to src/include/pool_config.h. * will not be load balanced until the session ends. */ -Step3: Add config_emum_entry array to src/config/pool_config.c. +Step3: Add config_enum_entry array to src/config/pool_config.c. ================================================================ static const struct config_enum_entry disable_load_balance_on_write_options[] = { diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c index 6a32fa2c..111efa57 100644 --- a/src/config/pool_config_variables.c +++ b/src/config/pool_config_variables.c @@ -410,7 +410,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"failover_require_consensus", CFGCXT_INIT, FAILOVER_CONFIG, - "Only do failover when majority aggrees.", + "Only do failover when majority agrees.", CONFIG_VAR_TYPE_BOOL, false, 0 }, &g_pool_config.failover_require_consensus, @@ -466,7 +466,7 @@ static struct config_bool ConfigureNamesBool[] = { {"log_pcp_processes", CFGCXT_RELOAD, LOGGING_CONFIG, - "Logs PCP process forks and anormal exit status to the log", + "Logs PCP process forks and a normal exit status to the log", CONFIG_VAR_TYPE_BOOL, false, 0 }, &g_pool_config.log_pcp_processes, @@ -1948,7 +1948,7 @@ static struct config_int ConfigureNamesInt[] = { {"num_init_children", CFGCXT_INIT, CONNECTION_POOL_CONFIG, - "Maximim number of child processs to handle client connections.", + "Maximim number of child process to handle client connections.", CONFIG_VAR_TYPE_INT, false, 0 }, &g_pool_config.num_init_children, diff --git a/src/include/context/pool_session_context.h b/src/include/context/pool_session_context.h index dd886534..0fe2e4e0 100644 --- a/src/include/context/pool_session_context.h +++ b/src/include/context/pool_session_context.h @@ -148,7 +148,7 @@ typedef struct */ bool flush_pending; - bool is_tx_started_by_multi_statement; /* true if an explicit transaction has been strated by + bool is_tx_started_by_multi_statement; /* true if an explicit transaction has been started by multi statement query */ } POOL_PENDING_MESSAGE; diff --git a/src/include/pool.h b/src/include/pool.h index 56ddbeb1..21513f1d 100644 --- a/src/include/pool.h +++ b/src/include/pool.h @@ -343,9 +343,9 @@ extern int my_main_node_id; typedef enum { POOL_NODE_STATUS_UNUSED, /* unused */ - POOL_NODE_STATUS_PRIMARY, /* primary ndoe */ + POOL_NODE_STATUS_PRIMARY, /* primary node */ POOL_NODE_STATUS_STANDBY, /* standby node */ - POOL_NODE_STATUS_INVALID /* invalid node (split branin, stand alone) */ + POOL_NODE_STATUS_INVALID /* invalid node (split brain, stand alone) */ } POOL_NODE_STATUS; /* Clustering mode macros */ @@ -496,7 +496,7 @@ typedef enum } POOL_RECOVERY_MODE; /* - * Process types. DO NOT change the order of each enum meber! If you do + * Process types. DO NOT change the order of each enum member! If you do * that, you must change application_name array in src/main/pgpool_main.c * accordingly. */ diff --git a/src/include/pool_config.h b/src/include/pool_config.h index 311b75fa..a2a3f041 100644 --- a/src/include/pool_config.h +++ b/src/include/pool_config.h @@ -575,7 +575,7 @@ typedef struct bool failover_when_quorum_exists; /* Do failover only when wd * cluster holds the quorum */ bool failover_require_consensus; /* Only do failover when majority - * aggrees */ + * agrees */ bool allow_multiple_failover_requests_from_node; /* One Pgpool-II node * can send multiple * failover requests to diff --git a/src/include/query_cache/pool_memqcache.h b/src/include/query_cache/pool_memqcache.h index 9fc3e6a7..5206e2e5 100644 --- a/src/include/query_cache/pool_memqcache.h +++ b/src/include/query_cache/pool_memqcache.h @@ -39,7 +39,7 @@ * block". Each block is assigned a "cache block id", which is * starting with 0. */ -typedef char *POOL_CACH_BLOCK; /* pointer to cache block */ +typedef char *POOL_CACHE_BLOCK; /* pointer to cache block */ typedef unsigned int POOL_CACHE_BLOCKID; /* cache block id */ typedef unsigned int POOL_CACHE_ITEMID; /* cache item id */ diff --git a/src/libs/pcp/pcp.c b/src/libs/pcp/pcp.c index 6a8430a7..0a2b74a8 100644 --- a/src/libs/pcp/pcp.c +++ b/src/libs/pcp/pcp.c @@ -1447,7 +1447,7 @@ _pcp_promote_node(PCPConnInfo * pcpConn, int nid, bool gracefully, bool switchov pcp_write(pcpConn->pcpConn, sendchar, 1); - /* caluculate send buffer size */ + /* calculate send buffer size */ wsize = sizeof(char); /* protocol. 'j' or 'J' */ wsize += strlen(node_id); /* node id + space */ wsize += sizeof(char); /* promote option */ diff --git a/src/main/health_check.c b/src/main/health_check.c index fec0e6db..d6551f4b 100644 --- a/src/main/health_check.c +++ b/src/main/health_check.c @@ -315,13 +315,13 @@ establish_persistent_connection(int node) /* * If the node is already in down status or unused, do nothing. * except when the node state is down because of quarantine operation - * since we want to detect when the node cames back to life again to + * since we want to detect when the node comes back to life again to * remove it from the quarantine state */ if (bkinfo->backend_status == CON_UNUSED || (bkinfo->backend_status == CON_DOWN && bkinfo->quarantine == false)) { - /* get current time to use auto_faliback_interval */ + /* get current time to use auto_failback_interval */ now = time(NULL); if (pool_config->auto_failback && auto_failback_interval < now && @@ -440,7 +440,7 @@ establish_persistent_connection(int node) { ereport(LOG, (errmsg("request auto failback, node id:%d", node))); - /* get current time to use auto_faliback_interval */ + /* get current time to use auto_failback_interval */ now = time(NULL); auto_failback_interval = now + pool_config->auto_failback_interval; diff --git a/src/main/main.c b/src/main/main.c index 59e82859..5d586829 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -534,7 +534,7 @@ stop_me(void) for (;;) { - int cnt = 5; /* sending sinal retry interval */ + int cnt = 5; /* sending signal retry interval */ if (kill(pid, stop_sig) == -1) { diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c index 786593ca..02086372 100644 --- a/src/main/pgpool_main.c +++ b/src/main/pgpool_main.c @@ -3206,7 +3206,7 @@ read_status_file(bool discard_status) } /* - * Frist try out with old format file. + * First try out with old format file. */ is_old_format = true; @@ -4079,7 +4079,7 @@ pool_release_follow_primary_lock(bool remote_request) /* * Ideally this should not happen. * yet if for some reason our local node is trying to release a lock - * that is heald by remote node. Just produce a LOG message and release + * that is held by remote node. Just produce a LOG message and release * the lock */ ereport(LOG, @@ -4192,7 +4192,7 @@ handle_failback_request(FAILOVER_CONTEXT *failover_context, int node_id) else { /* - * The request is a proper failbak request and not because of + * The request is a proper failback request and not because of * the update status of quarantined node */ (void) write_status_file(); @@ -4426,7 +4426,7 @@ exec_failover_command(FAILOVER_CONTEXT *failover_context, int new_main_node_id, { if (failover_context->nodes[i]) { - /* If this is prmoting specified node, new_main_node + /* If this is promoting specified node, new_main_node * should be replaced by the requested node. The requested * node should be REAL_PRIMARY_NODE_ID. */ @@ -4518,7 +4518,7 @@ determine_new_primary_node(FAILOVER_CONTEXT *failover_context, int node_id) } /* - * Execute follow primary command if neccessary. + * Execute follow primary command if necessary. * return new main node id if it needs to be changed. * If not changed, -1 will be returned. */ diff --git a/src/protocol/child.c b/src/protocol/child.c index 9afdac88..c3882b13 100644 --- a/src/protocol/child.c +++ b/src/protocol/child.c @@ -524,7 +524,7 @@ backend_cleanup(POOL_CONNECTION * volatile *frontend, POOL_CONNECTION_POOL * vol sp = MAIN_CONNECTION(backend)->sp; /* - * cach connection if connection cache configuration parameter is enabled + * cache connection if connection cache configuration parameter is enabled * and frontend connection is not invalid */ if (sp && pool_config->connection_cache != 0 && frontend_invalid == false) @@ -1266,7 +1266,7 @@ static RETSIGTYPE authentication_timeout(int sig) } /* - * Enable authtentication timeout. + * Enable authentication timeout. */ static void enable_authentication_timeout(void) @@ -1278,7 +1278,7 @@ enable_authentication_timeout(void) } /* - * Disable authtentication timeout. + * Disable authentication timeout. */ static void disable_authentication_timeout(void) diff --git a/src/protocol/pool_pg_utils.c b/src/protocol/pool_pg_utils.c index 8faff3e8..25942b6c 100644 --- a/src/protocol/pool_pg_utils.c +++ b/src/protocol/pool_pg_utils.c @@ -197,7 +197,7 @@ make_persistent_db_connection_noerror( * receives an ERROR, it stops processing and terminates, which is not * good. This is problematic especially with pcp_node_info, since it * calls db_node_role(), and db_node_role() calls this function. So if - * the target PostgreSQL is down, EmitErrorRepor() sends ERROR message + * the target PostgreSQL is down, EmitErrorReport() sends ERROR message * to pcp frontend and it stops (see process_pcp_response() in * src/libs/pcp/pcp.c. To fix this, just eliminate calling * EmitErrorReport(). This will suppress ERROR message but as you can @@ -450,7 +450,7 @@ select_load_balancing_node(void) errdetail("suggested backend %d is streaming delayed over delay_threshold", suggested_node_id))); /* - * The new load balancing node is seleted from the + * The new load balancing node is selected from the * nodes which have the lowest delay. */ if (pool_config->delay_threshold_by_time > 0) diff --git a/src/protocol/pool_process_query.c b/src/protocol/pool_process_query.c index fc2d2228..f27773a3 100644 --- a/src/protocol/pool_process_query.c +++ b/src/protocol/pool_process_query.c @@ -1000,7 +1000,7 @@ ParameterStatus(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend) } else ereport(ERROR, - (errmsg("ParameterStatus: failed to obatain parameter name, value from the main node."))); + (errmsg("ParameterStatus: failed to obtain parameter name, value from the main node."))); return status; } @@ -1178,7 +1178,7 @@ is_select_query(Node *node, char *sql) } /* - * If SQL comment is not allowed, the query must start with cetain characters. + * If SQL comment is not allowed, the query must start with certain characters. * However if it's PREPARE, we should skip the check. */ if (!pool_config->allow_sql_comments) @@ -4154,9 +4154,9 @@ start_internal_transaction(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * ba * query in progress flag is set. At returning, the ReadyForQuery packet * length and the transaction state should be left in the backend buffers * EXCEPT for backends that do not satisfy VALID_BACKEND macro. This is - * required because the caller later on calls pool_message_length() wich + * required because the caller later on calls pool_message_length() which * retrieves the packet length and the transaction state from the backends - * that satify VALID_BACKEND macro. + * that satisfy VALID_BACKEND macro. */ POOL_STATUS end_internal_transaction(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend) diff --git a/src/protocol/pool_proto_modules.c b/src/protocol/pool_proto_modules.c index 1684baca..de5ea195 100644 --- a/src/protocol/pool_proto_modules.c +++ b/src/protocol/pool_proto_modules.c @@ -1815,7 +1815,7 @@ Describe(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, { /* * It is possible that client wants to use the portal created by - * DECLARE CUSOR or pl/pgSQL function. If so, the describe message + * DECLARE CURSOR or pl/pgSQL function. If so, the describe message * should only be sent to primary node. */ query_context = create_dummy_query_context(); diff --git a/src/query_cache/pool_memqcache.c b/src/query_cache/pool_memqcache.c index 241763fe..6526cb9f 100644 --- a/src/query_cache/pool_memqcache.c +++ b/src/query_cache/pool_memqcache.c @@ -3005,7 +3005,7 @@ pool_shmem_lock(POOL_MEMQ_LOCK_TYPE type) } #ifdef LOCK_TRACE - elog(LOG, "LOCK TRACE: try to aquire lock %s", type == POOL_MEMQ_EXCLUSIVE_LOCK? "LOCK_EX" : "LOCK_SH"); + elog(LOG, "LOCK TRACE: try to acquire lock %s", type == POOL_MEMQ_EXCLUSIVE_LOCK? "LOCK_EX" : "LOCK_SH"); #endif if (pool_is_shmem_cache() && !is_shmem_locked) { @@ -3018,7 +3018,7 @@ pool_shmem_lock(POOL_MEMQ_LOCK_TYPE type) } #ifdef LOCK_TRACE - elog(LOG, "LOCK TRACE: aquire lock %s", type == POOL_MEMQ_EXCLUSIVE_LOCK? "LOCK_EX" : "LOCK_SH"); + elog(LOG, "LOCK TRACE: acquire lock %s", type == POOL_MEMQ_EXCLUSIVE_LOCK? "LOCK_EX" : "LOCK_SH"); #endif is_shmem_locked = true; } diff --git a/src/rewrite/pool_timestamp.c b/src/rewrite/pool_timestamp.c index 7a526d21..4dca05e9 100644 --- a/src/rewrite/pool_timestamp.c +++ b/src/rewrite/pool_timestamp.c @@ -256,7 +256,7 @@ relcache_lookup(TSRewriteContext * ctx) return (TSRel *) pool_search_relcache(ts_relcache, ctx->backend, table_name); } -/* If timestamp value is required then return ts_const. Otherwize make +/* If timestamp value is required then return ts_const. Otherwise make * a new ParamRef, whose number member is 0 and is overwritten at last, * and add it into params list in context. */ @@ -782,7 +782,7 @@ rewrite_timestamp_update(UpdateStmt *u_stmt, TSRewriteContext * ctx) /* * Rewrite `now()' to timestamp literal. * If rewrite_to_params is false then, we rewrite `now()' to timestamp constant. - * Otherwize, we rewrite `now()' to params and expand that at Bind message. + * Otherwise, we rewrite `now()' to params and expand that at Bind message. * returns query string as palloced string, or NULL if not to need rewrite. */ char * @@ -1174,7 +1174,7 @@ bind_rewrite_timestamp(POOL_CONNECTION_POOL * backend, copy_to += sizeof(int16); } } - /* otherwize, copy the original format codes as they are*/ + /* otherwise, copy the original format codes as they are*/ else { copy_len = num_formats * sizeof(int16); diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream index 1b075617..3477ecf6 100644 --- a/src/sample/pgpool.conf.sample-stream +++ b/src/sample/pgpool.conf.sample-stream @@ -252,7 +252,7 @@ backend_clustering_mode = 'streaming_replication' # Log all statements #log_per_node_statement = off # Log all statements - # with node and backend informations + # with node and backend information #notice_per_node_statement = off # logs notice message for per node detailed SQL statements #log_client_messages = off @@ -566,7 +566,7 @@ backend_clustering_mode = 'streaming_replication' # Password in pool_passwd file before using the empty password #health_check_database = '' - # Database name for health check. If '', tries 'postgres' frist, + # Database name for health check. If '', tries 'postgres' first, #health_check_max_retries = 0 # Maximum number of times to retry a failed health check before giving up. #health_check_retry_delay = 1 @@ -679,7 +679,7 @@ backend_clustering_mode = 'streaming_replication' #auto_failback = off # Detached backend node reattach automatically - # if replicatiotate is 'streaming'. + # if replication is 'streaming'. #auto_failback_interval = 1min # Min interval of executing auto_failback in # seconds. @@ -771,7 +771,7 @@ backend_clustering_mode = 'streaming_replication' # ping command path # (change requires restart) -# - Behaivor on escalation Setting - +# - Behavior on escalation Setting - #clear_memqcache_on_escalation = on # Clear all the query cache on shared memory @@ -796,7 +796,7 @@ backend_clustering_mode = 'streaming_replication' #failover_require_consensus = on # Perform failover when majority of Pgpool-II nodes - # aggrees on the backend node status change + # agrees on the backend node status change # (change requires restart) #allow_multiple_failover_requests_from_node = off @@ -931,7 +931,7 @@ backend_clustering_mode = 'streaming_replication' # Number of relation cache # entry. If you see frequently: # "pool_search_relcache: cache replacement happened" - # in the pgpool log, you might want to increate this number. + # in the pgpool log, you might want to increase this number. #check_temp_table = catalog # Temporary table check method. catalog, trace or none. @@ -969,7 +969,7 @@ backend_clustering_mode = 'streaming_replication' # Defaults to localhost. # (change requires restart) #memqcache_memcached_port = 11211 - # Memcached port number. Mondatory if memqcache_method = 'memcached'. + # Memcached port number. Mandatory if memqcache_method = 'memcached'. # Defaults to 11211. # (change requires restart) #memqcache_total_size = 64MB diff --git a/src/streaming_replication/pool_worker_child.c b/src/streaming_replication/pool_worker_child.c index c92cf672..2a410564 100644 --- a/src/streaming_replication/pool_worker_child.c +++ b/src/streaming_replication/pool_worker_child.c @@ -233,7 +233,7 @@ do_worker_child(void) Req_info->switching == false) { /* - * Acquire follow primary lock. If fail to acqure lock, try again. + * Acquire follow primary lock. If fail to acquire lock, try again. */ follow_primary_lock_acquired = false; diff --git a/src/tools/pgproto/buffer.c b/src/tools/pgproto/buffer.c index e7fa0644..8f98570a 100644 --- a/src/tools/pgproto/buffer.c +++ b/src/tools/pgproto/buffer.c @@ -29,7 +29,7 @@ #include "pgproto/buffer.h" /* - * Read integer field and returns it. The pointer in the buffer afer reading + * Read integer field and returns it. The pointer in the buffer after reading * the data is returned to "bufp". If the format is not follows above, exit * within this function. */ @@ -70,7 +70,7 @@ buffer_read_int(char *buf, char **bufp) /* * Read string and returns pg_malloced buffer. The string must start with a * double quotation and end with a double quotation. The pointer in the buffer - * afer reading the data is returned to "bufp". If the format is not follows + * after reading the data is returned to "bufp". If the format is not follows * above, exit within this function. */ char * @@ -117,7 +117,7 @@ buffer_read_string(char *buf, char **bufp) /* * Read a character and returns it. The character must start with a single - * quotation and end with a single quotation. The pointer in the buffer afer + * quotation and end with a single quotation. The pointer in the buffer after * reading the data is returned to "bufp". If the format is not follows * above, exit within this function. */ diff --git a/src/tools/pgproto/extended_query.c b/src/tools/pgproto/extended_query.c index 80319d8c..c8f69475 100644 --- a/src/tools/pgproto/extended_query.c +++ b/src/tools/pgproto/extended_query.c @@ -219,7 +219,7 @@ process_bind(char *buf, PGconn *conn) send_char('B', conn); send_int(len, conn); /* message length */ - send_string(portal, conn); /* protal name */ + send_string(portal, conn); /* portal name */ free(portal); send_string(stmt, conn); /* statement name */ free(stmt); diff --git a/src/utils/pool_process_reporting.c b/src/utils/pool_process_reporting.c index c7c4b024..9ef39b9b 100644 --- a/src/utils/pool_process_reporting.c +++ b/src/utils/pool_process_reporting.c @@ -451,7 +451,7 @@ get_config(int *nrows) StrNCpy(status[i].name, "log_pcp_processes", POOLCONFIG_MAXNAMELEN); snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%d", pool_config->log_pcp_processes); - StrNCpy(status[i].desc, "if true, print PCP process forks and anormal exit status to the log", POOLCONFIG_MAXDESCLEN); + StrNCpy(status[i].desc, "if true, print PCP process forks and a normal exit status to the log", POOLCONFIG_MAXDESCLEN); i++; StrNCpy(status[i].name, "log_hostname", POOLCONFIG_MAXNAMELEN); @@ -1553,11 +1553,11 @@ get_pools(int *nrows) { int idle_duration = pi->connection_info[pool * MAX_NUM_BACKENDS].client_idle_duration; int load_balancing_node_id = pi->connection_info[pool * MAX_NUM_BACKENDS].load_balancing_node; - int cliet_idle_time = pool_config->client_idle_limit; + int client_idle_time = pool_config->client_idle_limit; if (pool_config->client_idle_limit > 0) { - cliet_idle_time = pool_config->client_idle_limit - idle_duration; + client_idle_time = pool_config->client_idle_limit - idle_duration; } for (backend_id = 0; backend_id < NUM_BACKENDS; backend_id++) @@ -1622,8 +1622,8 @@ get_pools(int *nrows) { snprintf(pools[lines].client_idle_duration, sizeof(pools[lines].client_idle_duration), "%d (%d:%02d before client disconnected)", idle_duration, - cliet_idle_time / 60, - cliet_idle_time % 60); + client_idle_time / 60, + client_idle_time % 60); } else snprintf(pools[lines].client_idle_duration, sizeof(pools[lines].client_idle_duration), diff --git a/src/utils/pool_relcache.c b/src/utils/pool_relcache.c index ccee7abd..32362fc6 100644 --- a/src/utils/pool_relcache.c +++ b/src/utils/pool_relcache.c @@ -133,7 +133,7 @@ pool_search_relcache(POOL_RELCACHE * relcache, POOL_CONNECTION_POOL * backend, c /* * Obtain database name and node id to be sent query. If - * relcache_query_target is RELQTARGET_LOADL_BALANCE_NODE, we consider + * relcache_query_target is RELQTARGET_LOAD_BALANCE_NODE, we consider * load balance node id to be used to send queries. * * Note that we need to use VALID_BACKEND_RAW, rather than VALID_BACKEND @@ -260,9 +260,9 @@ pool_search_relcache(POOL_RELCACHE * relcache, POOL_CONNECTION_POOL * backend, c query_cache_data = relation_cache_to_query_cache(res, &query_cache_len); /* * So far, we have already obtained a lock. But to register - * a query cache entry, we need to aquire an exclusive lock. + * a query cache entry, we need to acquire an exclusive lock. * Unfortunately: - * (1) we don't know if we already aquired an exclusive or not. + * (1) we don't know if we already acquired an exclusive or not. * (2) we cannot escalate a shared lock to an exclusive lock. * So we release the lock and obtain an exclusive lock. This may * create a window and thus we might try to register duplicate diff --git a/src/utils/pool_shmem.c b/src/utils/pool_shmem.c index 65597a5d..6612c846 100644 --- a/src/utils/pool_shmem.c +++ b/src/utils/pool_shmem.c @@ -131,7 +131,7 @@ pool_shared_memory_create(size_t size) } /* - * Removes a shared memory segment from process' address spaceq (called as + * Removes a shared memory segment from process' address space (called as * an on_shmem_exit callback, hence funny argument list) */ static void diff --git a/src/utils/pool_ssl.c b/src/utils/pool_ssl.c index c9fd55eb..69261671 100644 --- a/src/utils/pool_ssl.c +++ b/src/utils/pool_ssl.c @@ -134,7 +134,7 @@ pool_ssl_negotiate_clientserver(POOL_CONNECTION * cp) ereport(FATAL, (errcode(ERRCODE_PROTOCOL_VIOLATION), errmsg("received unencrypted data after SSL request"), - errdetail("This could be an evidence of an attempted man-in-the-middle attacck."))); + errdetail("This could be an evidence of an attempted man-in-the-middle attack."))); } SSL_set_fd(cp->ssl, cp->fd); @@ -189,7 +189,7 @@ pool_ssl_negotiate_serverclient(POOL_CONNECTION * cp) ereport(FATAL, (errcode(ERRCODE_PROTOCOL_VIOLATION), errmsg("received unencrypted data after SSL request"), - errdetail("This could be either a client-software bug or evidence of an attempted man-in-the-middle attacck."))); + errdetail("This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."))); } SSL_set_fd(cp->ssl, cp->fd); @@ -265,7 +265,7 @@ retry: * indicate that the underlying transport has been closed. * ------------------------------------------------------------- * We don't want to trigger failover but it is also possible that - * the connectoon has been closed. So returns 0 to ask pool_read() + * the connection has been closed. So returns 0 to ask pool_read() * to close connection to frontend. */ ereport(WARNING, diff --git a/src/watchdog/watchdog.c b/src/watchdog/watchdog.c index f929623c..fdf6a65c 100644 --- a/src/watchdog/watchdog.c +++ b/src/watchdog/watchdog.c @@ -4151,7 +4151,7 @@ wd_execute_cluster_command_processor(WatchdogNode * wdNode, WDPacketData * pkt) pool_release_follow_primary_lock(true); else ereport(LOG, - (errmsg("invalid looking operaition[%s] in 'LOCK ON STANDBY' from remote node \"%s\"", operation, wdNode->nodeName), + (errmsg("invalid looking operation[%s] in 'LOCK ON STANDBY' from remote node \"%s\"", operation, wdNode->nodeName), errdetail("command ignored"))); } else @@ -5074,7 +5074,7 @@ issue_watchdog_internal_command(WatchdogNode * wdNode, WDPacketData * pkt, int t /* * Check remote connections except their state are either WD_SHUTDOWN or - * WD_DEAD. If suncceeded in connecting to any of the remote nodes, returns + * WD_DEAD. If succeeded in connecting to any of the remote nodes, returns * true, otherwise false. */ static bool @@ -5725,7 +5725,7 @@ watchdog_state_machine_loading(WD_EVENTS event, WatchdogNode * wdNode, WDPacketD * This is the intermediate state before going to cluster initialization * here we update the information of all connected nodes and move to the * initialization state. moving to this state from loading does not make - * much sence as at loading time we already have updated node informations + * much sense as at loading time we already have updated node informations */ static int watchdog_state_machine_joining(WD_EVENTS event, WatchdogNode * wdNode, WDPacketData * pkt, WDCommandData * clusterCommand) diff --git a/src/watchdog/wd_json_data.c b/src/watchdog/wd_json_data.c index 5182170d..474fc37a 100644 --- a/src/watchdog/wd_json_data.c +++ b/src/watchdog/wd_json_data.c @@ -142,7 +142,7 @@ get_pool_config_from_json(char *json_data, int data_len) } value = json_get_value_for_key(root, "health_check_params"); - /* We don't get seperate health check params from older version + /* We don't get separate health check params from older version * so be kind if the JSON does not contain one */ if (value != NULL && value->type == json_array) @@ -970,7 +970,7 @@ parse_wd_exec_cluster_command_json(char *json_data, int data_len, WDExecCommandArg *command_arg = palloc0(sizeof(WDExecCommandArg)); /* * Append to list right away, so that deep freeing the list also - * get rid of half cooked argumnts in case of an error + * get rid of half cooked arguments in case of an error */ *args_list = lappend(*args_list,command_arg);