pgpool2.git / summary / log / commit / refs
commit 0b95cfdad5e82ac393db18eaa55fa9854098ee2f
Author: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Sat Dec 26 04:34:21 2020 +0000
Apply mega typo fixes.
Fixes for source code files including *.[chl] and regression scripts,
not only for comments but variable names and function names.
Documents (sgml and some text files) are also fixed.
See:
https://github.com/pgpool/pgpool2/pull/38
for more details.
Patch contributed by Josh Soref. Fixes for Japanese sgml files by me.
NEWS | 472 ++++++++++-----------
README.build | 2 +-
README.online-recovery | 6 +-
TODO | 8 +-
doc.ja/src/sgml/failover.sgml | 2 +-
doc.ja/src/sgml/ref/allfiles.sgml | 2 +-
doc.ja/src/sgml/ref/show_pool_cache.sgml | 2 +-
.../src/sgml/ref/show_pool_health_check_stats.sgml | 2 +-
doc.ja/src/sgml/reference.sgml | 2 +-
doc.ja/src/sgml/stylesheet.css | 2 +-
doc/src/sgml/advanced.sgml | 4 +-
doc/src/sgml/client-auth.sgml | 6 +-
doc/src/sgml/connection-settings.sgml | 2 +-
doc/src/sgml/example-cluster.sgml | 14 +-
doc/src/sgml/failover.sgml | 6 +-
doc/src/sgml/intro.sgml | 2 +-
doc/src/sgml/loadbalance.sgml | 4 +-
doc/src/sgml/performance.sgml | 2 +-
doc/src/sgml/ref/allfiles.sgml | 2 +-
doc/src/sgml/ref/pcp_proc_info.sgml | 2 +-
doc/src/sgml/ref/pcp_watchdog_info.sgml | 4 +-
doc/src/sgml/ref/show_pool_cache.sgml | 2 +-
doc/src/sgml/ref/show_pool_health_check_stats.sgml | 2 +-
doc/src/sgml/ref/show_pool_nodes.sgml | 2 +-
doc/src/sgml/reference.sgml | 4 +-
doc/src/sgml/release-3.5.sgml | 2 +-
doc/src/sgml/release-4.2.sgml | 6 +-
doc/src/sgml/runtime.sgml | 6 +-
doc/src/sgml/stylesheet.css | 2 +-
doc/src/sgml/watchdog.sgml | 2 +-
src/auth/auth-scram.c | 2 +-
src/auth/md5.c | 2 +-
src/auth/pool_auth.c | 6 +-
src/auth/pool_hba.c | 12 +-
src/auth/pool_passwd.c | 4 +-
src/config/README | 10 +-
src/config/pool_config.l | 4 +-
src/config/pool_config_variables.c | 84 ++--
src/context/pool_process_context.c | 2 +-
src/context/pool_query_context.c | 4 +-
src/context/pool_session_context.c | 12 +-
src/include/context/pool_process_context.h | 2 +-
src/include/context/pool_session_context.h | 14 +-
src/include/main/health_check.h | 2 +-
src/include/main/pgpool_logger.h | 2 +-
src/include/main/pool_internal_comms.h | 6 +-
src/include/parser/nodes.h | 2 +-
src/include/parser/parsenodes.h | 4 +-
src/include/parser/primnodes.h | 4 +-
src/include/pcp/libpcp_ext.h | 6 +-
src/include/pgproto/fe_memutils.h | 2 +-
src/include/pool.h | 8 +-
src/include/pool_config.h | 6 +-
src/include/pool_config_variables.h | 12 +-
src/include/protocol/pool_pg_utils.h | 6 +-
src/include/protocol/pool_proto_modules.h | 2 +-
src/include/utils/pool_select_walker.h | 2 +-
src/include/utils/regex_array.h | 2 +-
src/include/utils/timestamp.h | 2 +-
src/include/watchdog/watchdog.h | 2 +-
src/include/watchdog/wd_ipc_conn.h | 2 +-
src/include/watchdog/wd_lifecheck.h | 2 +-
src/libs/pcp/pcp.c | 14 +-
src/main/main.c | 6 +-
src/main/pgpool_logger.c | 2 +-
src/main/pgpool_main.c | 74 ++--
src/main/pool_globals.c | 8 +-
src/main/pool_internal_comms.c | 14 +-
src/parser/copyfuncs.c | 4 +-
src/parser/gram.y | 4 +-
src/parser/gram_minimal.y | 4 +-
src/parser/gram_template.y | 4 +-
src/parser/outfuncs.c | 10 +-
src/pcp_con/README.add_pcp_command | 4 +-
src/pcp_con/pcp_child.c | 8 +-
src/pcp_con/pcp_worker.c | 32 +-
src/pcp_con/recovery.c | 2 +-
src/pgpool.spec | 12 +-
src/protocol/CommandComplete.c | 34 +-
src/protocol/child.c | 14 +-
src/protocol/pool_connection_pool.c | 4 +-
src/protocol/pool_pg_utils.c | 40 +-
src/protocol/pool_process_query.c | 100 ++---
src/protocol/pool_proto_modules.c | 26 +-
src/query_cache/pool_memqcache.c | 38 +-
src/redhat/pgpool.init | 2 +-
src/redhat/pgpool_rhel.sysconfig | 2 +-
src/redhat/pgpool_rhel6.sysconfig | 2 +-
src/rewrite/pool_timestamp.c | 10 +-
src/sql/pgpool-recovery/pgpool-recovery.c | 2 +-
src/sql/pgpool-recovery/pgpool_recovery--1.0.sql | 2 +-
src/sql/pgpool-recovery/pgpool_recovery--1.1.sql | 2 +-
src/sql/pgpool-recovery/pgpool_recovery--1.2.sql | 2 +-
src/sql/pgpool-recovery/pgpool_recovery--1.3.sql | 2 +-
src/sql/pgpool-regclass/pgpool-regclass.c | 4 +-
src/sql/pgpool_adm/pgpool_adm.c | 4 +-
src/streaming_replication/pool_worker_child.c | 2 +-
src/test/C/test_extended.c | 2 +-
src/test/extended-query-test/README | 2 +-
src/test/extended-query-test/test.sh | 4 +-
src/test/parser/expected/var.out | 4 +-
src/test/pgpool_setup.in | 10 +-
src/test/regression/README | 2 +-
src/test/regression/tests/001.load_balance/test.sh | 6 +-
.../tests/002.native_replication/PgTester.java | 2 +-
src/test/regression/tests/004.watchdog/test.sh | 4 +-
src/test/regression/tests/005.jdbc/test.sh | 2 +-
.../regression/tests/010.rewrite_timestamp/test.sh | 2 +-
.../tests/010.rewrite_timestamp/timestamp/main.c | 2 +-
.../tests/011.watchdog_quorum_failover/test.sh | 6 +-
.../test.sh | 10 +-
.../test.sh | 8 +-
.../tests/014.watchdog_test_quorum_bypass/test.sh | 4 +-
.../015.watchdog_master_and_backend_fail/test.sh | 6 +-
.../regression/tests/017.node_0_is_down/test.sh | 2 +-
.../tests/019.log_client_messages/test.sh | 6 +-
.../020.allow_clear_text_frontend_auth/test.sh | 8 +-
.../regression/tests/021.pool_passwd_auth/test.sh | 8 +-
.../tests/022.pool_passwd_alternative_auth/test.sh | 8 +-
.../regression/tests/023.ssl_connection/test.sh | 2 +-
src/test/regression/tests/024.cert_auth/test.sh | 2 +-
.../tests/025.enable_shared_relcache/test.sh | 4 +-
src/test/regression/tests/026.temp_table/test.sh | 2 +-
.../regression/tests/027.auto_failback/test.sh | 4 +-
.../test.sh | 2 +-
src/test/regression/tests/054.postgres_fdw/test.sh | 4 +-
src/test/regression/tests/061.cancel_query/test.sh | 2 +-
src/test/regression/tests/064.bug153/test.sh | 8 +-
src/test/regression/tests/066.bug230/test.sh | 2 +-
.../tests/071.execute_and_deallocate/test.sh | 2 +-
src/tools/fe_port.c | 2 +-
src/tools/pcp/pcp_frontend_client.c | 6 +-
src/tools/pgproto/buffer.c | 4 +-
src/tools/pgproto/extended_query.c | 8 +-
src/tools/pgproto/main.c | 4 +-
src/tools/pgproto/read.c | 4 +-
src/tools/watchdog/wd_cli.c | 10 +-
src/utils/error/elog.c | 6 +-
src/utils/pool_process_reporting.c | 16 +-
src/utils/pool_relcache.c | 2 +-
src/utils/pool_select_walker.c | 4 +-
src/utils/pool_signal.c | 2 +-
src/utils/pool_stream.c | 4 +-
src/utils/regex_array.c | 6 +-
src/watchdog/watchdog.c | 166 ++++----
src/watchdog/wd_commands.c | 4 +-
src/watchdog/wd_escalation.c | 4 +-
src/watchdog/wd_heartbeat.c | 8 +-
src/watchdog/wd_if.c | 2 +-
src/watchdog/wd_internal_commands.c | 8 +-
src/watchdog/wd_ipc_conn.c | 2 +-
src/watchdog/wd_lifecheck.c | 8 +-
src/watchdog/wd_ping.c | 2 +-
src/watchdog/wd_utils.c | 2 +-
154 files changed, 864 insertions(+), 864 deletions(-)
diff --git a/NEWS b/NEWS
index 7d7afdc64..9fc51978f 100644
--- a/NEWS
+++ b/NEWS
@@ -95,7 +95,7 @@
table, allow_sql_comments, client_idle_limit, log_error_verbosity,
client_min_messages, log_min_messages, client_idle_limit_in_recovery.
- - Sync inconsitent status of PostgreSQL nodes in Pgpool-II instances
+ - Sync inconsistent status of PostgreSQL nodes in Pgpool-II instances
after restart. (Muhammad Usama)
- At the Pgpool-II startup, the status of each configured backend node
@@ -155,7 +155,7 @@
and secondly the routing of the query containing pg_terminate_backend
also needs a new logic so that the query should be sent to the correct
PostgreSQL node that hosts the backend with the PID referred by
- the pg_terminate_bakend()
+ the pg_terminate_backend()
So how does this commit handles pg_terminate_backend()??
In the SimpleQuery() function which is the work horse of simple query
@@ -215,7 +215,7 @@
make sure that we do not declare the timer expire due to some other
signal arrived while waiting for data for health check in pool_check_fd().
- - Add new script called "watchdog_setup". (Tatstuo Ishii)
+ - Add new script called "watchdog_setup". (Tatsuo Ishii)
watchdog_setup is a command to create a temporary installation
of Pgpool-II clusters with watchdog for mainly testings.
@@ -234,7 +234,7 @@
- Do not update status file if all backend nodes are in down
status. (Chris Pacejo, Tatsuo Ishii)
- This commit tries to remove the data inconsitency in replication
+ This commit tries to remove the data inconsistency in replication
mode found in [pgpool-general: 3918] by not recording the status file
when all backend nodes are in down status. This surprisingly simple
but smart solution was provided by Chris Pacejo.
@@ -267,7 +267,7 @@
* Changes
- Change the default value of search_primary_node_timeout from 10 to
- 300. (Tatstuo Ishii)
+ 300. (Tatsuo Ishii)
Prior default value 10 seconds is sometimes too short for a standby
to be promoted.
@@ -429,7 +429,7 @@
the watchdog master/coordinator node at the time of startup.
- Fix Pgpool-II doesn't escalate ip in case of another node
- inavailability. (bug 215) (Muhammad Usama)
+ unavailability. (bug 215) (Muhammad Usama)
The heartbeat receiver fails to identify the heartbeat sender watchdog
node when the heartbeat destination is specified in terms of an IP address
@@ -521,12 +521,12 @@
The reason was a missing command timeout handling in the function
that sends the IPC commands to watchdog.
- - Fix a posible hang during health checking. (bug 204) (Yugo Nagata)
+ - Fix a possible hang during health checking. (bug 204) (Yugo Nagata)
- Helath checking was hang when any data wasn't sent from
+ Health checking was hang when any data wasn't sent from
backend after connect(2) succeeded. To fix this, pool_check_fd()
returns 1 when select(2) exits with EINTR due to SIGALRM while
- health checkking is performed.
+ health checking is performed.
- Deal with the case when the primary is not node 0 in streaming
replication mode. (Tatsuo Ishii)
@@ -576,9 +576,9 @@
- Fix confusing comments in pgpool.conf. (Tatsuo Ishii)
- - Fix Japanese and Chinese documetation bug about raw mode. (Yugo Nagata, Bo Peng)
+ - Fix Japanese and Chinese documentation bug about raw mode. (Yugo Nagata, Bo Peng)
- Connection pool is avalilable in raw mode.
+ Connection pool is available in raw mode.
- Fix is_set_transaction_serializable() when
SET default_transaction_isolation TO 'serializable'. (bug 191) (Bo Peng)
@@ -648,18 +648,18 @@
- Fix pgpool hung after receiving error state from backend. (bug #169) (Tatsuo Ishii)
- This could happend if we execute an extended protocol query
+ This could happen if we execute an extended protocol query
and it fails. After an error is received the "ignore till sync flag"
- is set and remained even if sync message was actually received.
+ is set and retained even if sync message was actually received.
Thus any subsequent query (in the case above "DEALLOCATE message")
- is not procesed and pgpool waits for message from frontend and backend,
- and pgpool stucks here because no message will arrive from both side.
+ is not processed and pgpool waits for message from frontend and backend,
+ and pgpool sticks here because no message will arrive from both side.
To fix this, unconditionally reset the "ignore till sync flag"
in ReadyforQuery(). This is safe because apparently we already
received the ready for query message.
- - Fix query stack problems in extended protocol case. (bug 167, 168) (Tatstuo Ishii)
+ - Fix query stack problems in extended protocol case. (bug 167, 168) (Tatsuo Ishii)
- Fix [pgpool-hackers: 1440] yet another reset query stuck problem. (Tatsuo Ishii)
@@ -688,7 +688,7 @@
- Add some warning messages for wd_authkey hash calculation failure. (Yugo Nagata)
Sometimes wd_authkey calculation fails for some reason other
- than authkey mismatch. The additional messages make these distingushable
+ than authkey mismatch. The additional messages make these distinguishable
for each other.
===============================================================================
@@ -750,7 +750,7 @@
- doc : Fixing a typo in english doc (Muhammad Usama)
- - Fix for bun 215 that pgpool doesn't escalate ip in case of another node inavailability.
+ - Fix for bun 215 that pgpool doesn't escalate ip in case of another node unavailability.
(Muhammad Usama)
The heartbeat receiver fails to identify the heartbeat sender watchdog node when
@@ -863,8 +863,8 @@
See bug 191 for related info.
- - Fix Chinese documetation bug about raw mode (Yugo Nagata, Bo Peng)
- Connection pool is avalilable in raw mode.
+ - Fix Chinese documentation bug about raw mode (Yugo Nagata, Bo Peng)
+ Connection pool is available in raw mode.
- Fix confusing comments in pgpool.conf (Tatsuo Ishii)
@@ -921,12 +921,12 @@
either load balance node or primary node, the primary node id is
returned.
- - Fix a posible hang during health checking (Yugo Nagata)
+ - Fix a possible hang during health checking (Yugo Nagata)
- Helath checking was hang when any data wasn't sent
+ Health checking was hang when any data wasn't sent
from backend after connect(2) succeeded. To fix this,
pool_check_fd() returns 1 when select(2) exits with
- EINTR due to SIGALRM while health checkking is performed.
+ EINTR due to SIGALRM while health checking is performed.
Reported and patch provided by harukat and some modification
by Yugo.
@@ -1048,7 +1048,7 @@
(Yugo Nagata)
Sometimes wd_authkey calculation fails for some reason other than
- authkey mismatch. The additional messages make these distingushable
+ authkey mismatch. The additional messages make these distinguishable
for each other.
- test: Fix regression test to check timeout of each test (Yugo Nagata)
@@ -1066,7 +1066,7 @@
- test: Fix test/regression/clean.sh to remove binary files of
010.rewrite_timestamp test (Yugo Nagata)
- - Fix memorry leak reported by Coverity (CID 1350095) (Yugo Nagata)
+ - Fix memory leak reported by Coverity (CID 1350095) (Yugo Nagata)
- Fixing pgpool-recovery module compilation issue with PostgreSQL 9.6
(Muhammad Usama)
@@ -1118,7 +1118,7 @@
- Fix pgpool hung after receiving error state from backend (Tatsuo Ishii)
- This could happend if we execute an extended protocol query and it
+ This could happened if we execute an extended protocol query and it
fails.
Per bug #169.
@@ -1234,7 +1234,7 @@
* Enhancements
- - Performance improvement in extened query protocol (Tatsuo Ishii)
+ - Performance improvement in extended query protocol (Tatsuo Ishii)
Unnecessary "flush" messages which used to be sent in each step of
extended protocol messages (parse, bind, describe and execute) and
@@ -1290,7 +1290,7 @@
Long command line options can be used now.
-- PCP password is safe:
Don't pass password via command line, which causes security risks.
- -- Mutiple concurrent execution of pcp commands:
+ -- Multiple concurrent execution of pcp commands:
Allow to execute a pcp command while running pcp_recovery_node
which takes sometime to finish.
@@ -1348,7 +1348,7 @@
caching the PostgreSQL connection if the connection to frontend was not
properly terminated.
- - test: Fix false alerm of regression tset 062 (Yugo Nagata)
+ - test: Fix false alarm of regression tset 062 (Yugo Nagata)
- test: Fix broken regression test for native replication (Yugo Nagata)
@@ -1363,7 +1363,7 @@
When a schema name was provided, the table name was quoted wrongly as
like "public.mytbl" instead of "public"."mytbl". So, pool_regclass
- and to_regclass couldn't find right talbe oid and insert lock was
+ and to_regclass couldn't find right table oid and insert lock was
never executed. This caused inconsistency between DB nodes.
- test: Fix complication error and segfault of timestamp rewrite test (Yugo Nagata)
@@ -1384,9 +1384,9 @@
- doc: Fix wrong description in documents about log_standby_delay (Yugo Nagata)
- - Fix segfalut that occurs when function is used in FROM clause (Yugo Nagata)
+ - Fix segfault that occurs when function is used in FROM clause (Yugo Nagata)
- PRPARE statements in streaming-reaplication mode and INSERT/UPDATE
+ PREPARE statements in streaming-reapplication mode and INSERT/UPDATE
with SELECT in native-replication mode were affected. For example:
- prepare p as select * from generate_series(1,1);
@@ -1395,7 +1395,7 @@
- doc: Add caution about JDBC driver version regarding app_name_redirect_preference_list
(Tatsuo Ishii)
- - Fix hang problmen reported in bug #145. (Tatsuo Ishii)
+ - Fix hang problem reported in bug #145. (Tatsuo Ishii)
The problem occurs when all the condition below are met:
@@ -1469,7 +1469,7 @@
backend nodes. The function assumed that the node was also invalid when its
connection status was down. However, that is not always right.
- - Fix white/black_memqcache_table_list not to require quotaion (Yugo Nagata)
+ - Fix white/black_memqcache_table_list not to require quotation (Yugo Nagata)
The tables and schemas name specified in *_memqcache_table_list
were needed to be quoted by double quotation.
@@ -1624,8 +1624,8 @@
See bug 191 for related info.
- - Fix Chinese documetation bug about raw mode (Yugo Nagata, Bo Peng)
- Connection pool is avalilable in raw mode.
+ - Fix Chinese documentation bug about raw mode (Yugo Nagata, Bo Peng)
+ Connection pool is available in raw mode.
- Fix confusing comments in pgpool.conf (Tatsuo Ishii)
@@ -1656,12 +1656,12 @@
See bug 194 for related info.
- - Fix a posible hang during health checking (Yugo Nagata)
+ - Fix a possible hang during health checking (Yugo Nagata)
- Helath checking was hang when any data wasn't sent
+ Health checking was hang when any data wasn't sent
from backend after connect(2) succeeded. To fix this,
pool_check_fd() returns 1 when select(2) exits with
- EINTR due to SIGALRM while health checkking is performed.
+ EINTR due to SIGALRM while health checking is performed.
Reported and patch provided by harukat and some modification
by Yugo.
@@ -1769,7 +1769,7 @@
- test: Fix test/regression/clean.sh to remove binary files of
010.rewrite_timestamp test (Yugo Nagata)
- - Fix memorry leak reported by Coverity (CID 1350095) (Yugo Nagata)
+ - Fix memory leak reported by Coverity (CID 1350095) (Yugo Nagata)
- Fixing pgpool-recovery module compilation issue with PostgreSQL 9.6
(Muhammad Usama)
@@ -1855,7 +1855,7 @@
caching the PostgreSQL connection if the connection to frontend was not
properly terminated.
- - test: Fix false alerm of regression tset 062 (Yugo Nagata)
+ - test: Fix false alarm of regression tset 062 (Yugo Nagata)
- test: Fix broken regression test for native replication (Yugo Nagata)
@@ -1870,7 +1870,7 @@
When a schema name was provided, the table name was quoted wrongly as
like "public.mytbl" instead of "public"."mytbl". So, pool_regclass
- and to_regclass couldn't find right talbe oid and insert lock was
+ and to_regclass couldn't find right table oid and insert lock was
never executed. This caused inconsistency between DB nodes.
- test: Fix complication error and segfault of timestamp rewrite test
@@ -1968,7 +1968,7 @@
The expected result of 'show pool_nodes' is fixed to use
PGSOCKET_DIR in hostname column.
- - Fix white/black_memqcache_table_list not require quotaion (Yugo Nagata)
+ - Fix white/black_memqcache_table_list not require quotation (Yugo Nagata)
The tables and schemas name specified in *_memqcache_table_list
were needed to be quoted by double quotation.
@@ -2006,7 +2006,7 @@
(Yugo Nagata)
Sometimes wd_authkey calculation fails for some reason other than
- authkey mismatch. The additional messages make these distingushable
+ authkey mismatch. The additional messages make these distinguishable
for each other.
- test: Fix regression test to check timeout of each test (Yugo Nagata)
@@ -2022,9 +2022,9 @@
Per bug #153.
- - Fix segfalut that occurs when function is used in FROM clause (Yugo Nagata)
+ - Fix segfault that occurs when function is used in FROM clause (Yugo Nagata)
- PRPARE statements in streaming-reaplication mode and INSERT/UPDATE
+ PREPARE statements in streaming-reapplication mode and INSERT/UPDATE
with SELECT in native-replication mode were affected. For example:
- prepare p as select * from generate_series(1,1);
@@ -2144,7 +2144,7 @@
ERROR: failed to make persistent db connection
DETAIL: connection to host:"x.x.x.x:5432 failed
- However, the healthchek triggers neither fail over nor retrying. So,
+ However, the healthcheck triggers neither fail over nor retrying. So,
except the annoying messages above, everything goes well. This could
occur more easily if 1) num_init_children is big and 2) pgpool
children go into idle state (no query arrived from client for
@@ -2262,7 +2262,7 @@
ERROR: failed to make persistent db connection
DETAIL: connection to host:"x.x.x.x:5432 failed
- However, the healthchek triggers neither fail over nor retrying. So,
+ However, the healthcheck triggers neither fail over nor retrying. So,
except the annoying messages above, everything goes well. This could
occur more easily if 1) num_init_children is big and 2) pgpool
children go into idle state (no query arrived from client for
@@ -2336,7 +2336,7 @@
Rather, it is harmful, and due to this it was regarded that ping
command exited abnormally in error even when this succeeded.
- - Fix to use waitpid instead of wait in exec_ifconifg (Yugo Nagata)
+ - Fix to use waitpid instead of wait in exec_ifconfig (Yugo Nagata)
- Remove an unnecessary include directive (Yugo Nagata)
@@ -2346,7 +2346,7 @@
parameter description. Unfortunately recovery_timeout description is
64 chars, which is 1 byte longer than former definition of the macro.
- - doc: Update document of condition for load balancig (Yugo Nagata)
+ - doc: Update document of condition for load balancing (Yugo Nagata)
Load balancing is possible in an explicit transaction block
even in replication mode since 3.3.0.
@@ -2424,7 +2424,7 @@
The node id should be lower than NUM_BACKENDS. Probably harmless since
callers never pass node ids greater or equal to NUM_BACKENDS.
- - Fix occasional stuck that occures when a NOTIFY message is sent from
+ - Fix occasional stuck that occurs when a NOTIFY message is sent from
a backend. (Muhammad Usama)
The issue happens in master slave mode with load balancing when the
@@ -2458,12 +2458,12 @@
- Fix a memory leak with long-lived connections (Muhammad Usama)
- Problem reporeted in [pgpool-general: 3325].
+ Problem reported in [pgpool-general: 3325].
- Change the log level of "Frontend Terminated" message to DEBUG1 from LOG
(Muhammad Usama)
- - Fix ill signal befavior of SIGCHLD in exec_ifconfig() (Tatsuo Ishii)
+ - Fix ill signal behavior of SIGCHLD in exec_ifconfig() (Tatsuo Ishii)
For some reason SIGCHLD was set to SIG_IGN *and* tries to wait
child process which always fails because SIGCHLD is never delivered.
@@ -2505,7 +2505,7 @@
- Fix pgpool main process to shutdown in case of child process start-up
failures (Muhammad Usama)
- Problem rported in [pgpool-general: 3358].
+ Problem reported in [pgpool-general: 3358].
- Fix a segmentation fault that could happen in child process error
(Muhammad Usama)
@@ -2639,7 +2639,7 @@
- Rename all occurrence of "on memory query cache" to "in memory
query cache" because latter is more correct in English (Tatsuo Ishii)
- - Add 4th paramter "master node port number" to recovery script
+ - Add 4th parameter "master node port number" to recovery script
(Tatsuo Ishii)
- Allow to handle more than 3 database nodes in pgpool_setup
@@ -2765,8 +2765,8 @@
See bug 191 for related info.
- - Fix Chinese documetation bug about raw mode (Yugo Nagata, Bo Peng)
- Connection pool is avalilable in raw mode.
+ - Fix Chinese documentation bug about raw mode (Yugo Nagata, Bo Peng)
+ Connection pool is available in raw mode.
- Fix confusing comments in pgpool.conf (Tatsuo Ishii)
@@ -2817,12 +2817,12 @@
- change the Makefile under the directory src/sql/, that is proposed (Bo Peng)
by [pgpool-hackers: 1611]
- - Fix a posible hang during health checking (Yugo Nagata)
+ - Fix a possible hang during health checking (Yugo Nagata)
- Helath checking was hang when any data wasn't sent
+ Health checking was hang when any data wasn't sent
from backend after connect(2) succeeded. To fix this,
pool_check_fd() returns 1 when select(2) exits with
- EINTR due to SIGALRM while health checkking is performed.
+ EINTR due to SIGALRM while health checking is performed.
Reported and patch provided by harukat and some modification
by Yugo. Per bug #204.
@@ -2900,7 +2900,7 @@
- test: Fix test/regression/clean.sh to remove binary files of
010.rewrite_timestamp test (Yugo Nagata)
- - Fix memorry leak reported by Coverity (CID 1350095) (Yugo Nagata)
+ - Fix memory leak reported by Coverity (CID 1350095) (Yugo Nagata)
- Fixing pgpool-recovery module compilation issue with PostgreSQL 9.6
(Muhammad Usama)
@@ -2969,7 +2969,7 @@
This ensures that pgpool_status is saved to permanent storage and
allow to survive after system crash.
- - test: Fix false alerm of regression tset 062 (Yugo Nagata)
+ - test: Fix false alarm of regression tset 062 (Yugo Nagata)
- test: Fix broken regression test for native replication (Yugo Nagata)
@@ -2984,7 +2984,7 @@
When a schema name was provided, the table name was quoted wrongly as
like "public.mytbl" instead of "public"."mytbl". So, pool_regclass
- and to_regclass couldn't find right talbe oid and insert lock was
+ and to_regclass couldn't find right table oid and insert lock was
never executed. This caused inconsistency between DB nodes.
- test: Fix complication error and segfault of timestamp rewrite test
@@ -3048,7 +3048,7 @@
The expected result of 'show pool_nodes' is fixed to use
PGSOCKET_DIR in hostname column.
- - Fix white/black_memqcache_table_list not require quotaion (Yugo Nagata)
+ - Fix white/black_memqcache_table_list not require quotation (Yugo Nagata)
The tables and schemas name specified in *_memqcache_table_list
were needed to be quoted by double quotation.
@@ -3073,7 +3073,7 @@
(Yugo Nagata)
Sometimes wd_authkey calculation fails for some reason other than
- authkey mismatch. The additional messages make these distingushable
+ authkey mismatch. The additional messages make these distinguishable
for each other.
- test: Fix regression test to check timeout of each test (Yugo Nagata)
@@ -3167,7 +3167,7 @@
ERROR: failed to make persistent db connection
DETAIL: connection to host:"x.x.x.x:5432 failed
- However, the healthchek triggers neither fail over nor retrying. So,
+ However, the healthcheck triggers neither fail over nor retrying. So,
except the annoying messages above, everything goes well. This could
occur more easily if 1) num_init_children is big and 2) pgpool
children go into idle state (no query arrived from client for
@@ -3232,7 +3232,7 @@
parameter description. Unfortunately recovery_timeout description is
64 chars, which is 1 byte longer than former definition of the macro.
- - doc: Update document of condition for load balancig (Yugo Nagata)
+ - doc: Update document of condition for load balancing (Yugo Nagata)
Load balancing is possible in an explicit transaction block
even in replication mode since 3.3.0.
@@ -3278,7 +3278,7 @@
- doc: Describe explicitly that the number of slave nodes is not
necessarily 1 (Tatsuo Ishii)
- - Fix occasinal deadlock in failover with watchdog enabled
+ - Fix occasional deadlock in failover with watchdog enabled
(Muhammad Usama)
per bug #105
@@ -3320,7 +3320,7 @@
- test: Add memory leak regression test (Tatsuo Ishii)
- - Fix ill signal befavior of SIGCHLD in exec_ifconfig() (Tatsuo Ishii)
+ - Fix ill signal behavior of SIGCHLD in exec_ifconfig() (Tatsuo Ishii)
For some reason SIGCHLD was set to SIG_IGN *and* tries to wait
child process which always fails because SIGCHLD is never delivered.
@@ -3427,7 +3427,7 @@
(Yugo Nagata)
When executing command such as ifconfig or ping by execv() in a forked
- child proess, wait() can fails with an error code ECHILD, although the
+ child process, wait() can fails with an error code ECHILD, although the
process exists exactly, if SIGCHLD is set to SIG_IGN in Linux. We should
ignore this and not treat as failure of the command.
@@ -3504,7 +3504,7 @@
This problem is reported by Qian Peng in [pgpool-hackers: 520].
- - Disbale statement_timeout of PostgreSQL while executing online recovery
+ - Disable statement_timeout of PostgreSQL while executing online recovery
(Tatsuo Ishii)
Online recovery may take very long time and user may enable statement
@@ -3550,7 +3550,7 @@
Coverity issue #1111419, #1111420, #1111422.
- - replacing strcpy() with much safer and recomended call strlcpy()
+ - replacing strcpy() with much safer and recommended call strlcpy()
(Muhammad Usama)
Coverity issue #1111480.
@@ -3670,7 +3670,7 @@
- Fix query cache bug with extended protocol. (Tatsuo Ishii)
- SELECT retrieves outdated cache even DML was executed in an expilicit
+ SELECT retrieves outdated cache even DML was executed in an explicit
transaction. The bug had been there since in memory query cache was
born. Per [pgpool-general-jp: 1252].
@@ -3700,7 +3700,7 @@
Replace strcpy() with strlcpy(). Per Coverity report 1111478, 1111480,
1111481.
- - Add dubug messages for analyzing errors in if_up_cmd (Yugo Nagata)
+ - Add debug messages for analyzing errors in if_up_cmd (Yugo Nagata)
- Fix freeing NULL. (Tatsuo Ishii)
@@ -3729,7 +3729,7 @@
With JDBC, when a prepared statement is executed more than
PrepareThreshold times, the statement is named and Describe message
is sent after Parse. With named statement, pgpool rewrite now() to
- parameter in replication mode. Hence, rewritten query has additonal
+ parameter in replication mode. Hence, rewritten query has additional
parameter than original. In this case, ParameterDescription message
sent to frontend (response of Describe) should include OIDs of the
same number os original query's parameters. Otherwize, JDBC throws
@@ -3737,12 +3737,12 @@
This is reported in [pgpool-general-jp: 1192].
- - Fix backend error of prepared statement about table which has column whoes
+ - Fix backend error of prepared statement about table which has column whose
default value is now() in replication mode (Yugo Nagata)
When pgpool parses a named prepared statement with default now(),
timestamps are replaced to additional parameters. So, Bind message also
- should inclued additional parameter format codes. However, when the
+ should included additional parameter format codes. However, when the
number of original parameter was one, pgpool didn't handle this. This
caused a error like "incorrect binary data format in bind parameter 2".
@@ -3807,7 +3807,7 @@
Per bug#74. http://www.pgpool.net/mantisbt/view.php?id=74
- doc: Modify descriptions about restrictions of parallel mode
- Muliple rows INSERT using VALUES are not supported in parallel mode.
+ Multiple rows INSERT using VALUES are not supported in parallel mode.
(Yugo Nagata)
- Avoid calling find_primary_node_repeatedly() when standby node goes
@@ -3897,7 +3897,7 @@
unnecessary 4 bytes, which did nothing bd for the execution of program.
But a bug is a bug.
- Per covery report "1111476 Wrong sizeof argument"
+ Per coverity report "1111476 Wrong sizeof argument"
- Fix "show pool_status" always shows memqcache_auto_cache_invalidation as
0. (Tatsuo Ishii)
@@ -4004,12 +4004,12 @@
string than the buffer.
Per Coverity report 1111426 "Out-of-bounds access".
- - RPM: Improved to specify the versions of pgool-II and PostgreSQL in the.
+ - RPM: Improved to specify the versions of pgpool-II and PostgreSQL in the.
spec file. (Nozomi Anzai)
- - Fix resource leak in make_persistent_db_connection. (Tatsio Ishii)
+ - Fix resource leak in make_persistent_db_connection. (Tatsuo Ishii)
- For this pupose, new static function free_persisten_db_connection_memory
+ For this purpose, new static function free_persisten_db_connection_memory
is added.
Per Coverity report #1111468.
@@ -4096,7 +4096,7 @@
* Incompatible changes
- - All the follwing are about watchdog.
+ - All the following are about watchdog.
See "New features" section below for details of these changes.
- Default monitoring method was changed from query mode to heartbeat mode.
@@ -4106,7 +4106,7 @@
- In default, all the query caches on shared memory are cleared when
standby pgpool-II escalates to active.
- - Database name, user name, and password used for monitring other
+ - Database name, user name, and password used for monitoring other
pgpool-II by query are specified by dedicated parameters.
Previously, template1, recovery_user, and recovery_password are used.
@@ -4116,7 +4116,7 @@
** Watchdog
- - Add a new monitring method using heartbeat signal of UDP packet in
+ - Add a new monitoring method using heartbeat signal of UDP packet in
lifecheck. (Yugo Nagata)
You can select a method from either of two methods, "heartbeat" mode or
@@ -4182,7 +4182,7 @@
used in query mode lifecheck of watchdog . Previously, these are hard
coded to use template1, recovery_user, and recovery_password.
- - When delegate_IP parameter is emply, viertual IP is neither brought up
+ - When delegate_IP parameter is empty, virtual IP is neither brought up
nor switched. (Yugo Nagata)
This allows multi-master like configuration without virtual IP.
@@ -4213,13 +4213,13 @@
- Support installation method using CREATE EXTENSION for pgpool-recovery
and pgpool-regclass. (Tatsuo Ishii)
- Older installtion method is still preserved.
+ Older installation method is still preserved.
Note: extension names are "pgpool_recovery" and "pgpool_regclass", not
- "pgpool-recovery" and "pgpool-regclass" because latters are not
+ "pgpool-recovery" and "pgpool-regclass" because letters are not
convenient in using CREATE EXTENSION command (requires double quotes).
- - Add a function "pgpool_pgctl()" which enebles to execute
+ - Add a function "pgpool_pgctl()" which enables to execute
pg_ctl stop/restart/reload (except for start) by SQL. (Nozomi Anzai)
$ psql sales -c "select pgpool_pgctl('reload', 'fast')";
@@ -4262,7 +4262,7 @@
* Bug fixes
- - Consider timeout waiting for compeletion of failback request in on line
+ - Consider timeout waiting for completion of failback request in on line
recovery. (Tatsuo Ishii)
This will prevent the situation that recovery operation continues forever
@@ -4298,7 +4298,7 @@
The typical symptom is "I see SELECT is keep on running according to
pg_stat_activity". To fix this pgpool-II just exits the process and
- kill the existig connection. This is not gentle but at this point I
+ kill the existing connection. This is not gentle but at this point I
believe this is the best solution.
- Fix possible deadlock during failover with watchdog enabled.
@@ -4310,7 +4310,7 @@
- Fix unnecessary degeneration caused by error on commit. (Tatsuo Ishii)
In master slave mode, if master gets an error at commit, while other
- slaves are normal at commit, we don't need to degenrate any backend
+ slaves are normal at commit, we don't need to degenerate any backend
because it is likely that the "kind mismatch error" was caused by a
deferred trigger.
@@ -4337,9 +4337,9 @@
SELECT * FROM t1;
- At commit pgpool tries to delete cache for t2 but failes because
+ At commit pgpool tries to delete cache for t2 but fails because
there's no oid table entry for t2. Problem is, it fails to check oid
- table for t1. So cahce for t1 remains and the last SELECT incorrectly
+ table for t1. So cache for t1 remains and the last SELECT incorrectly
returns cached data. Fix is, continuing to check oid table entries.
This is reported in Bug track #58 by wms
@@ -4401,7 +4401,7 @@
of recovery script, and this causes a malfunction. In especially,
rsync may delete unrelated files in basebackup scripts.
- - Fix a segmentation fault on main process that could occures after backend
+ - Fix a segmentation fault on main process that could occurs after backend
error detection (Tatsuo Ishii)
This is reported in Bug track #62 by tuomas.
@@ -4448,7 +4448,7 @@
snprintf and strlcpy respectively. (Yugo Nagata)
- Replace "sticky bit" to "setuid bit" in log message, comments and
- funcation names. (Yugo Nagata)
+ function names. (Yugo Nagata)
These words were used mistakenly and caused confusion.
@@ -4577,8 +4577,8 @@
See bug 191 for related info.
- - Fix Chinese documetation bug about raw mode (Yugo Nagata, Bo Peng)
- Connection pool is avalilable in raw mode.
+ - Fix Chinese documentation bug about raw mode (Yugo Nagata, Bo Peng)
+ Connection pool is available in raw mode.
- Fix confusing comments in pgpool.conf (Tatsuo Ishii)
@@ -4629,12 +4629,12 @@
- change the Makefile under the directory src/sql/, that is proposed (Bo Peng)
by [pgpool-hackers: 1611]
- - Fix a posible hang during health checking (Yugo Nagata)
+ - Fix a possible hang during health checking (Yugo Nagata)
- Helath checking was hang when any data wasn't sent
+ Health checking was hang when any data wasn't sent
from backend after connect(2) succeeded. To fix this,
pool_check_fd() returns 1 when select(2) exits with
- EINTR due to SIGALRM while health checkking is performed.
+ EINTR due to SIGALRM while health checking is performed.
Reported and patch provided by harukat and some modification
by Yugo. Per bug #204.
@@ -5018,7 +5018,7 @@
Per bug #104.
http://www.pgpool.net/mantisbt/view.php?id=104
- - Disbale statement_timeout of PostgreSQL while executing online recovery
+ - Disable statement_timeout of PostgreSQL while executing online recovery
(Tatsuo Ishii)
Online recovery may take very long time and user may enable statement
@@ -5103,7 +5103,7 @@
- Fix query cache bug with extended protocol. (Tatsuo Ishii)
- SELECT retrieves outdated cache even DML was executed in an expilicit
+ SELECT retrieves outdated cache even DML was executed in an explicit
transaction. The bug had been there since in memory query cache was
born. Per [pgpool-general-jp: 1252].
@@ -5156,7 +5156,7 @@
With JDBC, when a prepared statement is executed more than
PrepareThreshold times, the statement is named and Describe message
is sent after Parse. With named statement, pgpool rewrite now() to
- parameter in replication mode. Hence, rewritten query has additonal
+ parameter in replication mode. Hence, rewritten query has additional
parameter than original. In this case, ParameterDescription message
sent to frontend (response of Describe) should include OIDs of the
same number os original query's parameters. Otherwize, JDBC throws
@@ -5164,12 +5164,12 @@
This is reported in [pgpool-general-jp: 1192].
- - Fix backend error of prepared statement about table which has column whoes
+ - Fix backend error of prepared statement about table which has column whose
default value is now() in replication mode (Yugo Nagata)
When pgpool parses a named prepared statement with default now(),
timestamps are replaced to additional parameters. So, Bind message also
- should inclued additional parameter format codes. However, when the
+ should included additional parameter format codes. However, when the
number of original parameter was one, pgpool didn't handle this. This
caused a error like "incorrect binary data format in bind parameter 2".
@@ -5219,7 +5219,7 @@
Per bug#74. http://www.pgpool.net/mantisbt/view.php?id=74
- doc: Modify descriptions about restrictions of parallel mode
- Muliple rows INSERT using VALUES are not supported in parallel mode.
+ Multiple rows INSERT using VALUES are not supported in parallel mode.
(Yugo Nagata)
- Avoid calling find_primary_node_repeatedly() when standby node goes
@@ -5306,7 +5306,7 @@
unnecessary 4 bytes, which did nothing bd for the execution of program.
But a bug is a bug.
- Per covery report "1111476 Wrong sizeof argument"
+ Per coverity report "1111476 Wrong sizeof argument"
- Fix "show pool_status" always shows memqcache_auto_cache_invalidation as
0. (Tatsuo Ishii)
@@ -5400,9 +5400,9 @@
string than the buffer.
Per Coverity report 1111426 "Out-of-bounds access".
- - Fix resource leak in make_persistent_db_connection. (Tatsio Ishii)
+ - Fix resource leak in make_persistent_db_connection. (Tatsuo Ishii)
- For this pupose, new static function free_persisten_db_connection_memory
+ For this purpose, new static function free_persisten_db_connection_memory
is added.
Per Coverity report #1111468.
@@ -5424,7 +5424,7 @@
* Bug fixes
- - Fix a segmentation fault on main process that could occures after backend
+ - Fix a segmentation fault on main process that could occurs after backend
error detection (Tatsuo Ishii)
This is reported in Bug track #62 by tuomas.
@@ -5491,7 +5491,7 @@
- Add mention about "-D" option to the man page. (Tatsuo Ishii)
- - Consider timeout waiting for compeletion of failback request in on line
+ - Consider timeout waiting for completion of failback request in on line
recovery (Tatsuo Ishii)
This will prevent the situation that recovery operation continues forever
@@ -5524,7 +5524,7 @@
The typical symptom is "I see SELECT is keep on running according to
pg_stat_activity". To fix this pgpool-II just exits the process and
- kill the existig connection. This is not gentle but at this point I
+ kill the existing connection. This is not gentle but at this point I
believe this is the best solution.
- Fix possible deadlock during failover with watchdog enabled
@@ -5548,7 +5548,7 @@
- Fix unnecessary degeneration caused by error on commit (Tatsuo Ishii)
In master slave mode, if master gets an error at commit, while other
- slaves are normal at commit, we don't need to degenrate any backend
+ slaves are normal at commit, we don't need to degenerate any backend
because it is likely that the "kind mismatch error" was caused by a
deferred trigger.
@@ -5565,9 +5565,9 @@
SELECT * FROM t1;
- At commit pgpool tries to delete cache for t2 but failes because
+ At commit pgpool tries to delete cache for t2 but fails because
there's no oid table entry for t2. Problem is, it fails to check oid
- table for t1. So cahce for t1 remains and the last SELECT incorrectly
+ table for t1. So cache for t1 remains and the last SELECT incorrectly
returns cached data. Fix is, continuing to check oid table entries.
This is reported in Bug track #58 by wms
@@ -5654,7 +5654,7 @@
interrupted by alarm. (Tatsuo Ishii)
This confuses health checking because connect_inet_domain_socket_by_port()
- returns unsable fd. This makes detecting errors in health checking longer.
+ returns usable fd. This makes detecting errors in health checking longer.
See the following for more details:
@@ -5669,7 +5669,7 @@
message. Problem is, the rewritten message was kept in the data which
is managed by pool_create_sent_message() etc. The function assumes
that all the data is in session context memory. However, palloc()
- allocates memory in query context of course, and gets freeed later on
+ allocates memory in query context of course, and gets freed later on
when the query context disappears. And the function tries to free the
memory as well, which causes various problems, including segfault and
double free. To fix this, memory to store rewritten message is
@@ -5691,7 +5691,7 @@
http://www.pgpool.net/pipermail/pgpool-general/2013-March/001551.html
- Fix to calculate replication delay only if standby server is behind from
- the primay server. (Yugo Nagata)
+ the primary server. (Yugo Nagata)
When the primary server is behind from standby server, negative value of
delay is calculated and the value is assigned to unsigned variable. It
@@ -5723,7 +5723,7 @@
The problem is reported in bugtrack #53.
- #53 pgpool_regclas hangs all connections
+ #53 pgpool_regclass hangs all connections
Date: 2013-04-04 13:35
Reporter: tmandke
http://www.pgpool.net/mantisbt/view.php?id=53
@@ -5768,7 +5768,7 @@
health checking. If all of following conditions are met, pgpool
main process disappeared and all client connections to pgpool-II
hang forever when failover happens. And the only way to recover
- from it is, manualy killing the pgpool child process and restart
+ from it is, manually killing the pgpool child process and restart
pgpool-II.
- health checking is enabled
@@ -5856,11 +5856,11 @@
- Fix segfault due to bug with query cache array handling. (Tatsuo Ishii)
- The cache arrary is used to keep temporary cache results in a transaction.
+ The cache array is used to keep temporary cache results in a transaction.
If there are more than 128 SELECTs in a transaction, the module expands
- cache_arrary by using realloc. However it does not record the new pointer
+ cache_array by using realloc. However it does not record the new pointer
returned by realloc. So the module keeps on using the old pointer which is
- absoleted.
+ obsoleted.
This problem is reported in bug track #31 by jgentsch.
@@ -5869,10 +5869,10 @@
Date: 2012-10-23 06:25
http://www.pgpool.net/mantisbt/view.php?id=31
- - Fix hung up while repeating pcp_attach_node and pcp_detatch_node
+ - Fix hung up while repeating pcp_attach_node and pcp_detach_node
(Tatsuo Ishii)
- When node status is changed by pcp_attach_node and pcp_detatch_node,
+ When node status is changed by pcp_attach_node and pcp_detach_node,
failover() sends SIGUSR1 to pcp_child process expecting it exits to
refresh node status. In this situation lots of pgpool children exit and
produce SIGCHLD as well. The SIGCHLD handler reaper() tries catch all
@@ -5890,7 +5890,7 @@
- Fix pool_send_severity_message() not to use uninitialized memory.
(Tatsuo Ishii)
- It cause a segmentaion fault.
+ It cause a segmentation fault.
Reported in Bug #33's attached valgrind output by dudee.
#33 pgpool-II 3.2.1 segfault
@@ -5909,7 +5909,7 @@
4) CREATE TEMP TABLE t1(i int); -- create a temp table
5) SELECT * FROM t1; -- query cache entry mistakenly created!
- Problem is #3 creates relcache entry for t1, and #5 incorrecly uses it
+ Problem is #3 creates relcache entry for t1, and #5 incorrectly uses it
and believes that temp table t1 is not a temp table.
- Add a description about "-f" to help message. (Tatsuo Ishii)
@@ -5948,7 +5948,7 @@
http://www.sraoss.jp/pipermail/pgpool-general/2012-December/001237.html
- Fix health_check() to check the health check timer before retrying
- with template1 database. (Tatuo Ishii)
+ with template1 database. (Tatsuo Ishii)
Without this, the retry with node 0 always fails because health check timer
may be already expired.
@@ -5988,7 +5988,7 @@
- Fix child_exit() to not call send_frontend_exits() if there's no
connection pool. (Tatsuo Ishii)
- Otherwise, it segfaults because send_frontend_exits() referes to objects
+ Otherwise, it segfaults because send_frontend_exits() refers to objects
pointed to by pool_connection_pool. Per bug track #44 by tuomas.
#44 pgpool went haywire after slave shutdown triggering master failover
@@ -6050,7 +6050,7 @@
stack and pop out when it is convenient. For this purpose, new
functions pool_push(), pool_pop() and pool_stacklen() are added.
- This probmel is reported in but grack #45 by rpashin.
+ This problem is reported in but grack #45 by rpashin.
#45 LISTEN/NOTIFY doesn't work if cluster contains more then 1 node in
streaming replication mode
@@ -6083,7 +6083,7 @@
See [pgpool-general: 1330] for more details.
- [pgpool-general: 1330] WatchDog and pgool sudden stop working
+ [pgpool-general: 1330] WatchDog and pgpool sudden stop working
From: Tomas Halgas
Date: Fri, 18 Jan 2013 14:47:23 +0100
http://www.sraoss.jp/pipermail/pgpool-general/2013-January/001350.html
@@ -6133,7 +6133,7 @@
sends a packet to other pgpools. However, the packet sometimes is sent
before the virtual IP is brought down completely. In this case the packet
sender is set to this IP. When the IP is brought down before other pgpools
- respond, the active pgpool can not recieve the response, and hang up.
+ respond, the active pgpool can not receive the response, and hang up.
In this fix, the active pgpool confirms that the virtual IP is brought
down before sending the packet.
@@ -6222,7 +6222,7 @@
(Tatsuo Ishii)
If one of bind parameter < 0, it was possible to produce more than 2
- byte string for "%02X" due to sign extention.
+ byte string for "%02X" due to sign extension.
Also use snprintf, rather than sprintf to prevent from possible buffer
overrun in the future.
@@ -6241,7 +6241,7 @@
- Fix typo in cache_reporting(). (Tatsuo Ishii)
- - Fix inifinit loop in SSL mode. (Tatsuo Ishii)
+ - Fix infinite loop in SSL mode. (Tatsuo Ishii)
When there's pending data in SSL layer of frontend, pool_process_query()
checks pending data in backend. If there's non, it loops again and checks
@@ -6301,7 +6301,7 @@
modules. So this fix is not Parse() only, rather for other modules. For
this purpose ProcessFrontendResponse() is changed.
- See bugtrack in detai.
+ See bugtrack in detail.
#21 pgpool-II 3.2.0 cannot execute sql through jdbc
Date: 2012-08-17 16:31
@@ -6311,7 +6311,7 @@
- Fix to set unix domain socket path for pgpool PCP communication before
setting up signal handlers. (Yugo Nagata)
- Previously, unlink of the socket in exitting process was failed because
+ Previously, unlink of the socket in exiting process was failed because
the path of the socket was not set.
Patch contributed by Gilles Darold
@@ -6374,12 +6374,12 @@
On memory cache saves pair of SELECT statements (with its Bind parameters
if the SELECT is an extended query). If the same SELECTs comes in, it
returns the value from cache. Since no SQL parsing nor access to
- PostgreSQL are involed, it's extremely fast.
+ PostgreSQL are involved, it's extremely fast.
On the other hand, it might be slower than the normal path because it
adds some overhead to store cache. Moreover when a table is updated,
pgpool automatically deletes all the caches related to the table. So the
- prformace will be degraded by a system with a lot of updates. If the
+ performance will be degraded by a system with a lot of updates. If the
cache_hit_ratio is lower than 70%, you might want to disable onl memory
cache.
@@ -6397,7 +6397,7 @@
- On memory query cache deletes the all cache of an updated table
automatically with monitoring if the executed query is UPDATE, INSERT,
ALTER TABLE and so on. But pgpool-II isn't able to recognize implicit
- updates due to trigers, foreign keys and DROP TABLE CASCADE.
+ updates due to triggers, foreign keys and DROP TABLE CASCADE.
You can avoid this problem with memqcache_expire by which pgpool deletes
old cache in a fixed time automatically, or with black_memqcache_table_list
by which pgpool's memory cache flow ignores the tables.
@@ -6410,7 +6410,7 @@
New parameters:
- - Add parameters for on memoey query cache as follows:
+ - Add parameters for on memory query cache as follows:
memory_cache_enabled, memqcache_method, memqcache_expire,
memqcache_maxcache, memqcache_oiddir. (Tatsuo Ishii)
@@ -6518,7 +6518,7 @@
* Enhancements
- - Retry if health check faied rather than immediately do failover. For
+ - Retry if health check failed rather than immediately do failover. For
this purpose new directives "health_check_max_retries" and
"health_check_retry_delay" were added. (Tatsuo Ishii)
Patch contributed by Matt Solnit.
@@ -6528,9 +6528,9 @@
Date: Fri, 18 Nov 2011 16:28:44 -0500
- Log client IP and port number when pgpool failed to parse given query.
- (Tasuo)
+ (Tatsuo)
- This is usefull to identify which client gives wrong query without
+ This is useful to identify which client gives wrong query without
enabling log_connections, which produces too many log entries on busy web
systems.
@@ -6563,14 +6563,14 @@
pgpool-II. Patch contributed by Gurjeet Singh.
- Remove unused parameter "query" from is_set_transaction_serializable().
- (Tastuo Ishii)
+ (Tatsuo Ishii)
- Fix on memory query cache section's comments in pgpool.com in the way
- which other sections employ. (Tastuo Ishii)
+ which other sections employ. (Tatsuo Ishii)
- Add missing health_check_max_retries and health_check_retry_delay
directives to pgpool.conf.sample-master-slave, pgpool.conf.sample-replication
- pgpool.conf.sample-stream. (Tastuo Ishii)
+ pgpool.conf.sample-stream. (Tatsuo Ishii)
- Fix pool_ssl_write. It seems someone forgot to do retrying when SSL
returns SSL_ERROR_WANT_READ or SSL_ERROR_WANT_WRITE.
@@ -6621,7 +6621,7 @@
- Fix segfault of pcp_systemdb_info not in parallel mode. (Nozomi Anzai)
- - Fix "unnamed prepared statment does not exist" error. (Tatsuo Ishii)
+ - Fix "unnamed prepared statement does not exist" error. (Tatsuo Ishii)
This is caused by pgpool's internal query, which breaks client's unnamed
statements. To fix this, if extended query is used, named
@@ -6730,7 +6730,7 @@
- If frontend terminates while reading large number of query results
from backend, pgpool continues to read from backend and write to
- frontend until all query results consumued. (Tatsuo Ishii)
+ frontend until all query results consumed. (Tatsuo Ishii)
This will take very long time if query results is huge. To finish pgpool
session as soon as possible, modify pool_flush_it to returns error if
@@ -6816,8 +6816,8 @@
See bug 191 for related info.
- - Fix Chinese documetation bug about raw mode (Yugo Nagata, Bo Peng)
- Connection pool is avalilable in raw mode.
+ - Fix Chinese documentation bug about raw mode (Yugo Nagata, Bo Peng)
+ Connection pool is available in raw mode.
- Fix confusing comments in pgpool.conf (Tatsuo Ishii)
@@ -6868,12 +6868,12 @@
- change the Makefile under the directory src/sql/, that is proposed (Bo Peng)
by [pgpool-hackers: 1611]
- - Fix a posible hang during health checking (Yugo Nagata)
+ - Fix a possible hang during health checking (Yugo Nagata)
- Helath checking was hang when any data wasn't sent
+ Health checking was hang when any data wasn't sent
from backend after connect(2) succeeded. To fix this,
pool_check_fd() returns 1 when select(2) exits with
- EINTR due to SIGALRM while health checkking is performed.
+ EINTR due to SIGALRM while health checking is performed.
Reported and patch provided by harukat and some modification
by Yugo. Per bug #204.
@@ -7175,7 +7175,7 @@
See [pgpool-hackers: 239][pgpool-hackers: 512].
- - Disbale statement_timeout of PostgreSQL while executing online recovery
+ - Disable statement_timeout of PostgreSQL while executing online recovery
(Tatsuo Ishii)
Online recovery may take very long time and user may enable statement
@@ -7297,7 +7297,7 @@
With JDBC, when a prepared statement is executed more than
PrepareThreshold times, the statement is named and Describe message
is sent after Parse. With named statement, pgpool rewrite now() to
- parameter in replication mode. Hence, rewritten query has additonal
+ parameter in replication mode. Hence, rewritten query has additional
parameter than original. In this case, ParameterDescription message
sent to frontend (response of Describe) should include OIDs of the
same number os original query's parameters. Otherwize, JDBC throws
@@ -7305,12 +7305,12 @@
This is reported in [pgpool-general-jp: 1192].
- - Fix backend error of prepared statement about table which has column whoes
+ - Fix backend error of prepared statement about table which has column whose
default value is now() in replication mode (Yugo Nagata)
When pgpool parses a named prepared statement with default now(),
timestamps are replaced to additional parameters. So, Bind message also
- should inclued additional parameter format codes. However, when the
+ should included additional parameter format codes. However, when the
number of original parameter was one, pgpool didn't handle this. This
caused a error like "incorrect binary data format in bind parameter 2".
@@ -7361,7 +7361,7 @@
Per bug#74. http://www.pgpool.net/mantisbt/view.php?id=74
- doc: Modify descriptions about restrictions of parallel mode
- Muliple rows INSERT using VALUES are not supported in parallel mode.
+ Multiple rows INSERT using VALUES are not supported in parallel mode.
(Yugo Nagata)
- Avoid calling find_primary_node_repeatedly() when standby node goes
@@ -7465,9 +7465,9 @@
will access out of array.
Per Coverity report 1111413 "Memory - illegal accesses".
- - Fix resource leak in make_persistent_db_connection. (Tatsio Ishii)
+ - Fix resource leak in make_persistent_db_connection. (Tatsuo Ishii)
- For this pupose, new static function free_persisten_db_connection_memory
+ For this purpose, new static function free_persisten_db_connection_memory
is added.
Per Coverity report #1111468.
@@ -7515,7 +7515,7 @@
- Add mention about "-D" option to the man page. (Tatsuo Ishii)
- - Consider timeout waiting for compeletion of failback request in on line
+ - Consider timeout waiting for completion of failback request in on line
recovery (Tatsuo Ishii)
This will prevent the situation that recovery operation continues forever
@@ -7531,7 +7531,7 @@
The typical symptom is "I see SELECT is keep on running according to
pg_stat_activity". To fix this pgpool-II just exits the process and
- kill the existig connection. This is not gentle but at this point I
+ kill the existing connection. This is not gentle but at this point I
believe this is the best solution.
- Fix bug with do_query which causes hung in extended protocol
@@ -7547,7 +7547,7 @@
- Fix unnecessary degeneration caused by error on commit (Tatsuo Ishii)
In master slave mode, if master gets an error at commit, while other
- slaves are normal at commit, we don't need to degenrate any backend
+ slaves are normal at commit, we don't need to degenerate any backend
because it is likely that the "kind mismatch error" was caused by a
deferred trigger.
@@ -7612,7 +7612,7 @@
message. Problem is, the rewritten message was kept in the data which
is managed by pool_create_sent_message() etc. The function assumes
that all the data is in session context memory. However, palloc()
- allocates memory in query context of course, and gets freeed later on
+ allocates memory in query context of course, and gets freed later on
when the query context disappears. And the function tries to free the
memory as well, which causes various problems, including segfault and
double free. To fix this, memory to store rewritten message is
@@ -7634,7 +7634,7 @@
http://www.pgpool.net/pipermail/pgpool-general/2013-March/001551.html
- Fix to calculate replication delay only if standby server is behind from
- the primay server. (Yugo Nagata)
+ the primary server. (Yugo Nagata)
When the primary server is behind from standby server, negative value of
delay is calculated and the value is assigned to unsigned variable. It
@@ -7666,7 +7666,7 @@
The problem is reported in bugtrack #53.
- #53 pgpool_regclas hangs all connections
+ #53 pgpool_regclass hangs all connections
Date: 2013-04-04 13:35
Reporter: tmandke
http://www.pgpool.net/mantisbt/view.php?id=53
@@ -7703,10 +7703,10 @@
Date: Sun, 28 Oct 2012 01:12:52 -0400
http://www.sraoss.jp/pipermail/pgpool-general/2012-October/001160.html
- - Fix hung up while repeating pcp_attach_node and pcp_detatch_node
+ - Fix hung up while repeating pcp_attach_node and pcp_detach_node
(Tatsuo Ishii)
- When node status is changed by pcp_attach_node and pcp_detatch_node,
+ When node status is changed by pcp_attach_node and pcp_detach_node,
failover() sends SIGUSR1 to pcp_child process expecting it exits to
refresh node status. In this situation lots of pgpool children exit and
produce SIGCHLD as well. The SIGCHLD handler reaper() tries catch all
@@ -7724,7 +7724,7 @@
- Fix pool_send_severity_message() not to use uninitialized memory.
(Tatsuo Ishii)
- It cause a segmentaion fault.
+ It cause a segmentation fault.
Reported in Bug #33's attached valgrind output by dudee.
#33 pgpool-II 3.2.1 segfault
@@ -7769,7 +7769,7 @@
- Fix child_exit() to not call send_frontend_exits() if there's no
connection pool. (Tatsuo Ishii)
- Otherwise, it segfaults because send_frontend_exits() referes to objects
+ Otherwise, it segfaults because send_frontend_exits() refers to objects
pointed to by pool_connection_pool. Per bug track #44 by tuomas.
#44 pgpool went haywire after slave shutdown triggering master failover
@@ -7828,7 +7828,7 @@
- Remove unnecessary/confusing debug log from s_do_auth.(Tatsuo Ishii)
- - Fix inifinit loop in SSL mode. When there's pending data in SSL layer
+ - Fix infinite loop in SSL mode. When there's pending data in SSL layer
of frontend, pool_process_query() checks pending data in backend.
(Tatsuo Ishii)
@@ -7909,13 +7909,13 @@
- Fix segfault of pcp_systemdb_info not in parallel mode. (Nozomi Anzai)
- - Fix "unnamed prepared statment does not exist" error. (Tatsuo Ishii)
+ - Fix "unnamed prepared statement does not exist" error. (Tatsuo Ishii)
This is caused by pgpool's internal query, which breaks client's
unnamed statements. To fix this, if extended query is used, named
statement/portal for internal are used for internal query.
- - Fix is_system_catalog(). Its relcach was accidently defined as
+ - Fix is_system_catalog(). Its relcache was accidently defined as
"session local". (Tatsuo Ishii)
- Fix hangup when query conflict occurs in Hot-Standby mode.
@@ -8018,7 +8018,7 @@
From 3.1 transactional statements such as "BEGIN" are sent to not only
primary but also standbys. This brings an unfortunate side effect: if
the multi statement is "BEGIN;DELETE FROM table;END", this will be
- sent to standy as well and cause an error because standby does notallow
+ sent to standby as well and cause an error because standby does notallow
write SQL. So fix is, if a query is a multi statement one, then send it
to primary only.
@@ -8035,7 +8035,7 @@
Real master node could be changed while pgpool is running in streaming
replication mode. Previously it is assigned REAL_MASTER_NODE_ID, which
- could have no connections after fail over and cause segafult.
+ could have no connections after fail over and cause segfault.
- Fix pool_setall_node_to_be_sent() to use private_backend_status instead
of BACKEND_INFO macro. (Tatsuo Ishii)
@@ -8127,7 +8127,7 @@
- Major cleanup for strncpy(Tatsuo Ishii). There are several
places where strncpy() is used. Problem is some of them do not
- consider the case when copy lengh == buffer size. In this case
+ consider the case when copy length == buffer size. In this case
copied buffer is not null terminated and may cause tons of
problems later. To fix this, most of them are replaced by
strlcpy().
@@ -8142,7 +8142,7 @@
- Fix buffer overrun problem when pcp password is longer than
32(Tatsuo Ishii).
- - Remove PGDLLIMPORTI which is only neccessary for Windows
+ - Remove PGDLLIMPORTI which is only necessary for Windows
and cause a problem for non gcc. Patch contributed by Ibrar Ahmed.
===============================================================================
@@ -8310,8 +8310,8 @@
Now restarting pgpool-II children is avoided when recovery finished. So
existing sessions can be continued while doing online recovery(Tatsuo Ishii)
- - pcp_attach_node does not diconnect existing sessions in
- streaming replication mode. In other mode, pcp_attache_node
+ - pcp_attach_node does not disconnect existing sessions in
+ streaming replication mode. In other mode, pcp_attach_node
still disconnects existing sessions(Tatsuo Ishii).
- Import PostgreSQL 9.0 parser. This allows to use CREATE INDEX with
@@ -8564,7 +8564,7 @@
See [pgpool-hackers: 239][pgpool-hackers: 512].
- - Disbale statement_timeout of PostgreSQL while executing online recovery
+ - Disable statement_timeout of PostgreSQL while executing online recovery
(Tatsuo Ishii)
Online recovery may take very long time and user may enable statement
@@ -8660,7 +8660,7 @@
With JDBC, when a prepared statement is executed more than
PrepareThreshold times, the statement is named and Describe message
is sent after Parse. With named statement, pgpool rewrite now() to
- parameter in replication mode. Hence, rewritten query has additonal
+ parameter in replication mode. Hence, rewritten query has additional
parameter than original. In this case, ParameterDescription message
sent to frontend (response of Describe) should include OIDs of the
same number os original query's parameters. Otherwize, JDBC throws
@@ -8668,12 +8668,12 @@
This is reported in [pgpool-general-jp: 1192].
- - Fix backend error of prepared statement about table which has column whoes
+ - Fix backend error of prepared statement about table which has column whose
default value is now() in replication mode (Yugo Nagata)
When pgpool parses a named prepared statement with default now(),
timestamps are replaced to additional parameters. So, Bind message also
- should inclued additional parameter format codes. However, when the
+ should included additional parameter format codes. However, when the
number of original parameter was one, pgpool didn't handle this. This
caused a error like "incorrect binary data format in bind parameter 2".
@@ -8724,7 +8724,7 @@
Per bug#74. http://www.pgpool.net/mantisbt/view.php?id=74
- doc: Modify descriptions about restrictions of parallel mode
- Muliple rows INSERT using VALUES are not supported in parallel mode.
+ Multiple rows INSERT using VALUES are not supported in parallel mode.
(Yugo Nagata)
- Avoid calling find_primary_node_repeatedly() when standby node goes
@@ -8797,9 +8797,9 @@
string than the buffer.
Per Coverity report 1111426 "Out-of-bounds access".
- - Fix resource leak in make_persistent_db_connection. (Tatsio Ishii)
+ - Fix resource leak in make_persistent_db_connection. (Tatsuo Ishii)
- For this pupose, new static function free_persisten_db_connection_memory
+ For this purpose, new static function free_persisten_db_connection_memory
is added.
Per Coverity report #1111468.
@@ -8847,7 +8847,7 @@
- Add mention about "-D" option to the man page. (Tatsuo Ishii)
- - Consider timeout waiting for compeletion of failback request in on line
+ - Consider timeout waiting for completion of failback request in on line
recovery (Tatsuo Ishii)
This will prevent the situation that recovery operation continues forever
@@ -8859,7 +8859,7 @@
The typical symptom is "I see SELECT is keep on running according to
pg_stat_activity". To fix this pgpool-II just exits the process and
- kill the existig connection. This is not gentle but at this point I
+ kill the existing connection. This is not gentle but at this point I
believe this is the best solution.
- Fix bug with do_query which causes hung in extended protocol
@@ -8875,7 +8875,7 @@
- Fix unnecessary degeneration caused by error on commit (Tatsuo Ishii)
In master slave mode, if master gets an error at commit, while other
- slaves are normal at commit, we don't need to degenrate any backend
+ slaves are normal at commit, we don't need to degenerate any backend
because it is likely that the "kind mismatch error" was caused by a
deferred trigger.
@@ -8961,7 +8961,7 @@
message. Problem is, the rewritten message was kept in the data which
is managed by pool_create_sent_message() etc. The function assumes
that all the data is in session context memory. However, palloc()
- allocates memory in query context of course, and gets freeed later on
+ allocates memory in query context of course, and gets freed later on
when the query context disappears. And the function tries to free the
memory as well, which causes various problems, including segfault and
double free. To fix this, memory to store rewritten message is
@@ -8983,7 +8983,7 @@
http://www.pgpool.net/pipermail/pgpool-general/2013-March/001551.html
- Fix to calculate replication delay only if standby server is behind from
- the primay server. (Yugo Nagata)
+ the primary server. (Yugo Nagata)
When the primary server is behind from standby server, negative value of
delay is calculated and the value is assigned to unsigned variable. It
@@ -9015,7 +9015,7 @@
The problem is reported in bugtrack #53.
- #53 pgpool_regclas hangs all connections
+ #53 pgpool_regclass hangs all connections
Date: 2013-04-04 13:35
Reporter: tmandke
http://www.pgpool.net/mantisbt/view.php?id=53
@@ -9055,7 +9055,7 @@
- Fix pool_send_severity_message() not to use uninitialized memory.
(Tatsuo Ishii)
- It cause a segmentaion fault.
+ It cause a segmentation fault.
Reported in Bug #33's attached valgrind output by dudee.
#33 pgpool-II 3.2.1 segfault
@@ -9098,7 +9098,7 @@
- Fix child_exit() to not call send_frontend_exits() if there's no
connection pool. (Tatsuo Ishii)
- Otherwise, it segfaults because send_frontend_exits() referes to objects
+ Otherwise, it segfaults because send_frontend_exits() refers to objects
pointed to by pool_connection_pool. Per bug track #44 by tuomas.
#44 pgpool went haywire after slave shutdown triggering master failover
@@ -9159,7 +9159,7 @@
- Remove unnecessary/confusing debug log from s_do_auth.(Tatsuo Ishii)
- - Fix inifinit loop in SSL mode. When there's pending data in SSL layer
+ - Fix infinite loop in SSL mode. When there's pending data in SSL layer
of frontend, pool_process_query() checks pending data in backend.
(Tatsuo Ishii)
@@ -9230,13 +9230,13 @@
- Fix segfault of pcp_systemdb_info not in parallel mode. (Nozomi Anzai)
- - Fix "unnamed prepared statment does not exist" error. (Tatsuo Ishii)
+ - Fix "unnamed prepared statement does not exist" error. (Tatsuo Ishii)
This is caused by pgpool's internal query, which breaks client's
unnamed statements. To fix this, if extended query is used, named
statement/portal for internal are used for internal query.
- - Fix is_system_catalog(). Its relcach was accidently defined as
+ - Fix is_system_catalog(). Its relcache was accidently defined as
"session local". (Tatsuo Ishii)
- Improve reading and writing pid_file. (Tatsuo Ishii)
@@ -9412,7 +9412,7 @@
- Fix bug with pcp_connect() which causes double free. Patch
contributed by Jehan-Guillaume (ioguix) de Rorthais(Tatsuo Ishii)
- - Fix bug with start_recoery() which is apparently wrong usage of
+ - Fix bug with start_recovery() which is apparently wrong usage of
PQfinish()(Tatsuo Ishii)
- Fix incorrect error message which is sent to the frontend when
@@ -9652,8 +9652,8 @@
connection pool or not are added to pcp_proc_info's
output(Tatsuo Ishii)
- - "Gracefuly detach" option is added to pcp_detatch_node. With
- this option, pcp_detatch_node waits until all frontends
+ - "Gracefully detach" option is added to pcp_detach_node. With
+ this option, pcp_detach_node waits until all frontends
disconnected(Tatsuo Ishii)
- New directive "white_function_list" and "black_function_list"
@@ -9724,7 +9724,7 @@
- Fix bug with timeout handling in pcp commands(Tatsuo Ishii)
- - Fix SSL hang when large amount of data transfered(Tatsuo Ishii)
+ - Fix SSL hang when large amount of data transferred(Tatsuo Ishii)
- Fix failover when there's only one DB node(Tatsuo Ishii)
@@ -9903,7 +9903,7 @@
- Fix possible crash during creating "kind mismatch" error
message. This used to work but was broken in 2.3.2(Tatsuo Ishii)
- - Fix bug with healh checking. If a network problem such as
+ - Fix bug with health checking. If a network problem such as
unplugged wire happens while calling connect(), health
checking does not work since
connect_unix_domain_socket()/connect_inet_domain_socket() do
@@ -9916,7 +9916,7 @@
SimpleForwardToBackend. Per bug report from Bugtrack #1010771.
Report from Peter Pramberge(Tatsuo Ishii)
- - Fix rewriting "*" in paralell query. Patch conributed by
+ - Fix rewriting "*" in parallel query. Patch contributed by
sho-san(Toshihiro Kitagawa)
- Fix connect_inet_domain_socket_by_port() so that it print out
@@ -9949,7 +9949,7 @@
* Version 2.3.2.1
- This version fixes bug in 2.3.x. It is identfied that
+ This version fixes bug in 2.3.x. It is identified that
pgpool-II 2.3.x has a problem with erroneous query
processing(Akio Ishida).
@@ -9976,9 +9976,9 @@
later, however(Tatsuo Ishii)
- Emit statement log when error or notice message comes from
- query parsing process. This is usefull because PostgreSQL does
+ query parsing process. This is useful because PostgreSQL does
not log particular statement if the error was detected
- *before* raw parser get executed. This typlically happens
+ *before* raw parser get executed. This typically happens
when encoding error was found(Tatsuo Ishii)
- Display original query to log if kind mismatch error was
@@ -9994,7 +9994,7 @@
* Bug fixes
- - Fix errors in timestamp rewriting which occasionaly cause
+ - Fix errors in timestamp rewriting which occasionally cause
broken packet sentto slave nodes(Tatsuo Ishii)
- Fix errors when timestamp rewriting is used with V2
@@ -10007,7 +10007,7 @@
when smart shutdown signal has been sent. This has been used
to work in 2.2(Toshihiro Kitagawa)
- - Fix ProcessFrontendResponse not to accept invalid frotend
+ - Fix ProcessFrontendResponse not to accept invalid frontend
packet(Xavier Noguer)
- Use %dz for sizeof in fprintf for more portability(Tatsuo Ishii)
@@ -10040,7 +10040,7 @@
- INSERT or UPDATE are used which explicitly include now(),
- CURRENT_TIMESTAMP, CURRENT_DATE, CURRENT_TIME. Or the target
- Table's default value use above functions
- - The SQL statement inclludes out of 32bit
+ - The SQL statement includes out of 32bit
integer value(-2147483648 to 2147483647 in decimal)
Example SQL: INSERT INTO t1(id, regdate) VALUES(98887776655,
@@ -10060,7 +10060,7 @@
This version enhances replication, especially CURRENT_TIMESTAMP,
CURRENT_DATE, now() etc. now can be properly replicated. Also
- perforance of replication when num_init_children == 1 is
+ performance of replication when num_init_children == 1 is
enhanced. Pgpool-II now records the status of down nodes, and
remember when it restarts to ensure that keep the node status as
before. Also some logs are enhanced and more fine fail over
@@ -10082,7 +10082,7 @@
- Enable proper replication of results of temporal functions
(CURRENT_TIMESTAMP, CURRENT_DATE, now() etc.). Now
applications can execute INSERT/UPDATE tables which include
- defaut values using those temporal functions. There are small
+ default values using those temporal functions. There are small
limitations. See restriction sections of docs for more
details (Akio Ishida)
@@ -10096,7 +10096,7 @@
it easier which query is sent to which DB node(Tatsuo Ishii)
- Add new directive fail_over_on_backend_error to control the
- behaviro of fail over(Tatsuo Ishii)
+ behavior of fail over(Tatsuo Ishii)
- Record DB node status and remember when pgpool-II restarts(Tatsuo Ishii)
@@ -10218,11 +10218,11 @@
- In master/slave mode, execute Parse message on only master
node. In previous versions Parse executed on all nodes, which
- grabbed unneccessary lock(Tatsuo Ishii)
+ grabbed unnecessary lock(Tatsuo Ishii)
- Remove init script from all runlevels before uninstall(Devrim)
- - Fix pgpoo.spec(Devrim)
+ - Fix pgpool.spec(Devrim)
- Do not execute REINDEX DATABASE or SYSTEM, CREATE/DROP TABLE
SPACE inside a transaction block(Tatsuo Ishii)
@@ -10231,14 +10231,14 @@
* Enhancements
- - Allow to change weight by reloading pgool.conf. This will take
+ - Allow to change weight by reloading pgpool.conf. This will take
effect for next client sessions(Tatsuo Ishii)
- - Reply with usefull error messages, rather than "server closed
+ - Reply with useful error messages, rather than "server closed
the connection unexpectedly" when authentication fails(Glyn
Astill)
- - Add info to logs when writing to sockets falis to know if it
+ - Add info to logs when writing to sockets fails to know if it
was for backend or frontend(Tatsuo Ishii)
- Do not complain when writing to socket of frontend
@@ -10271,7 +10271,7 @@
other cases such as internal locks are issued and Parse
(Tatsuo Ishii)
- - Fix inifinit loop in reset_backend(Xavier Noguer, Tatsuo)
+ - Fix infinite loop in reset_backend(Xavier Noguer, Tatsuo)
- Fix Parse() to print actual query when it detects kind
mismatch error(Tatsuo Ishii)
@@ -10295,9 +10295,9 @@
DML/DDL call might sent to only master node(Tatsuo Ishii)
- Send NOTICE message to frontend periodically if V2 protocol is
- used. This is ifdef out since it affectes visible change to
- applications. 2.2.3 unconditionaly sends param packet to
- client even it uses version 2 protocol, which is apparentlt
+ used. This is ifdef out since it affects visible change to
+ applications. 2.2.3 unconditionally sends param packet to
+ client even it uses version 2 protocol, which is apparently
wrong. Also tweak checking period from 1 second to 30 seconds
since 1 second seems too aggressive(Tatsuo Ishii)
@@ -10325,7 +10325,7 @@
- Fix message corruption for kid mismatch error(Akio Ishida)
- - Now stetmemt_time works(Tatsuo Ishii)
+ - Now statement_time works(Tatsuo Ishii)
- Enhance health checking to detect postmaster stopping by
SIGSTOP(Tatsuo Ishii)
@@ -10355,8 +10355,8 @@
* Version 2.2.2
This version fixes various bugs in 2.2.1 or before. Please note
- that an importan fix is made to avoid data incositency risk,
- which could happen when client does not exit gracely(without
+ that an important fix is made to avoid data inconsistency risk,
+ which could happen when client does not exit gracefully(without
sending "X" packet) while pgpool is trying to send data to
it. This could happen with all version of pgpool-II.
@@ -10366,7 +10366,7 @@
- Ignore write error on frontend connection. This is needed to
continue processing with backend, otherwise we risk data
- incositency(Tatsuo Ishii)
+ inconsistency(Tatsuo Ishii)
- Fix bug introduced in 2.2.1 (In master slave mode, sometimes
DEALLOCATE fails). If prepared statement reused, pgpool
@@ -10396,7 +10396,7 @@
- Update pgpool.spec along with related files(Devrim)
- - Fix inser_lock so that it is ignored when protocol version is
+ - Fix insert_lock so that it is ignored when protocol version is
2(Tatsuo Ishii)
- Remove excessive log messages regarding parameter change notice(Tatsuo Ishii)
@@ -10437,7 +10437,7 @@
- Add -d option to pcp commands(Jun Kuriyama)
- - Enahnce kind mismatch error message to include originarl
+ - Enhance kind mismatch error message to include original
query string(Tatsuo Ishii)
__________________________________________________________________
@@ -10489,7 +10489,7 @@
M: <-- error
S: <-- ok since no previous SELECT is sent. kind mismatch error occurs!
- - Process status display has extra space on FreeeBSD(Jun Kuriyama)
+ - Process status display has extra space on FreeBSD(Jun Kuriyama)
- Fix incorrect kind mismatch detection case. e.g: BEGIN;
BEGIN; (Tatsuo Ishii)
@@ -10500,7 +10500,7 @@
return ReadyForQuery. This due to a wrong assumption for the
client/server protocol(Tatsuo Ishii)
- - Fix the case when sending an erronous query to abort
+ - Fix the case when sending an erroneous query to abort
transaction. It assumed that after sending an error query,
always ReadyForQuery came right after that. If some
debugging or logging verboseness is set, PostgreSQL might
@@ -10621,7 +10621,7 @@
- Fix INSERT failure. (Yoshiharu Mori)
- Fix syntax error when a query contains "AS" in FROM
clause. (sho)
- - Fix Hung up when two or more statment was executed
+ - Fix Hung up when two or more statement was executed
in parallel mode (Yoshiharu Mori)
- Fix Query rewriting of Join Expression and DISTINCT ON
(Yoshiharu Mori)
@@ -10656,7 +10656,7 @@
* General
- Allow to reload pgpool.conf(Yoshiyuki Asaba)
- - The paraser is now compatible with PostgreSQL 8.3(Yoshiyuki Asaba)
+ - The parser is now compatible with PostgreSQL 8.3(Yoshiyuki Asaba)
- Add new directive "failover_command" to specify command when
a node is detached(Yoshiyuki Asaba)
- Add new directive "client_idle_limit" to specify the time out since
@@ -10667,12 +10667,12 @@
* Replication
- Always start a new transaction even if the query is not in
- an explicit transaction to enhance the reliabilty of
+ an explicit transaction to enhance the reliability of
replication(Yoshiyuki Asaba)
- Enhance the performance of replication for write
queries. Now the worst case is 1/2 compared with single DB
node regardless the number of DB nodes. Previous release
- tends to degrade according to the numer of DB
+ tends to degrade according to the number of DB
nodes(Yoshiyuki Asaba)
- Add "online recovery" which allows to add a DB node and sync
with other DB nodes without stopping the pgpool
@@ -10741,7 +10741,7 @@
- If it is true, SELECT query is replicated. This behavior is
same as V3.2 or earlier.
* Improve signal handling. (Yoshiyuki Asaba)
- - Occasionaly, zombie processes were remained. Or processes
+ - Occasionally, zombie processes were remained. Or processes
were unstable.
* Fix hang up when SELECT was error inside a transaction
block. The bug was introduced in V3.3. (Yoshiyuki Asaba)
@@ -10784,7 +10784,7 @@
* Improve replication. SELECT nextval() and SELECT setval() are
now replicated. (Yoshiyuki Asaba)
* Change SELECT query is only sent to the master node. (Yoshiyuki Asaba)
- - Use /*REPLICATION*/ comment to repliate a SELECT query.
+ - Use /*REPLICATION*/ comment to replicate a SELECT query.
* Fix unexpected failover error due to receiving an interrupt
signal while connecting to the backend. (Yoshiyuki Asaba)
* Add "pgpool.pam" file, for PAM configuration file, to be
diff --git a/README.build b/README.build
index f96d29096..0b7544aa5 100644
--- a/README.build
+++ b/README.build
@@ -1,6 +1,6 @@
This memo explains the rule how to build pgpool-II source tree using
autotools and need to push derived files such as Makefile.in into
-pgpool-II official source reporsitory.
+pgpool-II official source repository.
So the rule does not apply to:
diff --git a/README.online-recovery b/README.online-recovery
index efdc3dcb0..5b9aeb92f 100644
--- a/README.online-recovery
+++ b/README.online-recovery
@@ -19,7 +19,7 @@
*
*/
-How does online reconvery work?
+How does online recovery work?
pcp_recovery_node calls pcp_recovery_node() API
@@ -31,7 +31,7 @@ pcp_recovery_node(int node_id) does:
pcp_child calls start_recovery() and waits for its completion
start_recovery() sets Req_info->kind to NODE_RECOVERY_REQUEST
- start_recovery calls execute_checkpoint() execute CHEKPOINT
+ start_recovery calls execute_checkpoint() execute CHECKPOINT
command
start_recovery calls exec_recovery
exec_recovery executes SELECT pgpool_recovery()
@@ -40,7 +40,7 @@ pcp_recovery_node(int node_id) does:
/* start 2nd stage */
sets InRecovery to 1
wait_connection_closed() to wait for all frontend exits
- calls execute_checkpoint() execute CHEKPOINT
+ calls execute_checkpoint() execute CHECKPOINT
calls exec_recovery to execute 2nd stage script
calls exec_remote_start to start postmaster
calls check_postmaster_started to wait for postmaster starts
diff --git a/TODO b/TODO
index 9028c3f3e..c109dcb80 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@ $Header$
* General
-- Reset application name to "pgppol" when client disconnects(3.1. why
+- Reset application name to "pgpool" when client disconnects(3.1. why
not use set command?) -> Done.
- Use reset_query_list to reset to "pgpool" for client disconnection
- Reset to client specified application name when reusing existing
@@ -55,11 +55,11 @@ $Header$
- Cache invalidation
-- More effcient cache (memcache?)
+- More efficient cache (memcache?)
* Log
-- Mutiple log levels(3.1, but low priority)
+- Multiple log levels(3.1, but low priority)
- Multiple log destinations(3.1, but low priority)
@@ -91,7 +91,7 @@ LINE 1: SELECT pool_parallel("SELECT d1.id, d1.aaaa, d1.bbbb...
- Allow to run pgpoolAdmin on a host different from a host which
pgpool-II is running on(3.2?)
-- Allow to stop PostgeSQL from pgpoolAdmin to make the on-line
+- Allow to stop PostgreSQL from pgpoolAdmin to make the on-line
recovery more convenient(pgpool_stop()?)
* Docs
diff --git a/doc.ja/src/sgml/failover.sgml b/doc.ja/src/sgml/failover.sgml
index 68798a1f0..9e1ba8a1c 100644
--- a/doc.ja/src/sgml/failover.sgml
+++ b/doc.ja/src/sgml/failover.sgml
@@ -306,7 +306,7 @@
<productname>Pgpool-II</productname>はコマンド実行の前に、以下の特殊文字をバックエンドの具体的な情報に置き換えます。
</para>
- <table id="ffailback-command-table">
+ <table id="failback-command-table">
<!--
<title>failback command options</title>
-->
diff --git a/doc.ja/src/sgml/ref/allfiles.sgml b/doc.ja/src/sgml/ref/allfiles.sgml
index 69bf19226..1af1c380d 100644
--- a/doc.ja/src/sgml/ref/allfiles.sgml
+++ b/doc.ja/src/sgml/ref/allfiles.sgml
@@ -24,7 +24,7 @@ Complete list of usable sgml source files in this directory.
<!ENTITY pgproto SYSTEM "pgproto.sgml">
<!ENTITY pgpool SYSTEM "pgpool.sgml">
<!ENTITY pgpoolSetup SYSTEM "pgpool_setup.sgml">
-<!ENTITY watchdoglSetup SYSTEM "watchdog_setup.sgml">
+<!ENTITY watchdogSetup SYSTEM "watchdog_setup.sgml">
<!ENTITY pgpoolShow SYSTEM "pgpool_show.sgml">
<!ENTITY pgpoolReset SYSTEM "pgpool_reset.sgml">
<!ENTITY pgpoolSet SYSTEM "pgpool_set.sgml">
diff --git a/doc.ja/src/sgml/ref/show_pool_cache.sgml b/doc.ja/src/sgml/ref/show_pool_cache.sgml
index a977b137a..08467926e 100644
--- a/doc.ja/src/sgml/ref/show_pool_cache.sgml
+++ b/doc.ja/src/sgml/ref/show_pool_cache.sgml
@@ -58,7 +58,7 @@
num_hash_entries | 131072
used_hash_entries | 99992
num_cache_entries | 99992
- used_cache_enrties_size | 12482600
+ used_cache_entries_size | 12482600
free_cache_entries_size | 54626264
fragment_cache_entries_size | 0
</programlisting>
diff --git a/doc.ja/src/sgml/ref/show_pool_health_check_stats.sgml b/doc.ja/src/sgml/ref/show_pool_health_check_stats.sgml
index eaa38e39a..f5f03f2bb 100644
--- a/doc.ja/src/sgml/ref/show_pool_health_check_stats.sgml
+++ b/doc.ja/src/sgml/ref/show_pool_health_check_stats.sgml
@@ -197,7 +197,7 @@
</row>
<row>
- <entry>last_falied_health_check</entry>
+ <entry>last_failed_health_check</entry>
<entry>
最後にヘルスチェックに失敗した時刻。
まだヘルスチェックが失敗していない場合は空文字です。
diff --git a/doc.ja/src/sgml/reference.sgml b/doc.ja/src/sgml/reference.sgml
index b7c7daa83..3e7291ffb 100644
--- a/doc.ja/src/sgml/reference.sgml
+++ b/doc.ja/src/sgml/reference.sgml
@@ -179,7 +179,7 @@
&pgEnc;
&pgproto;
&pgpoolSetup;
- &watchdoglSetup;
+ &watchdogSetup;
&wdCli;
</reference>
diff --git a/doc.ja/src/sgml/stylesheet.css b/doc.ja/src/sgml/stylesheet.css
index c4e185f0e..1cb5f406f 100644
--- a/doc.ja/src/sgml/stylesheet.css
+++ b/doc.ja/src/sgml/stylesheet.css
@@ -122,7 +122,7 @@ BLOCKQUOTE.NOTE, BLOCKQUOTE.TIP, table.CAUTION, table.WARNING, div.note, div.tip
max-width: 720px;
border-width: 1px;
border-style: solid;
- overfileow: auto;
+ overflow: auto;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
-khtml-border-radius: 8px;
diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index cedf5b74d..74cf9f17a 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -282,7 +282,7 @@
Below table details the message fields and description.
</para>
- <table id="wd-ipc-resutl-format-table">
+ <table id="wd-ipc-result-format-table">
<title>Watchdog IPC result packet format</title>
<tgroup cols="3">
<thead>
@@ -571,7 +571,7 @@
</sect1>
<sect1 id="tutorial-advanced-arch">
- <title>Architecure of the watchdog</title>
+ <title>Architecture of the watchdog</title>
<para>
Watchdog is a sub process of <productname>Pgpool-II</productname>,
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index b248573c2..b1e01b8e5 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -794,7 +794,7 @@
</indexterm>
<para>
- This authentication method uses LDAP as the password cerification method.
+ This authentication method uses LDAP as the password certification method.
LDAP is used only to validate the user name/password pairs. Therefore the user must
already exist in the database before LDAP can be used for authentication.
</para>
@@ -992,8 +992,8 @@ ldap[s]://<replaceable>host</replaceable>[:<replaceable>port</replaceable>]/<rep
<term><literal>backendusepasswd</literal></term>
<listitem>
<para>
- Set to 1 to make the password used for LDAP authentication use authetication
- between <productname>Pgpool-II</productname> and backendd.
+ Set to 1 to make the password used for LDAP authentication use authentication
+ between <productname>Pgpool-II</productname> and backend.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/connection-settings.sgml b/doc/src/sgml/connection-settings.sgml
index a219b825e..d48e6ef4f 100644
--- a/doc/src/sgml/connection-settings.sgml
+++ b/doc/src/sgml/connection-settings.sgml
@@ -881,7 +881,7 @@ backend_clustering_mode = 'native_replication'
<para>
This mode is similar to the native replication mode except it adds
- the visibility consistency among nodes. The implemenation is based
+ the visibility consistency among nodes. The implementation is based
on a research paper <xref linkend="mishima2009">.
To enable this mode, use 'snapshot_isolation' for
<varname>backend_clustering_mode</varname>.
diff --git a/doc/src/sgml/example-cluster.sgml b/doc/src/sgml/example-cluster.sgml
index f54dc3def..ca195fce9 100644
--- a/doc/src/sgml/example-cluster.sgml
+++ b/doc/src/sgml/example-cluster.sgml
@@ -36,7 +36,7 @@
</para>
<note>
<para>
- The roles of <literal>Active</literal>, <literal>Standy</literal>, <literal>Primary</literal>,
+ The roles of <literal>Active</literal>, <literal>Standby</literal>, <literal>Primary</literal>,
<literal>Standby</literal> are not fixed and may be changed by further operations.
</para>
</note>
@@ -442,7 +442,7 @@ server3:5432:postgres:postgres:<postgres user passowrd>
<title>Create pgpool_node_id</title>
<para>
From <productname>Pgpool-II</productname> 4.2, now all configuration parameters are identical on all hosts.
- If <literal>watchdog</literal> feature is enabled, to distingusish which host is which,
+ If <literal>watchdog</literal> feature is enabled, to distinguish which host is which,
a <filename>pgpool_node_id</filename> file is required.
You need to create a <filename>pgpool_node_id</filename> file and specify the pgpool (watchdog) node number
(e.g. 0, 1, 2 ...) to identify pgpool (watchdog) host.
@@ -678,7 +678,7 @@ PCP_USER=pgpool
then we use <xref linkend="PG-MD5"> to create the encrypted password entry for <literal>pgpool</literal> user as below:
</para>
<programlisting>
-[all servers]# echo 'pgpool:'`pg_md5 PCP passowrd` >> /etc/pgpool-II/pcp.conf
+[all servers]# echo 'pgpool:'`pg_md5 PCP password` >> /etc/pgpool-II/pcp.conf
</programlisting>
<para>
Since <filename>follow_primary.sh</filename> script must execute PCP command without entering a
@@ -804,7 +804,7 @@ host all postgres 0.0.0.0/0 scram-sha-256
[all servers]$ pg_enc -m -k ~/.pgpoolkey -u pgpool -p
db password: [pgpool user's password]
[all servers]$ pg_enc -m -k ~/.pgpoolkey -u postgres -p
-db password: [postgres user's passowrd]
+db password: [postgres user's password]
# cat /etc/pgpool-II/pool_passwd
pgpool:AESheq2ZMZjynddMWk5sKP/Rw==
@@ -898,7 +898,7 @@ pgpool_port2 = 9999
<para>
Specify the method of lifecheck <xref linkend="guc-wd-lifecheck-method">
and the lifecheck interval <xref linkend="guc-wd-interval">.
- Here, we use <literal>hearbeat</literal> method to perform watchdog lifecheck.
+ Here, we use <literal>heartbeat</literal> method to perform watchdog lifecheck.
</para>
<programlisting>
wd_lifecheck_method = 'heartbeat'
@@ -968,7 +968,7 @@ wd_escalation_command = '/etc/pgpool-II/escalation.sh'
<para>
Basically, it should work if you change the following variables according to your environment.
- PGPOOL is tha array of the hostname that runnig Pgpool-II.
+ PGPOOL is tha array of the hostname that running Pgpool-II.
VIP is the virtual IP address that you set as delegate_IP.
DEVICE is the network interface for the virtual IP.
</para>
@@ -1138,7 +1138,7 @@ node_id | hostname | port | status | lb_weight | role | select_cnt | load_bal
Password:
3 YES server1:9999 Linux server1 server1
-server1:9999 Linux server1 server1 9999 9000 4 LEADER #The Pgpool-II server started first becames "LEADER".
+server1:9999 Linux server1 server1 9999 9000 4 LEADER #The Pgpool-II server started first became "LEADER".
server2:9999 Linux server2 server2 9999 9000 7 STANDBY #run as standby
server3:9999 Linux server3 server3 9999 9000 7 STANDBY #run as standby
</programlisting>
diff --git a/doc/src/sgml/failover.sgml b/doc/src/sgml/failover.sgml
index 1225a5ef7..bd70a2368 100644
--- a/doc/src/sgml/failover.sgml
+++ b/doc/src/sgml/failover.sgml
@@ -272,7 +272,7 @@
before executing the command.
</para>
- <table id="ffailback-command-table">
+ <table id="failback-command-table">
<title>failback command options</title>
<tgroup cols="2">
<thead>
@@ -671,7 +671,7 @@
<para>
To use this feature, streaming replication check (see <xref linkend="runtime-streaming-replication-check"> for more details)
must be enabled, and <productname>PostgreSQL</productname> 9.1 or later
- is required as backend nodes. This feature uses <function>pg_stat_replicatoin</function>
+ is required as backend nodes. This feature uses <function>pg_stat_replication</function>
on primary node. The automatic failback is performed on standby node only.
Note that failback_command will be executed as well if failback_command is not empty.
If you plan to detach standby node for maintenance, set this parameter to off beforehand.
@@ -684,7 +684,7 @@
<note>
<para>
<xref linkend="guc-auto-failback"> may not work, when replication slot is used.
- There is possibility that the streaming replication is stopped, bacause
+ There is possibility that the streaming replication is stopped, because
<xref linkend="guc-failover-command"> is executed and replication slot is deleted by
the command.
</para>
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index b921c6d6a..c0a8c6f05 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -184,7 +184,7 @@
create a robust cluster system and avoid the single point of failure or split brain.
To avoid the split brain, you need at least 3 <productname>Pgpool-II</productname> nodes.
Watchdog can perform lifecheck against other <productname>pgpool-II</productname> nodes,
- to detect a fault of <productname>Pgpoll-II</productname>.
+ to detect a fault of <productname>Pgpool-II</productname>.
If active <productname>Pgpool-II</productname> goes down, standby
<productname>Pgpool-II</productname> can be promoted to active, and take over Virtual IP.
</para>
diff --git a/doc/src/sgml/loadbalance.sgml b/doc/src/sgml/loadbalance.sgml
index c87c86c66..62a72ccf2 100644
--- a/doc/src/sgml/loadbalance.sgml
+++ b/doc/src/sgml/loadbalance.sgml
@@ -229,7 +229,7 @@
</para>
</sect2>
- <sect2 id="runtime-config-load-balancing-in-streaming-raplication">
+ <sect2 id="runtime-config-load-balancing-in-streaming-replication">
<title>Load Balancing in Streaming Replication</title>
@@ -1038,7 +1038,7 @@
<listitem>
<para>
- To prevent load balancing of READ dependent objects, you may specificy the object name
+ To prevent load balancing of READ dependent objects, you may specify the object name
followed by a colon(<literal>:</>) and then a comma(<literal>,</>) separated list of dependent object names.
<replaceable>"[object]:[dependent-object]"</replaceable>
In an explicit transaction block after a WRITE statement has been issues, this will prevent
diff --git a/doc/src/sgml/performance.sgml b/doc/src/sgml/performance.sgml
index 3f7594e78..118e6a7ec 100644
--- a/doc/src/sgml/performance.sgml
+++ b/doc/src/sgml/performance.sgml
@@ -15,7 +15,7 @@
how to tune them.
</para>
- <sect1 id="resource-requiremente">
+ <sect1 id="resource-requirement">
<title>Resource Requirement</title>
<para>
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index e931dd021..aa55db096 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -24,7 +24,7 @@ Complete list of usable sgml source files in this directory.
<!ENTITY pgproto SYSTEM "pgproto.sgml">
<!ENTITY pgpool SYSTEM "pgpool.sgml">
<!ENTITY pgpoolSetup SYSTEM "pgpool_setup.sgml">
-<!ENTITY watchdoglSetup SYSTEM "watchdog_setup.sgml">
+<!ENTITY watchdogSetup SYSTEM "watchdog_setup.sgml">
<!ENTITY pgpoolShow SYSTEM "pgpool_show.sgml">
<!ENTITY pgpoolReset SYSTEM "pgpool_reset.sgml">
<!ENTITY pgpoolSet SYSTEM "pgpool_set.sgml">
diff --git a/doc/src/sgml/ref/pcp_proc_info.sgml b/doc/src/sgml/ref/pcp_proc_info.sgml
index fa962aef0..de07f3079 100644
--- a/doc/src/sgml/ref/pcp_proc_info.sgml
+++ b/doc/src/sgml/ref/pcp_proc_info.sgml
@@ -101,7 +101,7 @@ Pgpool-II documentation
6. protocol minor version
7. connection-reuse counter
8. PostgreSQL backend process id
- 9. 1 if frontend conncted 0 if not
+ 9. 1 if frontend connected 0 if not
10. pgpool child process id
11. PostgreSQL backend id
</literallayout>
diff --git a/doc/src/sgml/ref/pcp_watchdog_info.sgml b/doc/src/sgml/ref/pcp_watchdog_info.sgml
index d9a29d3e7..df75edf21 100644
--- a/doc/src/sgml/ref/pcp_watchdog_info.sgml
+++ b/doc/src/sgml/ref/pcp_watchdog_info.sgml
@@ -42,8 +42,8 @@ Pgpool-II documentation
<variablelist>
<varlistentry>
- <term><option>-n <replaceable class="parameter">watcgdog_id</replaceable></option></term>
- <term><option>--node-id=<replaceable class="parameter">watcgdog_id</replaceable></option></term>
+ <term><option>-n <replaceable class="parameter">watchdog_id</replaceable></option></term>
+ <term><option>--node-id=<replaceable class="parameter">watchdog_id</replaceable></option></term>
<listitem>
<para>
The index of other Pgpool-II to get information for.
diff --git a/doc/src/sgml/ref/show_pool_cache.sgml b/doc/src/sgml/ref/show_pool_cache.sgml
index c085a4d58..4052edd70 100644
--- a/doc/src/sgml/ref/show_pool_cache.sgml
+++ b/doc/src/sgml/ref/show_pool_cache.sgml
@@ -48,7 +48,7 @@
num_hash_entries | 131072
used_hash_entries | 99992
num_cache_entries | 99992
- used_cache_enrties_size | 12482600
+ used_cache_entries_size | 12482600
free_cache_entries_size | 54626264
fragment_cache_entries_size | 0
</programlisting>
diff --git a/doc/src/sgml/ref/show_pool_health_check_stats.sgml b/doc/src/sgml/ref/show_pool_health_check_stats.sgml
index ff2a0e34d..9e53f4805 100644
--- a/doc/src/sgml/ref/show_pool_health_check_stats.sgml
+++ b/doc/src/sgml/ref/show_pool_health_check_stats.sgml
@@ -208,7 +208,7 @@
</row>
<row>
- <entry>last_falied_health_check</entry>
+ <entry>last_failed_health_check</entry>
<entry>
Timestamp of last failed health check. If heath check does not
fail yet, empty string. Note that it is possible that this
diff --git a/doc/src/sgml/ref/show_pool_nodes.sgml b/doc/src/sgml/ref/show_pool_nodes.sgml
index 2b1891aec..5898fd42d 100644
--- a/doc/src/sgml/ref/show_pool_nodes.sgml
+++ b/doc/src/sgml/ref/show_pool_nodes.sgml
@@ -45,7 +45,7 @@
<productname>Pgpool-II</productname> is connecting to backend by
using UNIX domain sockets. The SELECT count does not include
internal queries used
- by <productname>Pgoool-II</productname>. Also the counters are
+ by <productname>Pgpool-II</productname>. Also the counters are
reset to zero upon starting up
of <productname>Pgpool-II</productname>. The last status change
time is initially set to the
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index 0841e482f..bb09521de 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -5,7 +5,7 @@
<partintro>
<para>
- This part contains reference information for the <productname>Pgool-II</productname>.
+ This part contains reference information for the <productname>Pgpool-II</productname>.
</para>
<para>
@@ -123,7 +123,7 @@
&pgEnc;
&pgproto;
&pgpoolSetup;
- &watchdoglSetup;
+ &watchdogSetup;
&wdCli;
</reference>
diff --git a/doc/src/sgml/release-3.5.sgml b/doc/src/sgml/release-3.5.sgml
index 6481fa408..7125a42ad 100644
--- a/doc/src/sgml/release-3.5.sgml
+++ b/doc/src/sgml/release-3.5.sgml
@@ -2185,7 +2185,7 @@
<programlisting>
- 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.
</programlisting>
diff --git a/doc/src/sgml/release-4.2.sgml b/doc/src/sgml/release-4.2.sgml
index ae618ad4a..57d715448 100644
--- a/doc/src/sgml/release-4.2.sgml
+++ b/doc/src/sgml/release-4.2.sgml
@@ -460,7 +460,7 @@ Author: Bo Peng <pengbo@sraoss.co.jp>
heartbeat_device2 = ''
</programlisting>
Unlike 4.1 or before, now all watchdog parameters are identical
- on all hosts. To distingusish which host is which, create a file
+ on all hosts. To distinguish which host is which, create a file
<filename>pgpool_node_id</filename> and put number 0, 1, 2
etc. to identify host.
</para>
@@ -501,7 +501,7 @@ Author: Bo Peng <pengbo@sraoss.co.jp>
Removing strerror() call from ereports. (Muhammad Usama)
</para>
<para>
- Call to ereport() resets the errno value and using the "strerror(errno)" emmits the wrong error message.
+ Call to ereport() resets the errno value and using the "strerror(errno)" emits the wrong error message.
The right way is to use %m format specifier instead.
</para>
</listitem>
@@ -1027,7 +1027,7 @@ Author: Bo Peng <pengbo@sraoss.co.jp>
<para>
Use <command>pg_config</command> to get
<productname>PostgreSQL</productname> lib path and add this path
- to LD_LIBRARY_PATH environment paramater in regress.sh. (Bo Peng)
+ to LD_LIBRARY_PATH environment parameter in regress.sh. (Bo Peng)
</para>
<para>
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index e462de994..fbbf63aa1 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -192,7 +192,7 @@
There are six different running modes in
<productname>Pgpool-II</>: streaming replication mode, logical
replication mode, main replica mode (slony mode), native
- replication mode, raw mode and snapshot isolaton mode. In any
+ replication mode, raw mode and snapshot isolation mode. In any
mode, <productname>Pgpool-II</> provides connection pooling,
and automatic fail over.
Online recovery can be used only with streaming replication mode and native replication mode.
@@ -430,7 +430,7 @@
backend_data_directory0.
</para>
<para>
- New backend data_directorys can be added in this parameter
+ New backend data_directories can be added in this parameter
by reloading a configuration file. However, values cannot
be updated so you must
restart <productname>Pgpool-II</productname> in that case.
@@ -636,7 +636,7 @@ $ <userinput>pgpool -f /usr/local/etc/pgpool.conf -F /usr/local/etc/pcp.conf -m
This will take effect by reloading or restarting
<productname>Pgpool-II</productname>. If this flag is set, failover
will not happen if the backend is not available. While the backend
- is not available, clients wil get error message:
+ is not available, clients will get error message:
<programlisting>
psql: error: could not connect to server: FATAL: failed to create a backend connection
DETAIL: executing failover on backend
diff --git a/doc/src/sgml/stylesheet.css b/doc/src/sgml/stylesheet.css
index c4e185f0e..1cb5f406f 100644
--- a/doc/src/sgml/stylesheet.css
+++ b/doc/src/sgml/stylesheet.css
@@ -122,7 +122,7 @@ BLOCKQUOTE.NOTE, BLOCKQUOTE.TIP, table.CAUTION, table.WARNING, div.note, div.tip
max-width: 720px;
border-width: 1px;
border-style: solid;
- overfileow: auto;
+ overflow: auto;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
-khtml-border-radius: 8px;
diff --git a/doc/src/sgml/watchdog.sgml b/doc/src/sgml/watchdog.sgml
index 1089d2706..b4413ddca 100644
--- a/doc/src/sgml/watchdog.sgml
+++ b/doc/src/sgml/watchdog.sgml
@@ -35,7 +35,7 @@
its own pgpool node information and the destination pgpool nodes information, the
settings are different per pgpool node.
Since <productname>Pgpool-II</productname> 4.2, all configuration parameters are
- identical on all hosts. If watchdog feature is enabled, to distingusish which host
+ identical on all hosts. If watchdog feature is enabled, to distinguish which host
is which, a <filename>pgpool_node_id</filename> file is required.
You need to create a <filename>pgpool_node_id</filename> file and specify the
pgpool (watchdog) node number (e.g. 0, 1, 2 ...) to identify pgpool (watchdog) host.
diff --git a/src/auth/auth-scram.c b/src/auth/auth-scram.c
index b26859bff..3a0aa71c8 100644
--- a/src/auth/auth-scram.c
+++ b/src/auth/auth-scram.c
@@ -1178,7 +1178,7 @@ build_server_final_message(scram_state *state)
/*
- * Determinisitcally generate salt for mock authentication, using a SHA256
+ * Deterministically generate salt for mock authentication, using a SHA256
* hash based on the username and a cluster-level secret key. Returns a
* pointer to a static buffer of size SCRAM_DEFAULT_SALT_LEN.
*/
diff --git a/src/auth/md5.c b/src/auth/md5.c
index 9e598765b..c35a0bffb 100644
--- a/src/auth/md5.c
+++ b/src/auth/md5.c
@@ -347,7 +347,7 @@ bytesToHex(char *b, int len, char *s)
*
* OUTPUT hexsum the MD5 sum as a '\0'-terminated string of
* hexadecimal digits. an MD5 sum is 16 bytes long.
- * each byte is represented by two heaxadecimal
+ * each byte is represented by two hexadecimal
* characters. you thus need to provide an array
* of 33 characters, including the trailing '\0'.
*
diff --git a/src/auth/pool_auth.c b/src/auth/pool_auth.c
index b60842dde..9425a0f2c 100644
--- a/src/auth/pool_auth.c
+++ b/src/auth/pool_auth.c
@@ -502,7 +502,7 @@ pool_do_auth(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * cp)
&password, &passwordType) == false)
{
/*
- * We do not have any passeord, we can still get the password
+ * We do not have any password, we can still get the password
* from client using plain text authentication if it is
* allowed by user
*/
@@ -1026,7 +1026,7 @@ do_clear_text_password(POOL_CONNECTION * backend, POOL_CONNECTION * frontend, in
if (get_auth_password(backend, frontend, reauth, &pwd, &passwordType) == false)
{
/*
- * We do not have any passeord, we can still get the password
+ * We do not have any password, we can still get the password
* from client using plain text authentication if it is
* allowed by user
*/
@@ -1318,7 +1318,7 @@ authenticate_frontend_SCRAM(POOL_CONNECTION * backend, POOL_CONNECTION * fronten
if (!shadow_pass)
ereport(ERROR,
(errmsg("authentication failed"),
- errdetail("faild to build the scram verifier")));
+ errdetail("failed to build the scram verifier")));
/*
* SASL auth is not supported for protocol versions before 3, because it
diff --git a/src/auth/pool_hba.c b/src/auth/pool_hba.c
index af9aa65ba..2b4b1d9d6 100644
--- a/src/auth/pool_hba.c
+++ b/src/auth/pool_hba.c
@@ -156,7 +156,7 @@ static POOL_STATUS CheckUserExist(char *username);
static POOL_STATUS CheckPAMAuth(POOL_CONNECTION * frontend, char *user, char *password);
static int pam_passwd_conv_proc(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
-static struct pam_conv pam_passw_conv = {
+static struct pam_conv pam_passwd_conv = {
&pam_passwd_conv_proc,
NULL
};
@@ -2344,7 +2344,7 @@ pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
}
/*
- * PAM will free this memory in * pam_end() Do not use Palloc and freinds
+ * PAM will free this memory in * pam_end() Do not use Palloc and friends
* to allocate this memory, Since the PAM library will be freeing this
* memory who knowns nothing about our MemoryManager
*/
@@ -2376,16 +2376,16 @@ static POOL_STATUS CheckPAMAuth(POOL_CONNECTION * frontend, char *user, char *pa
* later used inside the PAM conversation to pass the password to the
* authentication module.
*/
- pam_passw_conv.appdata_ptr = (char *) password; /* from password above,
+ pam_passwd_conv.appdata_ptr = (char *) password; /* from password above,
* not allocated */
/* Optionally, one can set the service name in pool_hba.conf */
if (frontend->pool_hba->pamservice && frontend->pool_hba->pamservice[0] != '\0')
retval = pam_start(frontend->pool_hba->pamservice, "pgpool@",
- &pam_passw_conv, &pamh);
+ &pam_passwd_conv, &pamh);
else
retval = pam_start(PGPOOL_PAM_SERVICE, "pgpool@",
- &pam_passw_conv, &pamh);
+ &pam_passwd_conv, &pamh);
if (retval != PAM_SUCCESS)
{
@@ -2406,7 +2406,7 @@ static POOL_STATUS CheckPAMAuth(POOL_CONNECTION * frontend, char *user, char *pa
errdetail("pam_set_item(PAM_USER) failed: %s", pam_strerror(pamh, retval))));
}
- retval = pam_set_item(pamh, PAM_CONV, &pam_passw_conv);
+ retval = pam_set_item(pamh, PAM_CONV, &pam_passwd_conv);
if (retval != PAM_SUCCESS)
{
pam_passwd = NULL; /* Unset pam_passwd */
diff --git a/src/auth/pool_passwd.c b/src/auth/pool_passwd.c
index 97b1a4452..3a9107bcd 100644
--- a/src/auth/pool_passwd.c
+++ b/src/auth/pool_passwd.c
@@ -329,7 +329,7 @@ userMatchesString(char *buf, char *user)
}
/*
- * user:passwod[:user:password]
+ * user:password[:user:password]
*/
PasswordMapping *
pool_get_user_credentials(char *username)
@@ -464,7 +464,7 @@ get_pgpool_config_user_password(char *username, char *password_in_config)
PasswordMapping *password_mapping = NULL;
/*
- * if the password specified in config is empty strin or NULL look for the
+ * if the password specified in config is empty string or NULL look for the
* password in pool_passwd file
*/
if (password_in_config == NULL || strlen(password_in_config) == 0)
diff --git a/src/config/README b/src/config/README
index f8bfecc55..a61106965 100644
--- a/src/config/README
+++ b/src/config/README
@@ -87,11 +87,11 @@ struct config_generic
GucSource *sources; /* source of the current actual value, For array type config elements
- * it contains the corosponding source of each individual element */
+ * it contains the corresponding source of each individual element */
GucSource *reset_sources; /* source of the reset value, For array type config elements
- * it contains the corosponding source of each individual element */
+ * it contains the corresponding source of each individual element */
ConfigContext *scontexts; /* context that set the current value, For array type config elements
- * it contains the corosponding context of each individual element */
+ * it contains the corresponding context of each individual element */
};
@@ -162,5 +162,5 @@ Step6: add the new config parameter to the report program.
StrNCpy(status[i].desc, "Load balance behavior when write query is received", POOLCONFIG_MAXDESCLEN);
i++;
-Step7: remeber to add documents and tests!
-==========================================
+Step7: remember to add documents and tests!
+===========================================
diff --git a/src/config/pool_config.l b/src/config/pool_config.l
index 68fc5fc1c..3f88c1df0 100644
--- a/src/config/pool_config.l
+++ b/src/config/pool_config.l
@@ -43,7 +43,7 @@
int yylex(void);
POOL_CONFIG g_pool_config; /* configuration values */
-POOL_CONFIG *pool_config = &g_pool_config; /* for lagacy reason pointer to the above struct */
+POOL_CONFIG *pool_config = &g_pool_config; /* for legacy reason pointer to the above struct */
static unsigned Lineno;
char *config_file_dir = NULL; /* directory path of config file pgpool.conf */
@@ -403,7 +403,7 @@ parse_error:
*head_p = NULL;
*tail_p = NULL;
ereport(elevel,
- (errmsg("syntex error in configuration file \"%s\"",config_file),
+ (errmsg("syntax error in configuration file \"%s\"",config_file),
errdetail("parse error at line %d '%s' token = %d", Lineno, yytext,token)));
return false;
diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c
index 3b8a8daba..fd90260ee 100644
--- a/src/config/pool_config_variables.c
+++ b/src/config/pool_config_variables.c
@@ -177,7 +177,7 @@ static void convert_int_from_base_unit(int64 base_value, int base_unit,
/* These functions are used to provide Hints for enum type config parameters and
* to output the values of the parameters.
- * These functuons are not available for tools since they use the stringInfo that is
+ * These functions are not available for tools since they use the stringInfo that is
* not present for tools.
*/
@@ -280,8 +280,8 @@ static const struct config_enum_entry check_temp_table_options[] = {
{"catalog", CHECK_TEMP_CATALOG, false}, /* search system catalogs */
{"trace", CHECK_TEMP_TRACE, false}, /* tracing temp tables */
{"none", CHECK_TEMP_NONE, false}, /* do not check temp tables */
- {"on", CHECK_TEMP_ON, false}, /* same as CHECK_TEMP_CATALOG. Just for backward compatibilty. */
- {"off", CHECK_TEMP_OFF, false}, /* same as CHECK_TEMP_NONE. Just for backward compatibilty. */
+ {"on", CHECK_TEMP_ON, false}, /* same as CHECK_TEMP_CATALOG. Just for backward compatibility. */
+ {"off", CHECK_TEMP_OFF, false}, /* same as CHECK_TEMP_NONE. Just for backward compatibility. */
{NULL, 0, false}
};
@@ -413,7 +413,7 @@ static struct config_bool ConfigureNamesBool[] =
NULL, NULL, NULL
},
{
- {"log_connections", CFGCXT_RELOAD, LOGING_CONFIG,
+ {"log_connections", CFGCXT_RELOAD, LOGGING_CONFIG,
"Logs each successful connection.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -423,7 +423,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"log_disconnections", CFGCXT_RELOAD, LOGING_CONFIG,
+ {"log_disconnections", CFGCXT_RELOAD, LOGGING_CONFIG,
"Logs end of a session.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -433,7 +433,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"log_hostname", CFGCXT_RELOAD, LOGING_CONFIG,
+ {"log_hostname", CFGCXT_RELOAD, LOGGING_CONFIG,
"Logs the host name in the connection logs.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -453,7 +453,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"replication_mode", CFGCXT_INIT, LOGING_CONFIG,
+ {"replication_mode", CFGCXT_INIT, LOGGING_CONFIG,
"Enables replication mode.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -563,7 +563,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"log_statement", CFGCXT_SESSION, LOGING_CONFIG,
+ {"log_statement", CFGCXT_SESSION, LOGGING_CONFIG,
"Logs all statements in the pgpool logs.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -573,7 +573,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"log_per_node_statement", CFGCXT_SESSION, LOGING_CONFIG,
+ {"log_per_node_statement", CFGCXT_SESSION, LOGGING_CONFIG,
"Logs per node detailed SQL statements.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -583,7 +583,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"log_client_messages", CFGCXT_SESSION, LOGING_CONFIG,
+ {"log_client_messages", CFGCXT_SESSION, LOGGING_CONFIG,
"Logs any client messages in the pgpool logs.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -604,7 +604,7 @@ static struct config_bool ConfigureNamesBool[] =
{
{"clear_memqcache_on_escalation", CFGCXT_RELOAD, WATCHDOG_CONFIG,
- "Clears the query cache in the shared memory when pgpool-II escaltes to leader watchdog node.",
+ "Clears the query cache in the shared memory when pgpool-II escalates to leader watchdog node.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
&g_pool_config.clear_memqcache_on_escalation,
@@ -703,7 +703,7 @@ static struct config_bool ConfigureNamesBool[] =
{
{"auto_failback", CFGCXT_RELOAD, FAILOVER_CONFIG,
- "Enables nodes automatically reattach, when dettached node continue streaming replication.",
+ "Enables nodes automatically reattach, when detached node continue streaming replication.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
&g_pool_config.auto_failback,
@@ -711,7 +711,7 @@ static struct config_bool ConfigureNamesBool[] =
NULL, NULL, NULL
},
{
- {"logging_collector", CFGCXT_INIT, LOGING_CONFIG,
+ {"logging_collector", CFGCXT_INIT, LOGGING_CONFIG,
"Enable capturing of stderr into log files.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -720,7 +720,7 @@ static struct config_bool ConfigureNamesBool[] =
NULL, NULL, NULL
},
{
- {"log_truncate_on_rotation", CFGCXT_INIT, LOGING_CONFIG,
+ {"log_truncate_on_rotation", CFGCXT_INIT, LOGGING_CONFIG,
"If on, an existing log file gets truncated on time based log rotation.",
CONFIG_VAR_TYPE_BOOL, false, 0
},
@@ -822,7 +822,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"log_destination", CFGCXT_RELOAD, LOGING_CONFIG,
+ {"log_destination", CFGCXT_RELOAD, LOGGING_CONFIG,
"destination of pgpool-II log",
CONFIG_VAR_TYPE_STRING, false, 0
},
@@ -834,7 +834,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"syslog_ident", CFGCXT_RELOAD, LOGING_CONFIG,
+ {"syslog_ident", CFGCXT_RELOAD, LOGGING_CONFIG,
"syslog program ident string.",
CONFIG_VAR_TYPE_STRING, false, 0
},
@@ -866,7 +866,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"log_line_prefix", CFGCXT_RELOAD, LOGING_CONFIG,
+ {"log_line_prefix", CFGCXT_RELOAD, LOGGING_CONFIG,
"printf-style string to output at beginning of each log line.",
CONFIG_VAR_TYPE_STRING, false, 0
},
@@ -1228,7 +1228,7 @@ static struct config_string ConfigureNamesString[] =
{
{"memqcache_oiddir", CFGCXT_INIT, CACHE_CONFIG,
- "Tempory directory to record table oids.",
+ "Temporary directory to record table oids.",
CONFIG_VAR_TYPE_STRING, false, 0
},
&g_pool_config.memqcache_oiddir,
@@ -1247,7 +1247,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"logdir", CFGCXT_INIT, LOGING_CONFIG,
+ {"logdir", CFGCXT_INIT, LOGGING_CONFIG,
"PgPool status file logging directory.",
CONFIG_VAR_TYPE_STRING, false, 0
},
@@ -1256,7 +1256,7 @@ static struct config_string ConfigureNamesString[] =
NULL, NULL, NULL, NULL
},
{
- {"log_directory", CFGCXT_INIT, LOGING_CONFIG,
+ {"log_directory", CFGCXT_INIT, LOGGING_CONFIG,
"directory where log files are written.",
CONFIG_VAR_TYPE_STRING, false, 0
},
@@ -1266,7 +1266,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"log_filename", CFGCXT_INIT, LOGING_CONFIG,
+ {"log_filename", CFGCXT_INIT, LOGGING_CONFIG,
"log file name pattern.",
CONFIG_VAR_TYPE_STRING, false, 0
},
@@ -1289,7 +1289,7 @@ static struct config_string_list ConfigureNamesStringList[] =
&g_pool_config.reset_query_list, /* variable */
&g_pool_config.num_reset_queries, /* item count var */
(const char *) default_reset_query_list, /* boot value */
- ";", /* token seperator */
+ ";", /* token separator */
false, /* compute_regex ? */
NULL, NULL, NULL /* assign, check, show funcs */
},
@@ -1629,7 +1629,7 @@ static struct config_string_array ConfigureNamesStringArray[] =
{
{"backend_application_name", CFGCXT_RELOAD, CONNECTION_CONFIG,
- "applicaton_name of the backend.",
+ "application_name of the backend.",
CONFIG_VAR_TYPE_STRING_ARRAY, true, 0, MAX_NUM_BACKENDS
},
NULL,
@@ -1673,7 +1673,7 @@ static struct config_string_array ConfigureNamesStringArray[] =
{
{"heartbeat_device", CFGCXT_RELOAD, WATCHDOG_LIFECHECK,
- "Name of NIC device for sending hearbeat.",
+ "Name of NIC device for sending heartbeat.",
CONFIG_VAR_TYPE_STRING_ARRAY, true, 0, WD_MAX_IF_NUM
},
NULL,
@@ -1960,7 +1960,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"wd_heartbeat_keepalive", CFGCXT_INIT, WATCHDOG_CONFIG,
- "Time interval in seconds between sending the heartbeat siganl.",
+ "Time interval in seconds between sending the heartbeat signal.",
CONFIG_VAR_TYPE_INT, false, GUC_UNIT_S
},
&g_pool_config.wd_heartbeat_keepalive,
@@ -1971,7 +1971,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"wd_heartbeat_deadtime", CFGCXT_INIT, WATCHDOG_CONFIG,
- "Deadtime interval in seconds for heartbeat siganl.",
+ "Deadtime interval in seconds for heartbeat signal.",
CONFIG_VAR_TYPE_INT, false, GUC_UNIT_S
},
&g_pool_config.wd_heartbeat_deadtime,
@@ -2057,7 +2057,7 @@ static struct config_int ConfigureNamesInt[] =
NULL, NULL, NULL
},
{
- {"log_rotation_age", CFGCXT_INIT, LOGING_CONFIG,
+ {"log_rotation_age", CFGCXT_INIT, LOGGING_CONFIG,
"Automatic rotation of logfiles will happen after that (minutes) time.",
CONFIG_VAR_TYPE_INT, false, GUC_UNIT_MIN
},
@@ -2067,7 +2067,7 @@ static struct config_int ConfigureNamesInt[] =
NULL, NULL, NULL
},
{
- {"log_rotation_size", CFGCXT_INIT, LOGING_CONFIG,
+ {"log_rotation_size", CFGCXT_INIT, LOGGING_CONFIG,
"Automatic rotation of logfiles will happen after that much (kilobytes) log output.",
CONFIG_VAR_TYPE_INT, false, GUC_UNIT_KB
},
@@ -2077,7 +2077,7 @@ static struct config_int ConfigureNamesInt[] =
NULL, NULL, NULL
},
{
- {"log_file_mode", CFGCXT_INIT, LOGING_CONFIG,
+ {"log_file_mode", CFGCXT_INIT, LOGGING_CONFIG,
"creation mode for log files.",
CONFIG_VAR_TYPE_INT, false, 0
},
@@ -2107,8 +2107,8 @@ static struct config_enum ConfigureNamesEnum[] =
{
- {"syslog_facility", CFGCXT_RELOAD, LOGING_CONFIG,
- "syslog local faclity.",
+ {"syslog_facility", CFGCXT_RELOAD, LOGGING_CONFIG,
+ "syslog local facility.",
CONFIG_VAR_TYPE_ENUM, false, 0
},
&g_pool_config.syslog_facility,
@@ -2120,7 +2120,7 @@ static struct config_enum ConfigureNamesEnum[] =
},
{
- {"log_error_verbosity", CFGCXT_SESSION, LOGING_CONFIG,
+ {"log_error_verbosity", CFGCXT_SESSION, LOGGING_CONFIG,
"How much details about error should be emitted.",
CONFIG_VAR_TYPE_ENUM, false, 0
},
@@ -2131,7 +2131,7 @@ static struct config_enum ConfigureNamesEnum[] =
},
{
- {"client_min_messages", CFGCXT_SESSION, LOGING_CONFIG,
+ {"client_min_messages", CFGCXT_SESSION, LOGGING_CONFIG,
"Which messages should be sent to client.",
CONFIG_VAR_TYPE_ENUM, false, 0
},
@@ -2142,7 +2142,7 @@ static struct config_enum ConfigureNamesEnum[] =
},
{
- {"log_min_messages", CFGCXT_SESSION, LOGING_CONFIG,
+ {"log_min_messages", CFGCXT_SESSION, LOGGING_CONFIG,
"Which messages should be emitted to server log.",
CONFIG_VAR_TYPE_ENUM, false, 0
},
@@ -2786,11 +2786,11 @@ initialize_variables_with_default(struct config_generic *gconf)
{
if (strcmp(gconf->name, "primary_routing_query_pattern_list") == 0)
{
- *conf->variable = get_list_from_string_regex_delim(newval, conf->seperator, conf->list_elements_count);
+ *conf->variable = get_list_from_string_regex_delim(newval, conf->separator, conf->list_elements_count);
}
else
{
- *conf->variable = get_list_from_string(newval, conf->seperator, conf->list_elements_count);
+ *conf->variable = get_list_from_string(newval, conf->separator, conf->list_elements_count);
}
if (conf->compute_regex)
@@ -2945,7 +2945,7 @@ get_list_from_string_regex_delim(const char *input, const char *delimi, int *n)
}
/*
- * Memory of the array type variables must be initialized befor calling this function
+ * Memory of the array type variables must be initialized before calling this function
*/
void
InitializeConfigOptions(void)
@@ -2976,7 +2976,7 @@ InitializeConfigOptions(void)
/*
* returns the index value postfixed with the variable name
* for example if the if name contains "backend_hostname11" and
- * the record name must be for the variable nameed "backend_hostname"
+ * the record name must be for the variable named "backend_hostname"
* if the index is not present at end of the name the function
* will return true and out parameter index will be assigned with -ve value
*/
@@ -3027,7 +3027,7 @@ find_option(const char *name, int elevel)
/*
* For dynamic array type vars the key also have the index at the
- * end e.g. backend_hostname0 so we only comapare the key's name
+ * end e.g. backend_hostname0 so we only compare the key's name
* part
*/
if (!strncmp(gconf->name, name, index_start_index))
@@ -3776,11 +3776,11 @@ setConfigOptionVar(struct config_generic *record, const char *name, int index_va
if (strcmp(name, "primary_routing_query_pattern_list") == 0)
{
- *conf->variable = get_list_from_string_regex_delim(newval, conf->seperator, conf->list_elements_count);
+ *conf->variable = get_list_from_string_regex_delim(newval, conf->separator, conf->list_elements_count);
}
else
{
- *conf->variable = get_list_from_string(newval, conf->seperator, conf->list_elements_count);
+ *conf->variable = get_list_from_string(newval, conf->separator, conf->list_elements_count);
}
if (conf->compute_regex)
@@ -4982,7 +4982,7 @@ SetHBDestIfFunc(int elevel)
/*
* g_pool_config.hb_ifs is the information for sending/receiving heartbeat
- * for all nodes specied in pgpool.conf.
+ * for all nodes specified in pgpool.conf.
* If it is local pgpool node information, set dest_port to g_pool_config.wd_heartbeat_port
* and ignore addr and if_name.
* g_pool_config.hb_dest_if is the heartbeat destination information.
diff --git a/src/context/pool_process_context.c b/src/context/pool_process_context.c
index 46139f5a5..4a5abd8f3 100644
--- a/src/context/pool_process_context.c
+++ b/src/context/pool_process_context.c
@@ -91,7 +91,7 @@ pool_get_my_process_info(void)
* Increment local session id
*/
void
-pool_incremnet_local_session_id(void)
+pool_increment_local_session_id(void)
{
POOL_PROCESS_CONTEXT *p = pool_get_process_context();
diff --git a/src/context/pool_query_context.c b/src/context/pool_query_context.c
index f1b3fea08..6635369ab 100644
--- a/src/context/pool_query_context.c
+++ b/src/context/pool_query_context.c
@@ -189,7 +189,7 @@ pool_set_node_to_be_sent(POOL_QUERY_CONTEXT * query_context, int node_id)
}
/*
- * Unspecify DB node to send query
+ * Unspecified DB node to send query
*/
void
pool_unset_node_to_be_sent(POOL_QUERY_CONTEXT * query_context, int node_id)
@@ -528,7 +528,7 @@ pool_where_to_send(POOL_QUERY_CONTEXT * query_context, char *query, Node *node)
*/
ereport(DEBUG1,
- (errmsg("checking load balance precondtions. TSTATE:%c wrting_trancation:%d failed_transaction:%d isolation:%d",
+ (errmsg("checking load balance preconditions. TSTATE:%c writing_transaction:%d failed_transaction:%d isolation:%d",
TSTATE(backend, PRIMARY_NODE_ID),
pool_is_writing_transaction(),
pool_is_failed_transaction(),
diff --git a/src/context/pool_session_context.c b/src/context/pool_session_context.c
index 483d51ffd..3ffd939ff 100644
--- a/src/context/pool_session_context.c
+++ b/src/context/pool_session_context.c
@@ -37,7 +37,7 @@ static POOL_SESSION_CONTEXT session_context_d;
static POOL_SESSION_CONTEXT * session_context = NULL;
static void GetTranIsolationErrorCb(void *arg);
static void init_sent_message_list(void);
-static POOL_PENDING_MESSAGE * copy_pending_message(POOL_PENDING_MESSAGE * messag);
+static POOL_PENDING_MESSAGE * copy_pending_message(POOL_PENDING_MESSAGE * message);
static void dump_sent_message(char *caller, POOL_SENT_MESSAGE * m);
static void dml_adaptive_init(void);
static void dml_adaptive_destroy(void);
@@ -76,7 +76,7 @@ pool_init_session_context(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * bac
session_context->query_context = NULL;
/* Initialize local session id */
- pool_incremnet_local_session_id();
+ pool_increment_local_session_id();
/* Create memory context */
/* TODO re-think about the parent for this context ?? */
@@ -1119,7 +1119,7 @@ pool_pending_messages_destroy(void)
if (!session_context)
ereport(ERROR,
- (errmsg("pool_pending_message_destory: session context is not initialized")));
+ (errmsg("pool_pending_message_destroy: session context is not initialized")));
foreach(cell, session_context->pending_messages)
{
@@ -1173,7 +1173,7 @@ pool_pending_message_create(char kind, int len, char *contents)
default:
ereport(ERROR,
- (errmsg("pool_pending_message_create: unknow kind: %c", kind)));
+ (errmsg("pool_pending_message_create: unknown kind: %c", kind)));
break;
}
@@ -1548,7 +1548,7 @@ const char *
pool_pending_message_type_to_string(POOL_MESSAGE_TYPE type)
{
static const char *pending_msg_string[] = {"Parse", "Bind", "Execute",
- "Descripbe", "Close", "Sync"};
+ "Describe", "Close", "Sync"};
if (type < 0 || type > POOL_SYNC)
return "unknown type";
@@ -1880,7 +1880,7 @@ pool_temp_tables_destroy(void)
{
if (!session_context)
ereport(ERROR,
- (errmsg("pool_temp_tables_destory: session context is not initialized")));
+ (errmsg("pool_temp_tables_destroy: session context is not initialized")));
list_free(session_context->temp_tables);
}
diff --git a/src/include/context/pool_process_context.h b/src/include/context/pool_process_context.h
index 1a6d3c6d6..35f3a3113 100644
--- a/src/include/context/pool_process_context.h
+++ b/src/include/context/pool_process_context.h
@@ -62,7 +62,7 @@ typedef struct
extern void pool_init_process_context(void);
extern POOL_PROCESS_CONTEXT * pool_get_process_context(void);
extern ProcessInfo * pool_get_my_process_info(void);
-extern void pool_incremnet_local_session_id(void);
+extern void pool_increment_local_session_id(void);
extern int pool_coninfo_size(void);
extern int pool_coninfo_num(void);
extern ConnectionInfo * pool_coninfo(int child, int connection_pool, int backend);
diff --git a/src/include/context/pool_session_context.h b/src/include/context/pool_session_context.h
index 6aec6e5b9..8e2abc670 100644
--- a/src/include/context/pool_session_context.h
+++ b/src/include/context/pool_session_context.h
@@ -41,7 +41,7 @@ typedef enum
POOL_UNKNOWN, /* Unknown. Need to ask backend */
POOL_READ_UNCOMMITTED, /* Read uncommitted */
POOL_READ_COMMITTED, /* Read committed */
- POOL_REPEATABLE_READ, /* Rpeatable read */
+ POOL_REPEATABLE_READ, /* Repeatable read */
POOL_SERIALIZABLE /* Serializable */
} POOL_TRANSACTION_ISOLATION;
@@ -60,8 +60,8 @@ typedef enum
*/
typedef enum
{
- POOL_SENT_MESSAGE_CREATED, /* initial state of sent meesage */
- POOL_SENT_MESSAGE_CLOSED /* sent meesage closed but close complete
+ POOL_SENT_MESSAGE_CREATED, /* initial state of sent message */
+ POOL_SENT_MESSAGE_CLOSED /* sent message closed but close complete
* message has not arrived yet */
} POOL_SENT_MESSAGE_STATE;
@@ -132,7 +132,7 @@ typedef struct
* kind */
int contents_len; /* message packet length */
char query[QUERY_STRING_BUFFER_LEN]; /* copy of original query */
- char statement[MAX_IDENTIFIER_LEN]; /* prepared statment name if
+ char statement[MAX_IDENTIFIER_LEN]; /* prepared statement name if
* any */
char portal[MAX_IDENTIFIER_LEN]; /* portal name if any */
bool is_rows_returned; /* true if the message could produce row
@@ -255,14 +255,14 @@ typedef struct
* transaction */
/*
- * Parse/Bind/Decribe/Execute/Close message queue.
+ * Parse/Bind/Describe/Execute/Close message queue.
*/
List *pending_messages;
/*
* The last pending message. Reset at Ready for query. Note that this is
* a shallow copy of pending message. Once the are is reset,
- * previos_message_exists is set to false.
+ * previous_message_exists is set to false.
*/
bool previous_message_exists;
POOL_PENDING_MESSAGE previous_message;
@@ -297,7 +297,7 @@ typedef struct
int preferred_main_node_id;
#endif
- /* Whether snapshot is aquired in this transaction. Only used by Snapshot Isolation mode. */
+ /* Whether snapshot is acquired in this transaction. Only used by Snapshot Isolation mode. */
SI_STATE si_state;
/* Whether transaction is read only. Only used by Snapshot Isolation mode. */
SI_STATE transaction_read_only;
diff --git a/src/include/main/health_check.h b/src/include/main/health_check.h
index d40f00992..ad26f2f0a 100644
--- a/src/include/main/health_check.h
+++ b/src/include/main/health_check.h
@@ -36,7 +36,7 @@ typedef struct {
int32 max_health_check_duration; /* maximum duration spent for a health check session in milli seconds */
int32 min_health_check_duration; /* minimum duration spent for a health check session in milli seconds */
time_t last_health_check; /* last health check timestamp */
- time_t last_successful_health_check; /* last succesfull health check timestamp */
+ time_t last_successful_health_check; /* last successful health check timestamp */
time_t last_skip_health_check; /* last skipped health check timestamp */
time_t last_failed_health_check; /* last failed health check timestamp */
} POOL_HEALTH_CHECK_STATISTICS;
diff --git a/src/include/main/pgpool_logger.h b/src/include/main/pgpool_logger.h
index 95675b15f..0b2fc089c 100644
--- a/src/include/main/pgpool_logger.h
+++ b/src/include/main/pgpool_logger.h
@@ -16,7 +16,7 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
- * ppgool_logger.h.: master definition header file
+ * pgpool_logger.h.: master definition header file
*
*/
/*-------------------------------------------------------------------------
diff --git a/src/include/main/pool_internal_comms.h b/src/include/main/pool_internal_comms.h
index a90a642c8..1709d1ad9 100644
--- a/src/include/main/pool_internal_comms.h
+++ b/src/include/main/pool_internal_comms.h
@@ -36,9 +36,9 @@ extern void degenerate_all_quarantine_nodes(void);
extern bool close_idle_connections(void);
/* defined in pgpool_main.c */
-extern void register_watchdog_quorum_change_interupt(void);
-extern void register_watchdog_state_change_interupt(void);
-extern void register_backend_state_sync_req_interupt(void);
+extern void register_watchdog_quorum_change_interrupt(void);
+extern void register_watchdog_state_change_interrupt(void);
+extern void register_backend_state_sync_req_interrupt(void);
extern void register_inform_quarantine_nodes_req(void);
extern bool register_node_operation_request(POOL_REQUEST_KIND kind,
int *node_id_set, int count, unsigned char flags);
diff --git a/src/include/parser/nodes.h b/src/include/parser/nodes.h
index fd9eef3b4..d7b1a2e82 100644
--- a/src/include/parser/nodes.h
+++ b/src/include/parser/nodes.h
@@ -516,7 +516,7 @@ typedef enum NodeTag
TsmRoutine , /* in access/tsmapi.h */
T_ForeignKeyCacheInfo, /* in utils/rel.h */
T_CallContext, /* in nodes/parsenodes.h */
- /* pgpool Extention */
+ /* pgpool Extension */
T_PgpoolVariableSetStmt,
T_PgpoolVariableShowStmt
diff --git a/src/include/parser/parsenodes.h b/src/include/parser/parsenodes.h
index 49946b2fd..fff6fc527 100644
--- a/src/include/parser/parsenodes.h
+++ b/src/include/parser/parsenodes.h
@@ -1033,7 +1033,7 @@ typedef struct RangeTblEntry
* as a result of subquery-flattening substitutions.
*
* joinleftcols is an integer list of physical column numbers of the left
- * join input rel that are included in the join; likewise joinrighttcols
+ * join input rel that are included in the join; likewise joinrightcols
* for the right join input rel. (Which rels those are can be determined
* from the associated JoinExpr.) If the join is USING/NATURAL, then the
* first joinmergedcols entries in each list identify the merged columns.
@@ -1043,7 +1043,7 @@ typedef struct RangeTblEntry
* Note that input columns could have been dropped after creation of a
* stored rule, if they are not referenced in the query (in particular,
* merged columns could not be dropped); this is not accounted for in
- * joinleftcols/joinrighttcols.
+ * joinleftcols/joinrightcols.
*/
JoinType jointype; /* type of join */
int joinmergedcols; /* number of merged (JOIN USING) columns */
diff --git a/src/include/parser/primnodes.h b/src/include/parser/primnodes.h
index b9d1f37eb..503f438b5 100644
--- a/src/include/parser/primnodes.h
+++ b/src/include/parser/primnodes.h
@@ -291,7 +291,7 @@ typedef struct Param
*
* The aggregate's args list is a targetlist, ie, a list of TargetEntry nodes.
*
- * For a normal (non-ordered-set) aggregate, the non-resjunk TargetEntries
+ * For a normal (non-ordered-set) aggregate, the non-resjunk TargetEntry nodes
* represent the aggregate's regular arguments (if any) and resjunk TLEs can
* be added at the end to represent ORDER BY expressions that are not also
* arguments. As in a top-level Query, the TLEs can be marked with
@@ -1551,7 +1551,7 @@ typedef struct OnConflictExpr
Oid constraint; /* pg_constraint OID for arbiter */
/* ON CONFLICT UPDATE */
- List *onConflictSet; /* List of ON CONFLICT SET TargetEntrys */
+ List *onConflictSet; /* List of ON CONFLICT SET TargetEntry nodes */
Node *onConflictWhere; /* qualifiers to restrict UPDATE to */
int exclRelIndex; /* RT index of 'excluded' relation */
List *exclRelTlist; /* tlist of the EXCLUDED pseudo relation */
diff --git a/src/include/pcp/libpcp_ext.h b/src/include/pcp/libpcp_ext.h
index c0d88a5fa..6f000a215 100644
--- a/src/include/pcp/libpcp_ext.h
+++ b/src/include/pcp/libpcp_ext.h
@@ -85,9 +85,9 @@ typedef struct
BACKEND_STATUS backend_status; /* backend status */
time_t status_changed_time; /* backend status changed time */
double backend_weight; /* normalized backend load balance ratio */
- double unnormalized_weight; /* descripted parameter */
+ double unnormalized_weight; /* described parameter */
char backend_data_directory[MAX_PATH_LENGTH];
- char backend_application_name[NAMEDATALEN]; /* application_name for walreciever */
+ char backend_application_name[NAMEDATALEN]; /* application_name for walreceiver */
unsigned short flag; /* various flags */
bool quarantine; /* true if node is CON_DOWN because of
* quarantine */
@@ -324,7 +324,7 @@ typedef struct PCPConnInfo
char *errMsg; /* error message, or NULL if no error */
ConnStateType connState;
PCPResultInfo *pcpResInfo;
- FILE *Pfdebug; /* File pointer to output debug infor */
+ FILE *Pfdebug; /* File pointer to output debug info */
} PCPConnInfo;
struct WdInfo;
diff --git a/src/include/pgproto/fe_memutils.h b/src/include/pgproto/fe_memutils.h
index 0167b968d..dd1a8f0b8 100644
--- a/src/include/pgproto/fe_memutils.h
+++ b/src/include/pgproto/fe_memutils.h
@@ -84,7 +84,7 @@ extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) p
memset(_vstart, _val, _len); \
} while (0)
-/* originaly gettext staff */
+/* originally gettext staff */
#define _(x) x
/* Get a bit mask of the bits set in non-long aligned addresses */
diff --git a/src/include/pool.h b/src/include/pool.h
index 23599eb3c..fc84da641 100644
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -389,7 +389,7 @@ typedef enum
#define SI_CRITICAL_REGION_SEM 6
#define MAX_REQUEST_QUEUE_SIZE 10
-#define MAX_SEC_WAIT_FOR_CLUSTER_TRANSATION 10 /* time in seconds to keep
+#define MAX_SEC_WAIT_FOR_CLUSTER_TRANSACTION 10 /* time in seconds to keep
* retrying for a watchdog
* command if the cluster is
* not in stable state */
@@ -518,7 +518,7 @@ typedef enum
INITIALIZING,
PERFORMING_HEALTH_CHECK,
SLEEPING,
- WAITIG_FOR_CONNECTION,
+ WAITING_FOR_CONNECTION,
BACKEND_CONNECTING,
PROCESSING,
EXITING
@@ -547,9 +547,9 @@ extern void set_application_name(ProcessType ptype);
extern void set_application_name_with_string(char *string);
extern void set_application_name_with_suffix(ProcessType ptype, int suffix);
extern char *get_application_name(void);
-extern char *get_application_name_for_procees(ProcessType ptype);
+extern char *get_application_name_for_process(ProcessType ptype);
-void SetProcessGlobalVaraibles(ProcessType pType);
+void SetProcessGlobalVariables(ProcessType pType);
extern volatile SI_ManageInfo *si_manage_info;
extern volatile sig_atomic_t sigusr2_received;
diff --git a/src/include/pool_config.h b/src/include/pool_config.h
index 4b42f0e9a..d473dc1ea 100644
--- a/src/include/pool_config.h
+++ b/src/include/pool_config.h
@@ -468,7 +468,7 @@ typedef struct
char *database_redirect_preference_list; /* raw string in
* pgpool.conf */
RegArray *redirect_dbnames; /* Precompiled regex patterns for db
- * prefrence list */
+ * preference list */
Left_right_tokens *db_redirect_tokens; /* db redirect for dbname and node
* string */
@@ -479,7 +479,7 @@ typedef struct
char *app_name_redirect_preference_list; /* raw string in
* pgpool.conf */
RegArray *redirect_app_names; /* Precompiled regex patterns for app name
- * prefrence list */
+ * preference list */
Left_right_tokens *app_name_redirect_tokens; /* app name redirect for
* app_name and node
* string */
@@ -489,7 +489,7 @@ typedef struct
* possible. If off, SQL comments
* effectively prevent the judgment (pre
* 3.4 behavior). For backward
- * compatibilty sake, default is off. */
+ * compatibility sake, default is off. */
DLBOW_OPTION disable_load_balance_on_write; /* Load balance behavior when
* write query is issued in an
diff --git a/src/include/pool_config_variables.h b/src/include/pool_config_variables.h
index bf9b6a098..7aaa65052 100644
--- a/src/include/pool_config_variables.h
+++ b/src/include/pool_config_variables.h
@@ -29,7 +29,7 @@ typedef enum
{
CONNECTION_CONFIG,
CONNECTION_POOL_CONFIG,
- LOGING_CONFIG,
+ LOGGING_CONFIG,
HEALTH_CHECK_CONFIG,
FILE_LOCATION_CONFIG,
LOAD_BALANCE_CONFIG,
@@ -91,7 +91,7 @@ typedef enum
#define VAR_NO_RESET_ALL 0x0008 /* for variables not to be reset
* with reset all */
#define ARRAY_VAR_ALLOW_NO_INDEX 0x0010 /* for array type vars that also
- * alows variable with same naem
+ * allows variable with same name
* with out index */
#define DEFAULT_FOR_NO_VALUE_ARRAY_VAR 0x0020
@@ -156,15 +156,15 @@ struct config_generic
GucSource *sources; /* source of the current actual value, For
* array type config elements it contains the
- * corosponding source of each individual
+ * corresponding source of each individual
* element */
GucSource *reset_sources; /* source of the reset value, For array type
* config elements it contains the
- * corosponding source of each individual
+ * corresponding source of each individual
* element */
ConfigContext *scontexts; /* context that set the current value, For
* array type config elements it contains the
- * corosponding context of each individual
+ * corresponding context of each individual
* element */
};
@@ -302,7 +302,7 @@ struct config_string_list
char ***variable;
int *list_elements_count;
const char *boot_val;
- const char *seperator;
+ const char *separator;
bool compute_regex;
ConfigStringListAssignFunc assign_func;
ConfigStringListAssignFunc check_func;
diff --git a/src/include/protocol/pool_pg_utils.h b/src/include/protocol/pool_pg_utils.h
index 1f82d5a14..25de6b2a6 100644
--- a/src/include/protocol/pool_pg_utils.h
+++ b/src/include/protocol/pool_pg_utils.h
@@ -55,9 +55,9 @@ extern PGVersion *Pgversion(POOL_CONNECTION_POOL * backend);
/* pool_pg_utils.c */
extern bool si_snapshot_prepared(void);
-extern bool si_snapshot_aquire_command(Node *node);
-extern void si_aquire_snapshot(void);
-extern void si_snapshot_aquired(void);
+extern bool si_snapshot_acquire_command(Node *node);
+extern void si_acquire_snapshot(void);
+extern void si_snapshot_acquired(void);
extern void si_commit_request(void);
extern void si_commit_done(void);
diff --git a/src/include/protocol/pool_proto_modules.h b/src/include/protocol/pool_proto_modules.h
index 8191e84c9..31315dd89 100644
--- a/src/include/protocol/pool_proto_modules.h
+++ b/src/include/protocol/pool_proto_modules.h
@@ -165,7 +165,7 @@ extern int detect_deadlock_error(POOL_CONNECTION * backend, int major);
extern int detect_serialization_error(POOL_CONNECTION * backend, int major, bool unread);
extern int detect_active_sql_transaction_error(POOL_CONNECTION * backend, int major);
extern int detect_query_cancel_error(POOL_CONNECTION * backend, int major);
-extern int detect_idle_in_transaction_sesion_timeout_error(POOL_CONNECTION * backend, int major);
+extern int detect_idle_in_transaction_session_timeout_error(POOL_CONNECTION * backend, int major);
extern bool is_partition_table(POOL_CONNECTION_POOL * backend, Node *node);
extern POOL_STATUS pool_discard_packet(POOL_CONNECTION_POOL * cp);
extern void query_cache_register(char kind, POOL_CONNECTION * frontend, char *database, char *data, int data_len);
diff --git a/src/include/utils/pool_select_walker.h b/src/include/utils/pool_select_walker.h
index eaa0a6fea..c04d2e986 100644
--- a/src/include/utils/pool_select_walker.h
+++ b/src/include/utils/pool_select_walker.h
@@ -42,7 +42,7 @@ typedef struct
bool has_view; /* True if view is used */
bool has_function_call; /* True if write function call is used */
int pg_terminate_backend_pid; /* pid argument of
- * pg_terminate_backedn_call(if
+ * pg_terminate_backend_call(if
* used) */
bool has_non_immutable_function_call; /* True if non immutable
* functions are used */
diff --git a/src/include/utils/regex_array.h b/src/include/utils/regex_array.h
index a50d1ea29..2317a56d7 100644
--- a/src/include/utils/regex_array.h
+++ b/src/include/utils/regex_array.h
@@ -39,7 +39,7 @@ typedef struct
RegArray *create_regex_array(void);
int add_regex_array(RegArray * ar, char *pattern);
int regex_array_match(RegArray * ar, char *pattern);
-void destroy_regex_arrary(RegArray * ar);
+void destroy_regex_array(RegArray * ar);
/*
* String left-right token type
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index d526bfc66..88123b672 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -16,7 +16,7 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
- * ppgool_logger.h.: ppgool_logger definition header file
+ * pgpool_logger.h.: pgpool_logger definition header file
*
*/
/*-------------------------------------------------------------------------
diff --git a/src/include/watchdog/watchdog.h b/src/include/watchdog/watchdog.h
index 8c7247cfa..65ba3189f 100644
--- a/src/include/watchdog/watchdog.h
+++ b/src/include/watchdog/watchdog.h
@@ -154,7 +154,7 @@ typedef struct WatchdogNode
*/
int sending_failures_count; /* number of times we have failed
* to send message to the node.
- * Gets reset after successfull sent
+ * Gets reset after successful sent
*/
int missed_beacon_count; /* number of times the node has
* failed to reply for beacon.
diff --git a/src/include/watchdog/wd_ipc_conn.h b/src/include/watchdog/wd_ipc_conn.h
index f754467ce..e60986774 100644
--- a/src/include/watchdog/wd_ipc_conn.h
+++ b/src/include/watchdog/wd_ipc_conn.h
@@ -31,7 +31,7 @@
typedef enum WdCommandResult
{
- CLUSTER_IN_TRANSATIONING,
+ CLUSTER_IN_TRANSACTIONING,
COMMAND_OK,
COMMAND_FAILED,
COMMAND_TIMEOUT
diff --git a/src/include/watchdog/wd_lifecheck.h b/src/include/watchdog/wd_lifecheck.h
index 2f0680a57..a990e9304 100644
--- a/src/include/watchdog/wd_lifecheck.h
+++ b/src/include/watchdog/wd_lifecheck.h
@@ -64,7 +64,7 @@ extern LifeCheckCluster * gslifeCheckCluster; /* lives in shared memory */
extern pid_t initialize_watchdog_lifecheck(void);
-/* wd_hearbeat.c */
+/* wd_heartbeat.c */
extern pid_t wd_hb_receiver(int fork_wait_time, WdHbIf * hb_if);
extern pid_t wd_hb_sender(int fork_wait_time, WdHbIf * hb_if);
diff --git a/src/libs/pcp/pcp.c b/src/libs/pcp/pcp.c
index 44e16baa5..709e2761c 100644
--- a/src/libs/pcp/pcp.c
+++ b/src/libs/pcp/pcp.c
@@ -92,7 +92,7 @@ static char *pwdfMatchesString(char *buf, char *token);
*/
/* Check if PCP connection is connected and authenticated
- * return 1 on successfull 0 otherwise
+ * return 1 on successful 0 otherwise
*/
PCPConnInfo *
@@ -101,7 +101,7 @@ pcp_connect(char *hostname, int port, char *username, char *password, FILE *Pfde
struct sockaddr_in addr;
struct sockaddr_un unix_addr;
struct hostent *hp;
- char *password_fron_file = NULL;
+ char *password_from_file = NULL;
char os_user[256];
PCPConnInfo *pcpConn = palloc0(sizeof(PCPConnInfo));
int fd;
@@ -228,8 +228,8 @@ pcp_connect(char *hostname, int port, char *username, char *password, FILE *Pfde
char port_str[100];
snprintf(port_str, sizeof(port_str), "%d", port);
- password_fron_file = PasswordFromFile(pcpConn, hostname, port_str, username);
- password = password_fron_file;
+ password_from_file = PasswordFromFile(pcpConn, hostname, port_str, username);
+ password = password_from_file;
}
if (pcp_authorize(pcpConn, username, password) < 0)
@@ -241,8 +241,8 @@ pcp_connect(char *hostname, int port, char *username, char *password, FILE *Pfde
else
pcpConn->connState = PCP_CONNECTION_OK;
- if (password_fron_file)
- pfree(password_fron_file);
+ if (password_from_file)
+ pfree(password_from_file);
return pcpConn;
}
@@ -866,7 +866,7 @@ pcp_reload_config(PCPConnInfo * pcpConn,char command_scope)
int wsize;
/*
* pcp packet format for pcp_reload_config
- * z[size][commmand_scope]
+ * z[size][command_scope]
*/
if (PCPConnectionStatus(pcpConn) != PCP_CONNECTION_OK)
{
diff --git a/src/main/main.c b/src/main/main.c
index e687ac0f9..2702bf283 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -222,7 +222,7 @@ main(int argc, char **argv)
hba_file = make_absolute_path(hba_file_path, base_dir);
mypid = getpid();
- SetProcessGlobalVaraibles(PT_MAIN);
+ SetProcessGlobalVariables(PT_MAIN);
pool_init_config();
@@ -361,7 +361,7 @@ main(int argc, char **argv)
pool_semaphore_create(MAX_NUM_SEMAPHORES);
- PgpoolMain(discard_status, clear_memcache_oidmaps); /* this is an infinate
+ PgpoolMain(discard_status, clear_memcache_oidmaps); /* this is an infinite
* loop */
exit(0);
@@ -481,7 +481,7 @@ daemonize(void)
#endif
mypid = getpid();
- SetProcessGlobalVaraibles(PT_MAIN);
+ SetProcessGlobalVariables(PT_MAIN);
write_pid_file();
if (chdir("/"))
ereport(WARNING,
diff --git a/src/main/pgpool_logger.c b/src/main/pgpool_logger.c
index 2f84cec52..346376b4b 100644
--- a/src/main/pgpool_logger.c
+++ b/src/main/pgpool_logger.c
@@ -525,7 +525,7 @@ SysLogger_Start(void)
case 0:
on_exit_reset();
- SetProcessGlobalVaraibles(PT_LOGGER);
+ SetProcessGlobalVariables(PT_LOGGER);
/* do the work */
SysLoggerMain(0, NULL);
break;
diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c
index b7ff5b424..e6e6290b3 100644
--- a/src/main/pgpool_main.c
+++ b/src/main/pgpool_main.c
@@ -74,15 +74,15 @@ typedef enum
* required */
SIG_WATCHDOG_QUORUM_CHANGED, /* notify main about cluster quorum change
* of watchdog cluster */
- SIG_INFORM_QURANTINE_NODES, /* notify main about send degenerate requests
+ SIG_INFORM_QUARANTINE_NODES, /* notify main about send degenerate requests
* for all quarantine nodes */
- MAX_INTERUPTS /* Must be last! */
+ MAX_INTERRUPTS /* Must be last! */
} User1SignalReason;
typedef struct User1SignalSlot
{
- sig_atomic_t signalFlags[MAX_INTERUPTS];
+ sig_atomic_t signalFlags[MAX_INTERRUPTS];
} User1SignalSlot;
/*
@@ -97,7 +97,7 @@ typedef struct User1SignalSlot
} \
if (sigusr1_request) \
{ \
- sigusr1_interupt_processor(); \
+ sigusr1_interrupt_processor(); \
sigusr1_request = 0; \
} \
if (sigchld_request) \
@@ -134,7 +134,7 @@ static int read_status_file(bool discard_status);
static RETSIGTYPE exit_handler(int sig);
static RETSIGTYPE reap_handler(int sig);
static RETSIGTYPE sigusr1_handler(int sig);
-static void sigusr1_interupt_processor(void);
+static void sigusr1_interrupt_processor(void);
static RETSIGTYPE reload_config_handler(int sig);
static RETSIGTYPE wakeup_handler(int sig);
@@ -213,7 +213,7 @@ BACKEND_STATUS *my_backend_status[MAX_NUM_BACKENDS]; /* Backend status buffer */
int my_main_node_id; /* Main node id buffer */
/*
- * Dummy varibale to suppress compiler warnings by discarding return values
+ * Dummy variable to suppress compiler warnings by discarding return values
* from write(2) in signal handlers
*/
static int dummy_status;
@@ -297,10 +297,10 @@ PgpoolMain(bool discard_status, bool clear_memcache_oidmaps)
/*
* Watchdog process fires SIGUSR2 once in stable state
- * In addition, when wathcodg fails to start with FATAL, the process
+ * In addition, when watchdog fails to start with FATAL, the process
* exits and SIGCHLD is fired, so we can also expect SIGCHLD from
* watchdog process. Finally, we also need to look for the SIGUSR1
- * signla for the failover requests from other watchdog nodes. In
+ * signal for the failover requests from other watchdog nodes. In
* case a request arrives at the same time when the watchdog has just
* been initialized.
*
@@ -350,7 +350,7 @@ PgpoolMain(bool discard_status, bool clear_memcache_oidmaps)
if (sigusr1_request)
{
- sigusr1_interupt_processor();
+ sigusr1_interrupt_processor();
sigusr1_request = 0;
}
}
@@ -470,7 +470,7 @@ PgpoolMain(bool discard_status, bool clear_memcache_oidmaps)
/*
* check for child signals to ensure child startup before reporting
- * successfull start.
+ * successful start.
*/
if (first)
{
@@ -576,25 +576,25 @@ register_node_operation_request(POOL_REQUEST_KIND kind, int *node_id_set, int co
}
void
-register_watchdog_quorum_change_interupt(void)
+register_watchdog_quorum_change_interrupt(void)
{
signal_user1_to_parent_with_reason(SIG_WATCHDOG_QUORUM_CHANGED);
}
void
-register_watchdog_state_change_interupt(void)
+register_watchdog_state_change_interrupt(void)
{
signal_user1_to_parent_with_reason(SIG_WATCHDOG_STATE_CHANGED);
}
void
-register_backend_state_sync_req_interupt(void)
+register_backend_state_sync_req_interrupt(void)
{
signal_user1_to_parent_with_reason(SIG_BACKEND_SYNC_REQUIRED);
}
void
register_inform_quarantine_nodes_req(void)
{
- signal_user1_to_parent_with_reason(SIG_INFORM_QURANTINE_NODES);
+ signal_user1_to_parent_with_reason(SIG_INFORM_QUARANTINE_NODES);
}
static void
@@ -617,7 +617,7 @@ pcp_fork_a_child(int unix_fd, int inet_fd, char *pcp_conf_file)
if (pid == 0)
{
on_exit_reset();
- SetProcessGlobalVaraibles(PT_PCP);
+ SetProcessGlobalVariables(PT_PCP);
close(pipe_fds[0]);
close(pipe_fds[1]);
@@ -665,7 +665,7 @@ fork_a_child(int *fds, int id)
close(pipe_fds[1]);
}
- SetProcessGlobalVaraibles(PT_CHILD);
+ SetProcessGlobalVariables(PT_CHILD);
/* call child main */
POOL_SETMASK(&UnBlockSig);
@@ -712,7 +712,7 @@ worker_fork_a_child(ProcessType type, void (*func) (), void *params)
close(pipe_fds[1]);
}
- SetProcessGlobalVaraibles(type);
+ SetProcessGlobalVariables(type);
/* call child main */
POOL_SETMASK(&UnBlockSig);
@@ -1217,7 +1217,7 @@ static RETSIGTYPE sigusr1_handler(int sig)
static void
-sigusr1_interupt_processor(void)
+sigusr1_interrupt_processor(void)
{
ereport(DEBUG1,
(errmsg("Pgpool-II parent process received SIGUSR1")));
@@ -1237,12 +1237,12 @@ sigusr1_interupt_processor(void)
}
}
- if (user1SignalSlot->signalFlags[SIG_INFORM_QURANTINE_NODES])
+ if (user1SignalSlot->signalFlags[SIG_INFORM_QUARANTINE_NODES])
{
ereport(LOG,
(errmsg("Pgpool-II parent process received inform quarantine nodes signal from watchdog")));
- user1SignalSlot->signalFlags[SIG_INFORM_QURANTINE_NODES] = false;
+ user1SignalSlot->signalFlags[SIG_INFORM_QUARANTINE_NODES] = false;
degenerate_all_quarantine_nodes();
}
@@ -1472,7 +1472,7 @@ failover(void)
/*
* recalculate the main node id after setting the backend
* status of quarantined node, this will bring us to the old
- * main_node_id that was beofre the quarantine state
+ * main_node_id that was before the quarantine state
*/
Req_info->main_node_id = get_next_main_node();
if (Req_info->primary_node_id == -1 &&
@@ -1572,7 +1572,7 @@ failover(void)
* node and that node had a primary role before it was
* quarantined, Restore the primary node status for
* that node before degenerating it. This is important
- * for the failover script to get the proper valueo of
+ * for the failover script to get the proper value of
* old primary
*/
if (Req_info->primary_node_id == -1 &&
@@ -1811,7 +1811,7 @@ failover(void)
else if (search_primary == false)
{
ereport(DEBUG1,
- (errmsg("faliover was called on quarantined node. No need to search for primary node")));
+ (errmsg("failover was called on quarantined node. No need to search for primary node")));
new_primary = Req_info->primary_node_id;
}
else
@@ -1917,7 +1917,7 @@ failover(void)
* not be received by pgpool child. This could happen if
* multiple PostgreSQL are going down (or even starting
* pgpool, without starting PostgreSQL can trigger this).
- * Child calls degenerate_backend() and it tries to aquire
+ * Child calls degenerate_backend() and it tries to acquire
* semaphore to write a failover request. In this case the
* signal mask is set as well, thus signals are never
* received.
@@ -2204,7 +2204,7 @@ static RETSIGTYPE reap_handler(int sig)
/*
* pool_waitpid:
* nothing more than a wrapper function over NOHANG mode waitpid() or wait3()
- * depending on the existance of waitpid in the system
+ * depending on the existence of waitpid in the system
*/
pid_t
pool_waitpid(int *status)
@@ -2320,7 +2320,7 @@ reaper(void)
(errmsg("%s process with pid: %d exits with status %d by signal %d", exiting_process_name, pid, status, WTERMSIG(status))));
/*
- * If the watchdog process was terminated abonormally. we need to
+ * If the watchdog process was terminated abnormally. we need to
* set the cleanup flag so that the new watchdog process can start
* without problems
*/
@@ -2969,7 +2969,7 @@ verify_backend_node_status(POOL_CONNECTION_POOL_SLOT * *slots)
if (!check_connectivity)
{
ereport(DEBUG1,
- (errmsg("verify_backend_node_status: server verion is lower than 9.6.0. Skipping connectivity checks")));
+ (errmsg("verify_backend_node_status: server version is lower than 9.6.0. Skipping connectivity checks")));
return pool_node_status;
}
@@ -3269,7 +3269,7 @@ fork_follow_child(int old_main_node, int new_primary, int old_primary)
if (pid == 0)
{
on_exit_reset();
- SetProcessGlobalVaraibles(PT_FOLLOWCHILD);
+ SetProcessGlobalVariables(PT_FOLLOWCHILD);
ereport(LOG,
(errmsg("start triggering follow command.")));
for (i = 0; i < pool_config->backend_desc->num_backends; i++)
@@ -3304,7 +3304,7 @@ initialize_shared_mem_objects(bool clear_memcache_oidmaps)
/*
* Calculate the size of required shared memory and try to allocate
- * everyting in sigle memory segment
+ * everything in single memory segment
*/
size = 256;/* let us have some extra space */
size += MAXALIGN(sizeof(BackendDesc));
@@ -3725,7 +3725,7 @@ reload_config(void)
pool_get_config(conf_file, CFGCXT_RELOAD);
- /* Realoading config file could change backend status */
+ /* Reloading config file could change backend status */
(void) write_status_file();
MemoryContextSwitchTo(oldContext);
@@ -3835,7 +3835,7 @@ update_backend_quarantine_status(void)
* nodes from the LEADER/COORDINATOR watchdog Pgpool-II and synchronize the
* local backend states with the cluster wide status of each node.
*
- * Latter in the funcrtion after syncing the backend node status the function
+ * Latter in the function after syncing the backend node status the function
* do a partial or full restart of Pgpool-II children depending upon the
* Pgpool-II mode and type of node status change
*
@@ -3848,7 +3848,7 @@ sync_backend_from_watchdog(void)
bool node_status_was_changed_to_up = false;
bool need_to_restart_children = false;
bool partial_restart = false;
- bool reload_maste_node_id = false;
+ bool reload_master_node_id = false;
int down_node_ids[MAX_NUM_BACKENDS];
int down_node_ids_index = 0;
@@ -3901,7 +3901,7 @@ sync_backend_from_watchdog(void)
BACKEND_INFO(i).backend_status = CON_DOWN;
pool_set_backend_status_changed_time(i);
my_backend_status[i] = &(BACKEND_INFO(i).backend_status);
- reload_maste_node_id = true;
+ reload_master_node_id = true;
node_status_was_changed_to_down = true;
ereport(LOG,
(errmsg("backend:%d is set to down status", i),
@@ -3920,7 +3920,7 @@ sync_backend_from_watchdog(void)
BACKEND_INFO(i).backend_status = CON_CONNECT_WAIT;
pool_set_backend_status_changed_time(i);
my_backend_status[i] = &(BACKEND_INFO(i).backend_status);
- reload_maste_node_id = true;
+ reload_master_node_id = true;
ereport(LOG,
(errmsg("backend:%d is set to UP status", i),
@@ -3946,7 +3946,7 @@ sync_backend_from_watchdog(void)
* leader node returns primary_node_id = -1 when the primary node is
* in quarantine state on the leader. So we will not update our
* primary node id when the status of current primary node is not
- * CON_DOWN while primary_node_id sent by leader watchdong node is -1
+ * CON_DOWN while primary_node_id sent by leader watchdog node is -1
*
* Note that Req_info->primary_node_id could be -2, which is the
* initial value. So we need to avoid crash by checking the value is
@@ -3970,7 +3970,7 @@ sync_backend_from_watchdog(void)
pfree(backendStatus);
- if (reload_maste_node_id)
+ if (reload_master_node_id)
{
Req_info->main_node_id = get_next_main_node();
}
@@ -3980,7 +3980,7 @@ sync_backend_from_watchdog(void)
return;
/*
- * Decide if All or subset of the Pgpool-II children needs immidiate
+ * Decide if All or subset of the Pgpool-II children needs immediate
* restart or we can do that after finishing the current session
*
* Check if there was no change at all
diff --git a/src/main/pool_globals.c b/src/main/pool_globals.c
index 8f9276a0c..d933b0528 100644
--- a/src/main/pool_globals.c
+++ b/src/main/pool_globals.c
@@ -53,7 +53,7 @@ char *application_names[] = {"main",
};
char *
-get_application_name_for_procees(ProcessType ptype)
+get_application_name_for_process(ProcessType ptype)
{
if (ptype < 0 || ptype >= PT_LAST_PTYPE)
{
@@ -69,7 +69,7 @@ get_application_name_for_procees(ProcessType ptype)
void
set_application_name(ProcessType ptype)
{
- process_application_name = get_application_name_for_procees(ptype);
+ process_application_name = get_application_name_for_process(ptype);
}
/*
@@ -89,7 +89,7 @@ void
set_application_name_with_suffix(ProcessType ptype, int suffix)
{
static char appname_buf[POOLCONFIG_MAXNAMELEN +1];
- snprintf(appname_buf, POOLCONFIG_MAXNAMELEN, "%s%d", get_application_name_for_procees(ptype), suffix);
+ snprintf(appname_buf, POOLCONFIG_MAXNAMELEN, "%s%d", get_application_name_for_process(ptype), suffix);
set_application_name_with_string(appname_buf);
}
@@ -102,7 +102,7 @@ get_application_name(void)
return process_application_name;
}
-void SetProcessGlobalVaraibles(ProcessType pType)
+void SetProcessGlobalVariables(ProcessType pType)
{
processType = pType;
myProcPid = getpid();
diff --git a/src/main/pool_internal_comms.c b/src/main/pool_internal_comms.c
index e8b33105f..9aa653c60 100644
--- a/src/main/pool_internal_comms.c
+++ b/src/main/pool_internal_comms.c
@@ -20,7 +20,7 @@
*/
/*
- * pool_internal_comms consistes of functions that can be called
+ * pool_internal_comms consists of functions that can be called
* from any pgpool-II process to instruct pgpool-II main process to
* perform a particular function
*/
@@ -94,8 +94,8 @@ bool terminate_pgpool(char mode, bool error)
* test_only: When set, function only checks if NODE DOWN operation can be
* executed on provided node ids and never registers the operation
* request.
- * For test_only case function returs false or throws an error as
- * soon as first non complient node in node_id_set is found
+ * For test_only case function returns false or throws an error as
+ * soon as first non compliant node in node_id_set is found
* switch_over: if set, the request is originated by switch over, not errors.
*
* wd_failover_id: The watchdog internal ID for this failover
@@ -162,7 +162,7 @@ degenerate_backend_set_ex(int *node_id_set, int count, unsigned char flags, bool
{
int x;
- for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSATION; x++)
+ for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSACTION; x++)
{
res = wd_degenerate_backend_set(node_id_set, count, flags);
if (res != FAILOVER_RES_TRANSITION)
@@ -268,7 +268,7 @@ promote_backend(int node_id, unsigned char flags)
{
int x;
- for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSATION; x++)
+ for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSACTION; x++)
{
res = wd_promote_backend(node_id, flags);
if (res != FAILOVER_RES_TRANSITION)
@@ -362,7 +362,7 @@ send_failback_request(int node_id, bool throw_error, unsigned char flags)
{
int x;
- for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSATION; x++)
+ for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSACTION; x++)
{
res = wd_send_failback_request(node_id, flags);
if (res != FAILOVER_RES_TRANSITION)
@@ -403,7 +403,7 @@ send_failback_request(int node_id, bool throw_error, unsigned char flags)
}
/*
- * Reuest failover. If "switch_over" is false, request all existing sessions
+ * Request failover. If "switch_over" is false, request all existing sessions
* restarting.
*/
void
diff --git a/src/parser/copyfuncs.c b/src/parser/copyfuncs.c
index ae91ed35e..b8a14664e 100644
--- a/src/parser/copyfuncs.c
+++ b/src/parser/copyfuncs.c
@@ -1250,8 +1250,8 @@ _copyPartitionedRelPruneInfo(const PartitionedRelPruneInfo *from)
COPY_POINTER_FIELD(subplan_map, from->nparts * sizeof(int));
COPY_POINTER_FIELD(subpart_map, from->nparts * sizeof(int));
COPY_POINTER_FIELD(relid_map, from->nparts * sizeof(Oid));
- COPY_NODE_FIELD(initial_pruning_steps);
- COPY_NODE_FIELD(exec_pruning_steps);
+ COPY_NODE_FIELD(initial_prunning_steps);
+ COPY_NODE_FIELD(exec_prunning_steps);
COPY_BITMAPSET_FIELD(execparamids);
return newnode;
diff --git a/src/parser/gram.y b/src/parser/gram.y
index ab6dedee9..f147ccd06 100644
--- a/src/parser/gram.y
+++ b/src/parser/gram.y
@@ -1457,7 +1457,7 @@ VariableSetStmt:
PGPOOL SET generic_set
{
VariableSetStmt *n = $3;
- n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minumum */
+ n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minimum */
n->is_local = false;
$$ = (Node *) n;
}
@@ -1717,7 +1717,7 @@ VariableResetStmt:
| PGPOOL RESET generic_reset
{
VariableSetStmt *n = $3;
- n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minumum */
+ n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minimum */
$$ = (Node *) n;
}
;
diff --git a/src/parser/gram_minimal.y b/src/parser/gram_minimal.y
index fcee88ca6..98e152319 100644
--- a/src/parser/gram_minimal.y
+++ b/src/parser/gram_minimal.y
@@ -1459,7 +1459,7 @@ VariableSetStmt:
PGPOOL SET generic_set
{
VariableSetStmt *n = $3;
- n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minumum */
+ n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minimum */
n->is_local = false;
$$ = (Node *) n;
}
@@ -1719,7 +1719,7 @@ VariableResetStmt:
| PGPOOL RESET generic_reset
{
VariableSetStmt *n = $3;
- n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minumum */
+ n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minimum */
$$ = (Node *) n;
}
;
diff --git a/src/parser/gram_template.y b/src/parser/gram_template.y
index ac98a526b..466971638 100644
--- a/src/parser/gram_template.y
+++ b/src/parser/gram_template.y
@@ -1480,7 +1480,7 @@ VariableSetStmt:
PGPOOL SET generic_set
{
VariableSetStmt *n = $3;
- n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minumum */
+ n->type = T_PgpoolVariableSetStmt; /* Hack to keep changes minimum */
n->is_local = false;
$$ = (Node *) n;
}
@@ -1740,7 +1740,7 @@ VariableResetStmt:
| PGPOOL RESET generic_reset
{
VariableSetStmt *n = $3;
- n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minumum */
+ n->type = T_PgpoolVariableSetStmt; /* Hack to keep the changes minimum */
$$ = (Node *) n;
}
;
diff --git a/src/parser/outfuncs.c b/src/parser/outfuncs.c
index ab1541713..c7921358a 100644
--- a/src/parser/outfuncs.c
+++ b/src/parser/outfuncs.c
@@ -1349,9 +1349,9 @@ _outTypeName(String * str, TypeName *node)
int mask = v->val.val.ival;
/*
- * precision for SECOND field. backword comaptibility. use
+ * precision for SECOND field. backward compatibility. use
* `'1.2 second'::interval(0) second' not `'1.2
- * second'::interval second(0)'(standarad for 8.4).
+ * second'::interval second(0)'(standard for 8.4).
*/
if ((INTERVAL_MASK(SECOND) & mask) &&
list_length(node->typmods) == 2)
@@ -3211,7 +3211,7 @@ _outSetRest(String * str, VariableSetStmt *node)
{
A_Const *v = linitial(node->args);
- string_append_char(str, "XML OPTOIN ");
+ string_append_char(str, "XML OPTION ");
string_append_char(str, v->val.val.str);
}
else
@@ -3944,7 +3944,7 @@ _outCreateOpClassStmt(String * str, CreateOpClassStmt *node)
}
/*
- * Handle drop satements. As of pgpool-II 3.3(derived parser from
+ * Handle drop statements. As of pgpool-II 3.3(derived parser from
* PostgreSQL 9.2), following types are supported:
*
* DROP TABLE, DROP SEQUENCE, DROP VIEW, DROP INDEX, DROP FOREIGN
@@ -4574,7 +4574,7 @@ _outAlterObjectSchemaStmt(String * str, AlterObjectSchemaStmt *node)
string_append_char(str, "*");
else
_outNode(str, lfirst(list_head(owa->objargs)));
- string_append_char(str, ") SET SCHAME \"");
+ string_append_char(str, ") SET SCHEME \"");
string_append_char(str, node->newschema);
string_append_char(str, "\"");
break;
diff --git a/src/pcp_con/README.add_pcp_command b/src/pcp_con/README.add_pcp_command
index 43da89d33..75cbcf444 100644
--- a/src/pcp_con/README.add_pcp_command
+++ b/src/pcp_con/README.add_pcp_command
@@ -9,7 +9,7 @@ character (in the example 'H'). In the case statement,
set_ps_display() is called to show what the PCP server is doing. Then
"inform_xxx" function (in the example inform_health_check_stats) is
called. this function is responsible for creating packet and sends to
-PCP frontend. The parameter is "pcp_frontend" which is the conection
+PCP frontend. The parameter is "pcp_frontend" which is the connection
object to the PCP frontend and "buf" which includes data send from the
PCP client.
@@ -24,7 +24,7 @@ pcp_write(). Usually the character is lower case of the server side
protocol character (in the example 'h').
Next send an 4 byte integer representing the packet length in network
-byte order. Note that the length includes the interger itself.
+byte order. Note that the length includes the integer itself.
Finally send the protocol body followed by do_pcp_flush() which flush
out the internal network write buffer.
diff --git a/src/pcp_con/pcp_child.c b/src/pcp_con/pcp_child.c
index 59a304097..ee6b1bef2 100644
--- a/src/pcp_con/pcp_child.c
+++ b/src/pcp_con/pcp_child.c
@@ -267,7 +267,7 @@ start_pcp_command_processor_process(int port)
if (pid == 0) /* child */
{
- SetProcessGlobalVaraibles(PT_PCP_WORKER);
+ SetProcessGlobalVariables(PT_PCP_WORKER);
on_exit_reset();
/* Close the listen sockets sockets */
@@ -461,7 +461,7 @@ pcp_mark_recovery_in_progress(void)
pool_sigset_t oldmask;
/*
- * only pcp worker is allowd to make this call
+ * only pcp worker is allowed to make this call
*/
if (processType != PT_PCP_WORKER)
return false;
@@ -477,7 +477,7 @@ pcp_mark_recovery_in_progress(void)
/*
* unsets the shared memory flag to indicate pcp recovery command
- * is finsihed.
+ * is finished.
*/
void
pcp_mark_recovery_finished(void)
@@ -485,7 +485,7 @@ pcp_mark_recovery_finished(void)
pool_sigset_t oldmask;
/*
- * only pcp worker is allowd to make this call
+ * only pcp worker is allowed to make this call
*/
if (processType != PT_PCP_WORKER)
return;
diff --git a/src/pcp_con/pcp_worker.c b/src/pcp_con/pcp_worker.c
index cf123e7ee..47211dd07 100644
--- a/src/pcp_con/pcp_worker.c
+++ b/src/pcp_con/pcp_worker.c
@@ -88,8 +88,8 @@ static void process_attach_node(PCP_CONNECTION * frontend, char *buf);
static void process_recovery_request(PCP_CONNECTION * frontend, char *buf);
static void process_status_request(PCP_CONNECTION * frontend);
static void process_promote_node(PCP_CONNECTION * frontend, char *buf, char tos);
-static void process_shutown_request(PCP_CONNECTION * frontend, char mode, char tos);
-static void process_set_configration_parameter(PCP_CONNECTION * frontend, char *buf, int len);
+static void process_shutdown_request(PCP_CONNECTION * frontend, char mode, char tos);
+static void process_set_configuration_parameter(PCP_CONNECTION * frontend, char *buf, int len);
static void pcp_worker_will_go_down(int code, Datum arg);
@@ -259,8 +259,8 @@ pcp_process_command(char tos, char *buf, int buf_len)
switch (tos)
{
case 'A': /* set configuration parameter */
- set_ps_display("PCP: processing set configration parameter request", false);
- process_set_configration_parameter(pcp_frontend, buf, buf_len);
+ set_ps_display("PCP: processing set configuration parameter request", false);
+ process_set_configuration_parameter(pcp_frontend, buf, buf_len);
break;
case 'L': /* node count */
@@ -307,7 +307,7 @@ pcp_process_command(char tos, char *buf, int buf_len)
case 'T':
case 't':
set_ps_display("PCP: processing shutdown request", false);
- process_shutown_request(pcp_frontend, buf[0], tos);
+ process_shutdown_request(pcp_frontend, buf[0], tos);
break;
case 'O': /* recovery request */
@@ -536,7 +536,7 @@ pool_detach_node(int node_id, bool gracefully)
/*
* Wait until all frontends exit
*/
- *InRecovery = RECOVERY_DETACH; /* This wiil ensure that new incoming
+ *InRecovery = RECOVERY_DETACH; /* This will ensure that new incoming
* connection requests are blocked */
if (wait_connection_closed())
@@ -587,7 +587,7 @@ pool_promote_node(int node_id, bool gracefully)
/*
* Wait until all frontends exit
*/
- *InRecovery = RECOVERY_PROMOTE; /* This wiil ensure that new incoming
+ *InRecovery = RECOVERY_PROMOTE; /* This will ensure that new incoming
* connection requests are blocked */
if (wait_connection_closed())
@@ -798,7 +798,7 @@ inform_watchdog_info(PCP_CONNECTION * frontend, char *buf)
if (!pool_config->use_watchdog)
ereport(ERROR,
(errmsg("PCP: informing watchdog info failed"),
- errdetail("watcdhog is not enabled")));
+ errdetail("watchdog is not enabled")));
wd_index = atoi(buf);
@@ -813,8 +813,8 @@ inform_watchdog_info(PCP_CONNECTION * frontend, char *buf)
errdetail("retrieved node information from IPC socket")));
/*
- * This is the voilation of PCP protocol but I think in future we should
- * shift to more adaptable protocol for data transmition.
+ * This is the violation of PCP protocol but I think in future we should
+ * shift to more adaptable protocol for data transmission.
*/
json_data_len = strlen(json_data);
wsize = htonl(sizeof(code) +
@@ -916,7 +916,7 @@ inform_node_info(PCP_CONNECTION * frontend, char *buf)
*
* The protocol starts with 'h', followed by 4-byte packet length integer in
* network byte order including self. Each data is represented as a null
- * terminted string. The order of each data is defined in
+ * terminated string. The order of each data is defined in
* POOL_HEALTH_CHECK_STATS struct.
*/
static void
@@ -1025,7 +1025,7 @@ process_reload_config(PCP_CONNECTION * frontend, char scope)
if (wd_execute_cluster_command(WD_COMMAND_RELOAD_CONFIG_CLUSTER,0, NULL) != COMMAND_OK)
ereport(ERROR,
(errmsg("PCP: error while processing reload config request for cluster"),
- errdetail("failed to propogate reload config command through watchdog")));
+ errdetail("failed to propagate reload config command through watchdog")));
}
if(pool_signal_parent(SIGHUP) == -1)
@@ -1302,7 +1302,7 @@ send_md5salt(PCP_CONNECTION * frontend, char *salt)
}
static void
-process_shutown_request(PCP_CONNECTION * frontend, char mode, char tos)
+process_shutdown_request(PCP_CONNECTION * frontend, char mode, char tos)
{
char code[] = "CommandComplete";
int len;
@@ -1312,7 +1312,7 @@ process_shutown_request(PCP_CONNECTION * frontend, char mode, char tos)
errdetail("shutdown mode \"%c\"", mode)));
/* quickly bail out if invalid mode is specified
- * because we do not want to propogate the command
+ * because we do not want to propagate the command
* with invalid mode over the watchdog network */
if (mode != 's' && mode != 'i' && mode != 'f' )
{
@@ -1334,7 +1334,7 @@ process_shutown_request(PCP_CONNECTION * frontend, char mode, char tos)
if (wd_execute_cluster_command(WD_COMMAND_SHUTDOWN_CLUSTER,1, &wdExecCommandArg) != COMMAND_OK)
ereport(ERROR,
(errmsg("PCP: error while processing shutdown cluster request"),
- errdetail("failed to propogate shutdown command through watchdog")));
+ errdetail("failed to propagate shutdown command through watchdog")));
}
pcp_write(frontend, "t", 1);
@@ -1347,7 +1347,7 @@ process_shutown_request(PCP_CONNECTION * frontend, char mode, char tos)
}
static void
-process_set_configration_parameter(PCP_CONNECTION * frontend, char *buf, int len)
+process_set_configuration_parameter(PCP_CONNECTION * frontend, char *buf, int len)
{
char *param_name;
char *param_value;
diff --git a/src/pcp_con/recovery.c b/src/pcp_con/recovery.c
index 4ae1cedf7..b8ef7c97e 100644
--- a/src/pcp_con/recovery.c
+++ b/src/pcp_con/recovery.c
@@ -510,7 +510,7 @@ int ensure_conn_counter_validity(void)
pool_config->recovery_timeout >= pool_config->client_idle_limit_in_recovery))
{
ereport(LOG,
- (errmsg("wait_connection_closed: mulformed conn_counter (%d) detected. reset it to 0",
+ (errmsg("wait_connection_closed: malformed conn_counter (%d) detected. reset it to 0",
Req_info->conn_counter)));
Req_info->conn_counter = 0;
return 0;
diff --git a/src/pgpool.spec b/src/pgpool.spec
index 09c6a5ac1..77be6a475 100644
--- a/src/pgpool.spec
+++ b/src/pgpool.spec
@@ -29,7 +29,7 @@ Release: 1pgdg%{?dist}
License: BSD
Group: Applications/Databases
Vendor: Pgpool Global Development Group
-URL: http://www.pgppol.net/
+URL: http://www.pgpool.net/
Source0: pgpool-II-%{version}.tar.gz
Source1: pgpool.init
Source2: pgpool_rhel6.sysconfig
@@ -87,10 +87,10 @@ Requires: %{name} = %{version}
Development headers and libraries for pgpool-II.
%package extensions
-Summary: Postgersql extensions for pgpool-II
+Summary: PostgreSQL extensions for pgpool-II
Group: Applications/Databases
%description extensions
-Postgresql extensions libraries and sql files for pgpool-II.
+PostgreSQL extensions libraries and sql files for pgpool-II.
%prep
%setup -q -n %{archive_name}
@@ -314,7 +314,7 @@ fi
%{pghome}/share/extension/pgpool-regclass.sql
%{pghome}/lib/pgpool-regclass.so
%endif
-# From PostgerSQL 11 the relevant files have to be installed
+# From PostgreSQL 11 the relevant files have to be installed
# into $pkglibdir/bitcode/
%if %{pgsql_ver} >= 110 && %{rhel} >= 7
%{pghome}/lib/bitcode/pgpool-recovery.index.bc
@@ -374,7 +374,7 @@ fi
- Adopt to PostgreSQL 9.4
* Thu Sep 25 2014 Tatsuo Ishii <ishii@sraoss.co.jp> 3.3.4-2
-- Split pgpool_regclass and pgpool_recovery as a separate extention package.
+- Split pgpool_regclass and pgpool_recovery as a separate extension package.
- Fix wrong OpenSSL build option.
* Fri Sep 5 2014 Yugo Nagata <nagata@sraoss.co.jp> 3.3.4-1
@@ -392,7 +392,7 @@ fi
- Add openssl support
* Tue Nov 26 2013 Nozomi Anzai <anzai@sraoss.co.jp> 3.3.1-1
-- Improved to specify the versions of pgool-II and PostgreSQL
+- Improved to specify the versions of pgpool-II and PostgreSQL
* Mon May 13 2013 Nozomi Anzai <anzai@sraoss.co.jp> 3.3.0-1
- Update to 3.3.0
diff --git a/src/protocol/CommandComplete.c b/src/protocol/CommandComplete.c
index f4339a280..3b8f90da4 100644
--- a/src/protocol/CommandComplete.c
+++ b/src/protocol/CommandComplete.c
@@ -42,9 +42,9 @@
static int extract_ntuples(char *message);
static POOL_STATUS handle_mismatch_tuples(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, char *packet, int packetlen, bool command_complete);
-static int foward_command_complete(POOL_CONNECTION * frontend, char *packet, int packetlen);
-static int foward_empty_query(POOL_CONNECTION * frontend, char *packet, int packetlen);
-static int foward_packet_to_frontend(POOL_CONNECTION * frontend, char kind, char *packet, int packetlen);
+static int forward_command_complete(POOL_CONNECTION * frontend, char *packet, int packetlen);
+static int forward_empty_query(POOL_CONNECTION * frontend, char *packet, int packetlen);
+static int forward_packet_to_frontend(POOL_CONNECTION * frontend, char kind, char *packet, int packetlen);
POOL_STATUS
CommandComplete(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, bool command_complete)
@@ -64,7 +64,7 @@ CommandComplete(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, bool
session_context = pool_get_session_context(false);
/*
- * Handle misc process which is neccessary when query context exists.
+ * Handle misc process which is necessary when query context exists.
*/
if (session_context->query_context != NULL && (!SL_MODE || (SL_MODE && !pool_is_doing_extended_query_message())))
handle_query_context(backend);
@@ -158,9 +158,9 @@ CommandComplete(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, bool
}
if (command_complete)
- status = foward_command_complete(frontend, p1, len1);
+ status = forward_command_complete(frontend, p1, len1);
else
- status = foward_empty_query(frontend, p1, len1);
+ status = forward_empty_query(frontend, p1, len1);
if (status < 0)
return POOL_END;
@@ -210,7 +210,7 @@ CommandComplete(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, bool
/*
* If we are in streaming replication mode and we are doing extended
- * query, reset query in progress flag and prevoius pending message.
+ * query, reset query in progress flag and previous pending message.
*/
if (SL_MODE && pool_is_doing_extended_query_message())
{
@@ -248,7 +248,7 @@ CommandComplete(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, bool
}
/*
- * Handle misc process which is neccessary when query context exists.
+ * Handle misc process which is necessary when query context exists.
*/
void
handle_query_context(POOL_CONNECTION_POOL * backend)
@@ -333,12 +333,12 @@ handle_query_context(POOL_CONNECTION_POOL * backend)
}
else if (stmt->kind == TRANS_STMT_COMMIT)
{
- /* Commit ongoing CRETAE/DROP temp table status */
+ /* Commit ongoing CREATE/DROP temp table status */
pool_temp_tables_commit_pending();
}
else if (stmt->kind == TRANS_STMT_ROLLBACK)
{
- /* Remove ongoing CRETAE/DROP temp table status */
+ /* Remove ongoing CREATE/DROP temp table status */
pool_temp_tables_remove_pending();
}
}
@@ -522,12 +522,12 @@ static POOL_STATUS handle_mismatch_tuples(POOL_CONNECTION * frontend, POOL_CONNE
{
if (command_complete)
{
- if (foward_command_complete(frontend, packet, packetlen) < 0)
+ if (forward_command_complete(frontend, packet, packetlen) < 0)
return POOL_END;
}
else
{
- if (foward_empty_query(frontend, packet, packetlen) < 0)
+ if (forward_empty_query(frontend, packet, packetlen) < 0)
return POOL_END;
}
}
@@ -539,25 +539,25 @@ static POOL_STATUS handle_mismatch_tuples(POOL_CONNECTION * frontend, POOL_CONNE
* Forward Command complete packet to frontend
*/
static int
-foward_command_complete(POOL_CONNECTION * frontend, char *packet, int packetlen)
+forward_command_complete(POOL_CONNECTION * frontend, char *packet, int packetlen)
{
- return foward_packet_to_frontend(frontend, 'C', packet, packetlen);
+ return forward_packet_to_frontend(frontend, 'C', packet, packetlen);
}
/*
* Forward Empty query response to frontend
*/
static int
-foward_empty_query(POOL_CONNECTION * frontend, char *packet, int packetlen)
+forward_empty_query(POOL_CONNECTION * frontend, char *packet, int packetlen)
{
- return foward_packet_to_frontend(frontend, 'I', packet, packetlen);
+ return forward_packet_to_frontend(frontend, 'I', packet, packetlen);
}
/*
* Forward packet to frontend
*/
static int
-foward_packet_to_frontend(POOL_CONNECTION * frontend, char kind, char *packet, int packetlen)
+forward_packet_to_frontend(POOL_CONNECTION * frontend, char kind, char *packet, int packetlen)
{
int sendlen;
diff --git a/src/protocol/child.c b/src/protocol/child.c
index bfcbea048..20a387f59 100644
--- a/src/protocol/child.c
+++ b/src/protocol/child.c
@@ -341,7 +341,7 @@ do_child(int *fds)
continue;
/*
- * Check if max connections from clients execeeded.
+ * Check if max connections from clients exceeded.
*/
con_count = connection_count_up();
if (con_count > (pool_config->num_init_children - pool_config->reserved_connections))
@@ -726,7 +726,7 @@ read_startup_packet(POOL_CONNECTION * cp)
errdetail("no PostgreSQL user name specified in startup packet")));
}
- /* The database defaults to ther user name. */
+ /* The database defaults to their user name. */
if (sp->database == NULL || sp->database[0] == '\0')
{
sp->database = pstrdup(sp->user);
@@ -1061,7 +1061,7 @@ static POOL_CONNECTION_POOL * connect_backend(StartupPacket *sp, POOL_CONNECTION
}
/*
- * signal handler for SIGTERM, SIGINT and SIGQUUT
+ * signal handler for SIGTERM, SIGINT and SIGQUIT
*/
static RETSIGTYPE die(int sig)
{
@@ -1132,7 +1132,7 @@ static RETSIGTYPE close_idle_connection(int sig)
int save_errno = errno;
/*
- * DROP DATABSE is ongoing.
+ * DROP DATABASE is ongoing.
*/
if (ignore_sigusr1)
return;
@@ -1418,7 +1418,7 @@ static void
check_restart_request(void)
{
/*
- * Check if restart request is set because of failback event happend. If
+ * Check if restart request is set because of failback event happened. If
* so, exit myself with exit code 1 to be restarted by pgpool parent.
*/
if (pool_get_my_process_info()->need_to_restart)
@@ -1435,8 +1435,8 @@ check_restart_request(void)
/*
* wait_for_new_connections()
* functions calls select on sockets and wait for new client
- * to connect, on successfull connection returns the socket descriptor
- * and returns -1 if timeout has occured
+ * to connect, on successful connection returns the socket descriptor
+ * and returns -1 if timeout has occurred
*/
static int
diff --git a/src/protocol/pool_connection_pool.c b/src/protocol/pool_connection_pool.c
index 465a17f06..e84822ead 100644
--- a/src/protocol/pool_connection_pool.c
+++ b/src/protocol/pool_connection_pool.c
@@ -559,7 +559,7 @@ connect_unix_domain_socket_by_port(int port, char *socket_dir, bool retry)
}
/*
- * Connet to backend using pool_config->connect_timeout.
+ * Connect to backend using pool_config->connect_timeout.
*
* fd: the socket
* walk: backend address to connect
@@ -668,7 +668,7 @@ connect_with_timeout(int fd, struct addrinfo *walk, char *host, int port, bool r
* If read data or write data was set, either connect
* succeeded or error. We need to figure it out. This is the
* hardest part in using non blocking connect(2). See W.
- * Richar Stevens's "UNIX Network Programming: Volume 1,
+ * Richard Stevens's "UNIX Network Programming: Volume 1,
* Second Edition" section 15.4.
*/
if (FD_ISSET(fd, &rset) || FD_ISSET(fd, &wset))
diff --git a/src/protocol/pool_pg_utils.c b/src/protocol/pool_pg_utils.c
index 9a4114131..904350dec 100644
--- a/src/protocol/pool_pg_utils.c
+++ b/src/protocol/pool_pg_utils.c
@@ -40,7 +40,7 @@
#include "pool_config_variables.h"
static int choose_db_node_id(char *str);
-static void free_persisten_db_connection_memory(POOL_CONNECTION_POOL_SLOT * cp);
+static void free_persistent_db_connection_memory(POOL_CONNECTION_POOL_SLOT * cp);
static void si_enter_critical_region(void);
static void si_leave_critical_region(void);
@@ -86,7 +86,7 @@ make_persistent_db_connection(
if (fd < 0)
{
- free_persisten_db_connection_memory(cp);
+ free_persistent_db_connection_memory(cp);
pfree(startup_packet);
ereport(ERROR,
(errmsg("failed to make persistent db connection"),
@@ -108,7 +108,7 @@ make_persistent_db_connection(
if (len1 >= (sizeof(startup_packet->data) - len))
{
pool_close(cp->con);
- free_persisten_db_connection_memory(cp);
+ free_persistent_db_connection_memory(cp);
pfree(startup_packet);
ereport(ERROR,
(errmsg("failed to make persistent db connection"),
@@ -120,7 +120,7 @@ make_persistent_db_connection(
if (len1 >= (sizeof(startup_packet->data) - len))
{
pool_close(cp->con);
- free_persisten_db_connection_memory(cp);
+ free_persistent_db_connection_memory(cp);
pfree(startup_packet);
ereport(ERROR,
(errmsg("failed to make persistent db connection"),
@@ -132,7 +132,7 @@ make_persistent_db_connection(
if (len1 >= (sizeof(startup_packet->data) - len))
{
pool_close(cp->con);
- free_persisten_db_connection_memory(cp);
+ free_persistent_db_connection_memory(cp);
pfree(startup_packet);
ereport(ERROR,
(errmsg("failed to make persistent db connection"),
@@ -161,7 +161,7 @@ make_persistent_db_connection(
PG_CATCH();
{
pool_close(cp->con);
- free_persisten_db_connection_memory(cp);
+ free_persistent_db_connection_memory(cp);
PG_RE_THROW();
}
PG_END_TRY();
@@ -205,7 +205,7 @@ make_persistent_db_connection_noerror(
* make_persistent_db_connection and discard_persistent_db_connection.
*/
static void
-free_persisten_db_connection_memory(POOL_CONNECTION_POOL_SLOT * cp)
+free_persistent_db_connection_memory(POOL_CONNECTION_POOL_SLOT * cp)
{
if (!cp)
return;
@@ -251,7 +251,7 @@ discard_persistent_db_connection(POOL_CONNECTION_POOL_SLOT * cp)
socket_unset_nonblock(cp->con->fd);
pool_close(cp->con);
- free_persisten_db_connection_memory(cp);
+ free_persistent_db_connection_memory(cp);
}
/*
@@ -355,7 +355,7 @@ select_load_balancing_node(void)
if (app_name && strlen(app_name) > 0)
{
/*
- * Check to see if the aplication name matches any of
+ * Check to see if the application name matches any of
* app_name_redirect_preference_list.
*/
index_app = regex_array_match(pool_config->redirect_app_names, app_name);
@@ -363,7 +363,7 @@ select_load_balancing_node(void)
{
/*
- * if the aplication name matches any of
+ * if the application name matches any of
* app_name_redirect_preference_list,
* database_redirect_preference_list will be ignored.
*/
@@ -725,10 +725,10 @@ si_snapshot_prepared(void)
}
/*
- * Reurns true if the command will aquire snapshot.
+ * Returns true if the command will acquire snapshot.
*/
bool
-si_snapshot_aquire_command(Node *node)
+si_snapshot_acquire_command(Node *node)
{
return !is_start_transaction_query(node) &&
!IsA(node, VariableSetStmt) &&
@@ -736,10 +736,10 @@ si_snapshot_aquire_command(Node *node)
}
/*
- * Aquire snapshot
+ * Acquire snapshot
*/
void
-si_aquire_snapshot(void)
+si_acquire_snapshot(void)
{
POOL_SESSION_CONTEXT *session;
@@ -750,13 +750,13 @@ si_aquire_snapshot(void)
for (;;)
{
si_enter_critical_region();
- elog(SI_DEBUG_LOG_LEVEL, "si_aquire_snapshot called: counter: %d", si_manage_info->snapshot_counter);
+ elog(SI_DEBUG_LOG_LEVEL, "si_acquire_snapshot called: counter: %d", si_manage_info->snapshot_counter);
if (si_manage_info->commit_counter > 0)
{
si_manage_info->commit_waiting_children[my_proc_id] = getpid();
si_leave_critical_region();
- elog(SI_DEBUG_LOG_LEVEL, "si_aquire_snapshot left critical region");
+ elog(SI_DEBUG_LOG_LEVEL, "si_acquire_snapshot left critical region");
sleep(1);
}
else
@@ -769,10 +769,10 @@ si_aquire_snapshot(void)
}
/*
- * Notice that snapshot is aquired
+ * Notice that snapshot is acquired
*/
void
-si_snapshot_aquired(void)
+si_snapshot_acquired(void)
{
POOL_SESSION_CONTEXT *session;
int i;
@@ -783,7 +783,7 @@ si_snapshot_aquired(void)
{
si_enter_critical_region();
- elog(SI_DEBUG_LOG_LEVEL, "si_snapshot_aquired called: counter: %d", si_manage_info->snapshot_counter);
+ elog(SI_DEBUG_LOG_LEVEL, "si_snapshot_acquired called: counter: %d", si_manage_info->snapshot_counter);
si_manage_info->snapshot_counter--;
@@ -795,7 +795,7 @@ si_snapshot_aquired(void)
pid_t pid = si_manage_info->snapshot_waiting_children[i];
if (pid > 0)
{
- elog(SI_DEBUG_LOG_LEVEL, "si_snapshot_aquired: send SIGUSR2 to %d", pid);
+ elog(SI_DEBUG_LOG_LEVEL, "si_snapshot_acquired: send SIGUSR2 to %d", pid);
kill(pid, SIGUSR2);
si_manage_info->snapshot_waiting_children[i] = 0;
}
diff --git a/src/protocol/pool_process_query.c b/src/protocol/pool_process_query.c
index dbe32e1b0..010489d8d 100644
--- a/src/protocol/pool_process_query.c
+++ b/src/protocol/pool_process_query.c
@@ -117,7 +117,7 @@ pool_process_query(POOL_CONNECTION * frontend,
* This variable is used while processing reset_request (i.e.:
* reset_request == 1). If state is 0, then we call reset_backend. And we
* set state to 1 so that we wait for ready for query message from
- * badckends.
+ * backends.
*/
int state;
@@ -396,7 +396,7 @@ pool_process_query(POOL_CONNECTION * frontend,
pool_unread(CONNECTION(backend, i), &kind, sizeof(kind));
ereport(LOG,
(errmsg("pool process query"),
- errdetail("received %c packet from backend %d. Don't dicard and read %c packet from main", kind, i, kind)));
+ errdetail("received %c packet from backend %d. Don't discard and read %c packet from main", kind, i, kind)));
pool_read_with_error(CONNECTION(backend, MAIN_NODE_ID), &kind, sizeof(kind),
"reading message kind from backend");
@@ -514,7 +514,7 @@ wait_for_query_response_with_trans_cleanup(POOL_CONNECTION * frontend, POOL_CONN
/*
* Wait for query response from single node. If frontend is not NULL,
* also check frontend connection by writing dummy parameter status
- * packet every 30 seccond, and if the connection broke, returns error
+ * packet every 30 second, and if the connection broke, returns error
* since there's no point in that waiting until backend returns
* response.
*/
@@ -540,7 +540,7 @@ wait_for_query_response(POOL_CONNECTION * frontend, POOL_CONNECTION * backend, i
if (status < 0) /* error ? */
{
ereport(ERROR,
- (errmsg("backend error occured while waiting for backend response")));
+ (errmsg("backend error occurred while waiting for backend response")));
}
else if (frontend != NULL && status > 0)
{
@@ -551,7 +551,7 @@ wait_for_query_response(POOL_CONNECTION * frontend, POOL_CONNECTION * backend, i
if (protoVersion == PROTO_MAJOR_V3)
{
/*
- * Write dummy parameter staus packet to check if the socket
+ * Write dummy parameter status packet to check if the socket
* to frontend is ok
*/
pool_write(frontend, "S", 1);
@@ -564,7 +564,7 @@ wait_for_query_response(POOL_CONNECTION * frontend, POOL_CONNECTION * backend, i
{
ereport(FRONTEND_ERROR,
(errmsg("unable to to flush data to frontend"),
- errdetail("frontend error occured while waiting for backend reply")));
+ errdetail("frontend error occurred while waiting for backend reply")));
}
}
@@ -588,7 +588,7 @@ wait_for_query_response(POOL_CONNECTION * frontend, POOL_CONNECTION * backend, i
{
ereport(FRONTEND_ERROR,
(errmsg("unable to to flush data to frontend"),
- errdetail("frontend error occured while waiting for backend reply")));
+ errdetail("frontend error occurred while waiting for backend reply")));
}
#endif
@@ -647,7 +647,7 @@ synchronize(POOL_CONNECTION * cp)
/*
* send "terminate"(X) message to all backends, indicating that
* backend should prepare to close connection to frontend (actually
- * pgpool). Note that caller must be proteceted from a signal
+ * pgpool). Note that caller must be protected from a signal
* interruption while calling this function. Otherwise the number of
* valid backends might be changed by failover/failback.
*/
@@ -815,7 +815,7 @@ SimpleForwardToFrontend(char kind, POOL_CONNECTION * frontend,
if (is_panic_or_fatal_error(p1, MAJOR(backend)))
ereport(ERROR,
(errmsg("unable to forward message to frontend"),
- errdetail("FATAL error occured on backend")));
+ errdetail("FATAL error occurred on backend")));
}
pfree(p1);
@@ -1062,9 +1062,9 @@ reset_backend(POOL_CONNECTION_POOL * backend, int qcnt)
/*
* Returns true if the SQL statement is regarded as read SELECT from syntax's
- * point of view. However callers need to do aditional checking such as if the
+ * point of view. However callers need to do additional checking such as if the
* SELECT does not have write functions or not to make sure that the SELECT is
- * sematically read SELECT.
+ * semantically read SELECT.
*
* For followings this function returns true:
* - SELECT/WITH without FOR UPDATE/SHARE
@@ -1397,7 +1397,7 @@ pool_send_readyforquery(POOL_CONNECTION * frontend)
/*
* Send a query to a backend in sync manner.
* This function sends a query and waits for CommandComplete/ReadyForQuery.
- * If an error occured, it returns with POOL_ERROR.
+ * If an error occurred, it returns with POOL_ERROR.
* This function does NOT handle SELECT/SHOW queries.
* If no_ready_for_query is non 0, returns without reading the packet
* length for ReadyForQuery. This mode is necessary when called from ReadyForQuery().
@@ -1418,7 +1418,7 @@ do_command(POOL_CONNECTION * frontend, POOL_CONNECTION * backend,
send_simplequery_message(backend, strlen(query) + 1, query, protoMajor);
/*
- * Wait for response from badckend while polling frontend connection is
+ * Wait for response from backend while polling frontend connection is
* ok. If not, cancel the transaction.
*/
wait_for_query_response_with_trans_cleanup(frontend,
@@ -1438,9 +1438,9 @@ do_command(POOL_CONNECTION * frontend, POOL_CONNECTION * backend,
/*
* Continue to read packets until we get ReadForQuery (Z). Until that we
- * may recieve one of:
+ * may receive one of:
*
- * N: Notice response E: Error response C: Comand complete
+ * N: Notice response E: Error response C: Command complete
*
* XXX: we ignore Notice and Error here. Even notice/error messages are
* not sent to the frontend. May be it's ok since the error was caused by
@@ -1454,7 +1454,7 @@ do_command(POOL_CONNECTION * frontend, POOL_CONNECTION * backend,
if (kind == 'Z') /* Ready for Query? */
break; /* get out the loop without reading message
- * lenghth */
+ * length */
if (protoMajor == PROTO_MAJOR_V3)
{
@@ -1591,7 +1591,7 @@ retry_read_packet:
if (protoMajor == PROTO_MAJOR_V3)
{
- /* read packet lenghth for ready for query */
+ /* read packet length for ready for query */
pool_read(backend, &len, sizeof(len));
/* read transaction state */
@@ -1628,9 +1628,9 @@ do_error_command(POOL_CONNECTION * backend, int major)
/*
* Continue to read packets until we get Error response (E). Until that we
- * may recieve one of:
+ * may receive one of:
*
- * N: Notice response C: Comand complete
+ * N: Notice response C: Command complete
*
* XXX: we ignore Notice here. Even notice messages are not sent to the
* frontend. May be it's ok since the error was caused by our internal use
@@ -1821,9 +1821,9 @@ free_select_result(POOL_SELECT_RESULT * result)
* Send a query to one DB node and wait for it's completion. The quey
* can be SELECT or any other type of query. However at this moment,
* the only client calls this function other than SELECT is
- * insert_lock(), and the qury is either LOCK or SELECT for UPDATE.
+ * insert_lock(), and the query is either LOCK or SELECT for UPDATE.
* Note: After the introduction of elog API the return type of do_query is changed
- * to void. and now ereport is thrown in case of error occured within the function
+ * to void. and now ereport is thrown in case of error occurred within the function
*/
void
do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, int major)
@@ -1834,7 +1834,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
/*
* State transition control bits. We expect all following events have
* been occur before finish do_query() in extended protocol mode.
- * Note that "Close Compplete" should occur twice, because two close
+ * Note that "Close Complete" should occur twice, because two close
* requests(one for prepared statement and the other for portal) have
* been sent.
*/
@@ -1890,10 +1890,10 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
res->data = palloc0(DO_QUERY_ALLOC_NUM * sizeof(char *));
/*
- * Send a query to the backend. We use extended query proctocol with named
- * statement/portal if we are processing exetended query since simple
+ * Send a query to the backend. We use extended query protocol with named
+ * statement/portal if we are processing extended query since simple
* query breaks unnamed statements/portals. The name of named
- * statment/unamed statement are "pgpool_PID" where PID is the process id
+ * statement/unnamed statement are "pgpool_PID" where PID is the process id
* of itself.
*/
if (pool_get_session_context(true) && pool_is_doing_extended_query_message())
@@ -1905,7 +1905,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
/*
* In streaming replication mode, send flush message before going any
* further to retrieve and save any pending response packet from
- * backend. The saved packets will be poped up before returning to
+ * backend. The saved packets will be popped up before returning to
* caller. This preserves the user's expectation of packet sequence.
*/
if (SL_MODE && pool_pending_message_exists())
@@ -1981,12 +1981,12 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
pool_write(backend, prepared_name, pname_len);
/*
- * Send descrive message if the query is SELECT.
+ * Send describe message if the query is SELECT.
*/
if (!strncasecmp(query, "SELECT", strlen("SELECT")))
{
/*
- * Send descrive message
+ * Send describe message
*/
pool_write(backend, "D", 1);
len = 4 + 1 + pname_len;
@@ -2075,7 +2075,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
if (processType == PT_WORKER)
{
/*
- * sleep appropreate time to avoid pool_worker_child
+ * sleep appropriate time to avoid pool_worker_child
* exit/fork storm.
*/
sleep(pool_config->sr_check_period);
@@ -2147,7 +2147,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
state |= COMMAND_COMPLETE_RECEIVED;
/*
- * "Comand Complete" implies data row received status if the
+ * "Command Complete" implies data row received status if the
* query was SELECT. If there's no row returned, "command
* complete" comes without row data.
*/
@@ -2223,7 +2223,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
}
num_fields = ntohs(shortval); /* number of fields */
ereport(DEBUG5,
- (errmsg("do_query: row description: num_fileds: %d", num_fields)));
+ (errmsg("do_query: row description: num_fields: %d", num_fields)));
if (num_fields > 0)
{
@@ -2406,7 +2406,7 @@ do_query(POOL_CONNECTION * backend, char *query, POOL_SELECT_RESULT * *result, i
* Judge if we need to lock the table
* to keep SERIAL consistency among servers
* Return values are:
- * 0: lock is not neccessary
+ * 0: lock is not necessary
* 1: table lock is required
* 2: row lock against sequence table is required
* 3: row lock against insert_lock table is required
@@ -3330,7 +3330,7 @@ read_kind_from_backend(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backen
ereport(FATAL,
(return_code(2),
errmsg("failed to read kind from backend %d", i),
- errdetail("pool_read retruns error")));
+ errdetail("pool_read returns error")));
}
if (kind == 0)
@@ -3472,7 +3472,7 @@ read_kind_from_backend(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backen
*
* Here, Sync message is sent to only primary, since the query context
* said so. Thus responses for Parse, Bind, and Execute for "BEGIN"
- * are still penidng on the standby node.
+ * are still pending on the standby node.
*
* The the frontend sends closes the transaction.
*
@@ -3533,7 +3533,7 @@ read_kind_from_backend(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backen
pfree(buf);
}
ereport(DEBUG5,
- (errmsg("read_kind_from_backend: skipped first standy packet")));
+ (errmsg("read_kind_from_backend: skipped first standby packet")));
for (;;)
{
@@ -3904,7 +3904,7 @@ is_internal_transaction_needed(Node *node)
T_ClosePortalStmt,
T_ClusterStmt,
T_CopyStmt,
- T_CreateStmt, /* CREAE TABLE */
+ T_CreateStmt, /* CREATE TABLE */
T_DefineStmt, /* CREATE AGGREGATE, OPERATOR, TYPE */
T_DropStmt, /* DROP TABLE etc. */
T_TruncateStmt,
@@ -4309,7 +4309,7 @@ detect_query_cancel_error(POOL_CONNECTION * backend, int major)
int
-detect_idle_in_transaction_sesion_timeout_error(POOL_CONNECTION * backend, int major)
+detect_idle_in_transaction_session_timeout_error(POOL_CONNECTION * backend, int major)
{
int r = extract_message(backend, IDLE_IN_TRANSACTION_SESSION_TIMEOUT_ERROR_CODE, major, 'E', true);
@@ -4397,7 +4397,7 @@ extract_message(POOL_CONNECTION * backend, char *error_code, int major, char cla
}
/*
- * The function forwards the NOTICE mesaage received from one backend
+ * The function forwards the NOTICE message received from one backend
* to the frontend and also puts the human readable message to the
* pgpool log
*/
@@ -4481,7 +4481,7 @@ pool_process_notice_message_from_one_backend(POOL_CONNECTION * frontend, POOL_CO
/*
* pool_extract_error_message: Extract human readable message from
- * ERROR/NOTICE reponse packet and return it. If "read_kind" is true,
+ * ERROR/NOTICE response packet and return it. If "read_kind" is true,
* kind will be read in this function. If "read_kind" is false, kind
* should have been already read and it should be either 'E' or
* 'N'. The returned string is in palloc'd buffer. Callers must pfree
@@ -4706,7 +4706,7 @@ SELECT_RETRY:
/*
* If we are in load balance mode and the selected node is down, we need
- * to re-select load_balancing_node. Note that we cannnot use
+ * to re-select load_balancing_node. Note that we cannot use
* VALID_BACKEND macro here. If in_load_balance == 1, VALID_BACKEND macro
* may return 0.
*/
@@ -4800,7 +4800,7 @@ SELECT_RETRY:
ereport(FRONTEND_ERROR,
(pool_error_code("57000"),
errmsg("connection terminated due to online recovery"),
- errdetail("child connection forced to terminate due to client_idle_limitis:-1")));
+ errdetail("child connection forced to terminate due to client_idle_limit:-1")));
}
goto SELECT_RETRY;
}
@@ -4815,7 +4815,7 @@ SELECT_RETRY:
if (CONNECTION_SLOT(backend, i) == 0)
{
ereport(LOG,
- (errmsg("error occured while reading and processing packets"),
+ (errmsg("error occurred while reading and processing packets"),
errdetail("FATAL ERROR: VALID_BACKEND returns non 0 but connection slot is empty. backend id:%d RAW_MODE:%d LOAD_BALANCE_STATUS:%d status:%d",
i, RAW_MODE, LOAD_BALANCE_STATUS(i), BACKEND_INFO(i).backend_status)));
was_error = 1;
@@ -4827,7 +4827,7 @@ SELECT_RETRY:
int r;
/*
- * connection was terminated due to confilct with recovery
+ * connection was terminated due to conflict with recovery
*/
r = detect_serialization_error(CONNECTION(backend, i), MAJOR(backend), false);
if (r == SPECIFIED_ERROR)
@@ -4841,9 +4841,9 @@ SELECT_RETRY:
}
/*
- * connection was terminated due to idle_in_transaction_sesion_timeout expired
+ * connection was terminated due to idle_in_transaction_session_timeout expired
*/
- r = detect_idle_in_transaction_sesion_timeout_error(CONNECTION(backend, i), MAJOR(backend));
+ r = detect_idle_in_transaction_session_timeout_error(CONNECTION(backend, i), MAJOR(backend));
if (r == SPECIFIED_ERROR)
{
ereport(FATAL,
@@ -4949,7 +4949,7 @@ SELECT_RETRY:
if (FD_ISSET(frontend->fd, &exceptmask))
ereport(ERROR,
(errmsg("unable to read from frontend socket"),
- errdetail("exception occured on frontend socket")));
+ errdetail("exception occurred on frontend socket")));
else if (FD_ISSET(frontend->fd, &readmask))
{
@@ -4962,7 +4962,7 @@ SELECT_RETRY:
if (FD_ISSET(MAIN(backend)->fd, &exceptmask))
ereport(FATAL,
(errmsg("unable to read from backend socket"),
- errdetail("exception occured on backend socket")));
+ errdetail("exception occurred on backend socket")));
else if (FD_ISSET(MAIN(backend)->fd, &readmask))
{
@@ -4986,7 +4986,7 @@ pool_dump_valid_backend(int backend_id)
}
/*
- * Read pending data from backend and push them into pending statck if any.
+ * Read pending data from backend and push them into pending stack if any.
* Should be used for streaming replication mode and extended query.
* Returns true if data was actually pushed.
*/
@@ -5018,9 +5018,9 @@ pool_push_pending_data(POOL_CONNECTION * backend)
* In streaming replication mode, send a Close message for none existing
* prepared statement and flush message before going any further to
* retrieve and save any pending response packet from backend. This
- * ensures that at least "close complete" message is retured from backend.
+ * ensures that at least "close complete" message is returned from backend.
*
- * The saved packets will be poped up before returning to caller. This
+ * The saved packets will be popped up before returning to caller. This
* preserves the user's expectation of packet sequence.
*/
pool_write(backend, "C", 1);
diff --git a/src/protocol/pool_proto_modules.c b/src/protocol/pool_proto_modules.c
index 13248eff7..57ca59e36 100644
--- a/src/protocol/pool_proto_modules.c
+++ b/src/protocol/pool_proto_modules.c
@@ -868,7 +868,7 @@ Execute(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend,
len = strlen(query) + 1;
search_query = MemoryContextStrdup(query_context->memory_context, query);
- ereport(DEBUG1, (errmsg("Execute: checkig cache fetch condition")));
+ ereport(DEBUG1, (errmsg("Execute: checking cache fetch condition")));
/*
* Add bind message's info to query to search.
@@ -1186,7 +1186,7 @@ Parse(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend,
/*
* If replication mode, check to see what kind of insert lock is
- * neccessary.
+ * necessary.
*/
if (REPLICATION)
insert_stmt_with_lock = need_insert_lock(backend, stmt, node);
@@ -2315,7 +2315,7 @@ CloseComplete(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend)
if (pmsg->type != POOL_CLOSE)
{
ereport(LOG,
- (errmsg("CloseComplete: pending messge was not Close request: %s", pool_pending_message_type_to_string(pmsg->type))));
+ (errmsg("CloseComplete: pending message was not Close request: %s", pool_pending_message_type_to_string(pmsg->type))));
}
else
{
@@ -2889,7 +2889,7 @@ ProcessBackendResponse(POOL_CONNECTION * frontend,
if (pmsg && pmsg->not_forward_to_frontend)
{
/*
- * parse_before_bind() was called. Do not foward the
+ * parse_before_bind() was called. Do not forward the
* parse complete message to frontend.
*/
ereport(DEBUG5,
@@ -2922,7 +2922,7 @@ ProcessBackendResponse(POOL_CONNECTION * frontend,
if (pmsg && pmsg->not_forward_to_frontend)
{
/*
- * parse_before_bind() was called. Do not foward the
+ * parse_before_bind() was called. Do not forward the
* close complete message to frontend.
*/
ereport(DEBUG5,
@@ -2959,7 +2959,7 @@ ProcessBackendResponse(POOL_CONNECTION * frontend,
{
pool_set_failed_transaction();
- /* Remove ongoing CRETAE/DROP temp tables */
+ /* Remove ongoing CREATE/DROP temp tables */
pool_temp_tables_remove_pending();
}
if (pool_is_doing_extended_query_message())
@@ -3560,7 +3560,7 @@ static POOL_STATUS parse_before_bind(POOL_CONNECTION * frontend,
* Before sending the parse message to the primary, we need to
* close the named statement. Otherwise we will get an error from
* backend if the named statement already exists. This could
- * happend if parse_before_bind is called with a bind message
+ * happened if parse_before_bind is called with a bind message
* using same named statement. If the named statement does not
* exist, it's fine. PostgreSQL just ignores a request trying to
* close a non-existing statement. If the statement is unnamed
@@ -3933,7 +3933,7 @@ pool_discard_except_sync_and_ready_for_query(POOL_CONNECTION * frontend,
return;
/*
- * Check to see if we aready received a sync message. If not, call
+ * Check to see if we already received a sync message. If not, call
* ProcessFrontendResponse() to get the sync message from client.
*/
pmsg = pool_pending_message_get(POOL_SYNC);
@@ -3984,7 +3984,7 @@ pool_discard_except_sync_and_ready_for_query(POOL_CONNECTION * frontend,
pool_pending_message_reset_previous_message();
- /* Discard read buffer execpt "Ready for query" */
+ /* Discard read buffer except "Ready for query" */
for (i = 0; i < NUM_BACKENDS; i++)
{
if (VALID_BACKEND(i))
@@ -4355,7 +4355,7 @@ pool_read_int(POOL_CONNECTION_POOL * cp)
}
/*
- * Aquire snapshot in snapshot isolation mode.
+ * Acquire snapshot in snapshot isolation mode.
*/
static void
si_get_snapshot(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, Node * node)
@@ -4377,13 +4377,13 @@ si_get_snapshot(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, Node
*/
if (pool_config->backend_clustering_mode == CM_SNAPSHOT_ISOLATION &&
TSTATE(backend, MAIN_NODE_ID) == 'T' &&
- si_snapshot_aquire_command(node) &&
+ si_snapshot_acquire_command(node) &&
!si_snapshot_prepared() &&
frontend && frontend->no_forward == 0)
{
int i;
- si_aquire_snapshot();
+ si_acquire_snapshot();
for (i = 0; i < NUM_BACKENDS; i++)
{
@@ -4402,6 +4402,6 @@ si_get_snapshot(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, Node
per_node_statement_log(backend, i, si_query);
}
- si_snapshot_aquired();
+ si_snapshot_acquired();
}
}
diff --git a/src/query_cache/pool_memqcache.c b/src/query_cache/pool_memqcache.c
index 2a230ab2a..9fd9e056a 100644
--- a/src/query_cache/pool_memqcache.c
+++ b/src/query_cache/pool_memqcache.c
@@ -258,7 +258,7 @@ pool_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *data, size_
return -1;
}
ereport(DEBUG1,
- (errmsg("commiting SELECT results to cache storage"),
+ (errmsg("committing SELECT results to cache storage"),
errdetail("Query=\"%s\"", query)));
#ifdef DEBUG
dump_cache_data(data, datalen);
@@ -268,14 +268,14 @@ pool_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *data, size_
/* encode md5key for memcached */
encode_key(query, tmpkey, backend);
ereport(DEBUG2,
- (errmsg("commiting SELECT results to cache storage"),
+ (errmsg("committing SELECT results to cache storage"),
errdetail("search key : \"%s\"", tmpkey)));
memcpy(cachekey.hashkey, tmpkey, 32);
memqcache_expire = pool_config->memqcache_expire;
ereport(DEBUG1,
- (errmsg("commiting SELECT results to cache storage"),
+ (errmsg("committing SELECT results to cache storage"),
errdetail("memqcache_expire = %ld", memqcache_expire)));
if (pool_is_shmem_cache())
@@ -290,7 +290,7 @@ pool_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *data, size_
if (cacheid != NULL)
{
ereport(DEBUG1,
- (errmsg("commiting SELECT results to cache storage"),
+ (errmsg("committing SELECT results to cache storage"),
errdetail("item already exists")));
return 0;
@@ -307,7 +307,7 @@ pool_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *data, size_
else
{
ereport(DEBUG2,
- (errmsg("commiting SELECT results to cache storage"),
+ (errmsg("committing SELECT results to cache storage"),
errdetail("blockid: %d itemid: %d",
cacheid->blockid, cacheid->itemid)));
}
@@ -328,7 +328,7 @@ pool_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *data, size_
return -1;
}
ereport(DEBUG1,
- (errmsg("commiting SELECT results to cache storage"),
+ (errmsg("committing SELECT results to cache storage"),
errdetail("set cache succeeded")));
}
#endif
@@ -368,7 +368,7 @@ pool_catalog_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *dat
return -1;
}
ereport(DEBUG1,
- (errmsg("commiting relation cache to cache storage"),
+ (errmsg("committing relation cache to cache storage"),
errdetail("Query=\"%s\"", query)));
#ifdef DEBUG
@@ -378,14 +378,14 @@ pool_catalog_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *dat
/* encode md5key for memcached */
encode_key(query, tmpkey, backend);
ereport(DEBUG2,
- (errmsg("commiting relation cache to cache storage"),
+ (errmsg("committing relation cache to cache storage"),
errdetail("search key : \"%s\"", tmpkey)));
memcpy(cachekey.hashkey, tmpkey, 32);
memqcache_expire = pool_config->relcache_expire;
ereport(DEBUG1,
- (errmsg("commiting relation cache to cache storage"),
+ (errmsg("committing relation cache to cache storage"),
errdetail("memqcache_expire = %ld", memqcache_expire)));
if (pool_is_shmem_cache())
@@ -400,7 +400,7 @@ pool_catalog_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *dat
if (cacheid != NULL)
{
ereport(DEBUG1,
- (errmsg("commiting relation cache to cache storage"),
+ (errmsg("committing relation cache to cache storage"),
errdetail("item already exists")));
return 0;
@@ -417,7 +417,7 @@ pool_catalog_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *dat
else
{
ereport(DEBUG2,
- (errmsg("commiting relation cache to cache storage"),
+ (errmsg("committing relation cache to cache storage"),
errdetail("blockid: %d itemid: %d",
cacheid->blockid, cacheid->itemid)));
}
@@ -438,7 +438,7 @@ pool_catalog_commit_cache(POOL_CONNECTION_POOL * backend, char *query, char *dat
return -1;
}
ereport(DEBUG1,
- (errmsg("commiting relation cache to cache storage"),
+ (errmsg("committing relation cache to cache storage"),
errdetail("set cache succeeded")));
}
#endif
@@ -706,7 +706,7 @@ delete_cache_on_memcached(const char *key)
memcached_return rc;
ereport(DEBUG2,
- (errmsg("memcache: deleteing cache on memcached with key: \"%s\"", key)));
+ (errmsg("memcache: deleting cache on memcached with key: \"%s\"", key)));
/* delete cache data on memcached. key is md5 hash query */
@@ -1268,7 +1268,7 @@ pool_extract_table_oids(Node *node, int **oidsp)
else
{
ereport(DEBUG1,
- (errmsg("memcache: extracting table oids: statment is different from INSERT/UPDATE/DELETE/TRUNCATE/DROP TABLE/ALTER TABLE")));
+ (errmsg("memcache: extracting table oids: statement is different from INSERT/UPDATE/DELETE/TRUNCATE/DROP TABLE/ALTER TABLE")));
return 0;
}
@@ -1999,7 +1999,7 @@ pool_reset_memqcache_buffer(bool reset_dml_oids)
/*
* Return true if memory cache method is "shmem". The purpose of this
- * function is to cache the result of stcmp and to save a few cycle.
+ * function is to cache the result of strcmp and to save a few cycle.
*/
bool
pool_is_shmem_cache(void)
@@ -3451,8 +3451,8 @@ pool_check_and_discard_cache_buffer(int num_oids, int *oids)
}
/*
- * At Ready for Query or Comand Complete handle query cache. For streaming
- * replication mode and extended query at Comand Complete handle query cache.
+ * At Ready for Query or Command Complete handle query cache. For streaming
+ * replication mode and extended query at Command Complete handle query cache.
* For other case At Ready for Query handle query cache.
*/
void
@@ -3650,7 +3650,7 @@ pool_handle_query_cache(POOL_CONNECTION_POOL * backend, char *query, Node *node,
}
else /* Non cache safe queries */
{
- /* Non cachable SELECT */
+ /* Non cacheable SELECT */
if (node && IsA(node, SelectStmt))
{
/* Extract table oids from buffer */
@@ -4433,7 +4433,7 @@ inject_cached_message(POOL_CONNECTION * backend, char *qcache, int qcachelen)
else
timeout = 0;
- /* Send flush messsage to backend to retrieve response of backend */
+ /* Send flush message to backend to retrieve response of backend */
pool_write(backend, "H", 1);
len = htonl(sizeof(len));
pool_write_and_flush(backend, &len, sizeof(len));
diff --git a/src/redhat/pgpool.init b/src/redhat/pgpool.init
index b802a9b8c..10924b026 100644
--- a/src/redhat/pgpool.init
+++ b/src/redhat/pgpool.init
@@ -17,7 +17,7 @@
#
# v3.3.3 Ryan Deshone <rdshone@liquidweb.com> and Yugo Nagata <nagata@sraoss.co.jp>
# - Update stop and reload to use pgpool commands properly
-# - Removed "switch" as pgpool no longer suppports that command
+# - Removed "switch" as pgpool no longer supports that command
# - Add try-restart option
# - Fix exit code according with LSB
diff --git a/src/redhat/pgpool_rhel.sysconfig b/src/redhat/pgpool_rhel.sysconfig
index 3ee7a03ae..3ea8c8651 100644
--- a/src/redhat/pgpool_rhel.sysconfig
+++ b/src/redhat/pgpool_rhel.sysconfig
@@ -1,6 +1,6 @@
# Options for pgpool
-# -n: don't run in daemon mode. does not detatch control tty
+# -n: don't run in daemon mode. does not detach control tty
# -d: debug mode. lots of debug information will be printed
#OPTS=" -d -n"
diff --git a/src/redhat/pgpool_rhel6.sysconfig b/src/redhat/pgpool_rhel6.sysconfig
index 221869e59..ea13089b7 100644
--- a/src/redhat/pgpool_rhel6.sysconfig
+++ b/src/redhat/pgpool_rhel6.sysconfig
@@ -1,6 +1,6 @@
# Options for pgpool
-# -n: don't run in daemon mode. does not detatch control tty
+# -n: don't run in daemon mode. does not detach control tty
# -d: debug mode. lots of debug information will be printed
#OPTS=" -d -n"
diff --git a/src/rewrite/pool_timestamp.c b/src/rewrite/pool_timestamp.c
index f218c4289..2b6c83a1b 100644
--- a/src/rewrite/pool_timestamp.c
+++ b/src/rewrite/pool_timestamp.c
@@ -58,7 +58,7 @@ typedef struct
char *relname;
int num_params; /* num of original params (for Parse) */
bool rewrite_to_params; /* true if timestamp is rewritten to param
- * insread of const */
+ * instead of const */
bool rewrite; /* has rewritten? */
List *params; /* list of additional params */
} TSRewriteContext;
@@ -256,7 +256,7 @@ relcache_lookup(TSRewriteContext * ctx)
return (TSRel *) pool_search_relcache(ts_relcache, ctx->backend, table_name);
}
-/* If timestamp valus is required then return ts_const. Otherwize make
+/* If timestamp value is required then return ts_const. Otherwize make
* a new ParamRef, whose number member is 0 and is overwritten at last,
* and add it into params list in context.
*/
@@ -985,7 +985,7 @@ rewrite_timestamp(POOL_CONNECTION_POOL * backend, Node *node,
return NULL;
/*
- * PREPARE or Parse: handle additinal parameters for timestamps
+ * PREPARE or Parse: handle additional parameters for timestamps
*/
if (ctx.rewrite_to_params && message)
{
@@ -1103,14 +1103,14 @@ bind_rewrite_timestamp(POOL_CONNECTION_POOL * backend,
{
/*
* If num_formats is 0, the original message has no parameters or the parameter formats are all text,
- * so we don't need additional format codes since timestamp parametes use text as its format.
+ * so we don't need additional format codes since timestamp parameters use text as its format.
*/
num_formats_new = 0;
}
else
{
/* If num formats is 1, this means the specified format code is applied for all original parameters,
- * so enlarge message length to specify format codes for each of original paramters. */
+ * so enlarge message length to specify format codes for each of original parameters. */
if (num_formats == 1)
*len += (num_org_params - 1) * sizeof(int16);
diff --git a/src/sql/pgpool-recovery/pgpool-recovery.c b/src/sql/pgpool-recovery/pgpool-recovery.c
index dc24a923b..f02a20911 100644
--- a/src/sql/pgpool-recovery/pgpool-recovery.c
+++ b/src/sql/pgpool-recovery/pgpool-recovery.c
@@ -322,7 +322,7 @@ get_function_oid(const char *funcname, const char *argtype, const char *nspname)
/*
* LookupExplicitNamespace() of PostgreSQL 9.3 or later, has third
* argument "missing_ok" which suppresses ERROR exception, but returns
- * invlaid_oid. See include/catalog/namespace.h
+ * invalid_oid. See include/catalog/namespace.h
*/
nspid = LookupExplicitNamespace(nspname, false);
#endif
diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql
index 8bacaec24..32db7e1c0 100644
--- a/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql
+++ b/src/sql/pgpool-recovery/pgpool_recovery--1.0.sql
@@ -18,7 +18,7 @@ RETURNS bool
AS '$libdir/pgpool-recovery', 'pgpool_pgctl'
LANGUAGE C STRICT;
-CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text)
+CREATE FUNCTION pgpool_switch_xlog(IN archive_dir text)
RETURNS text
AS 'MODULE_PATHNAME', 'pgpool_switch_xlog'
LANGUAGE C STRICT;
diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql
index a26ab2cd5..a82c5c822 100644
--- a/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql
+++ b/src/sql/pgpool-recovery/pgpool_recovery--1.1.sql
@@ -26,7 +26,7 @@ RETURNS bool
AS '$libdir/pgpool-recovery', 'pgpool_pgctl'
LANGUAGE C STRICT;
-CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text)
+CREATE FUNCTION pgpool_switch_xlog(IN archive_dir text)
RETURNS text
AS 'MODULE_PATHNAME', 'pgpool_switch_xlog'
LANGUAGE C STRICT;
diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql
index f79bbddbd..d31685495 100644
--- a/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql
+++ b/src/sql/pgpool-recovery/pgpool_recovery--1.2.sql
@@ -35,7 +35,7 @@ RETURNS bool
AS '$libdir/pgpool-recovery', 'pgpool_pgctl'
LANGUAGE C STRICT;
-CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text)
+CREATE FUNCTION pgpool_switch_xlog(IN archive_dir text)
RETURNS text
AS 'MODULE_PATHNAME', 'pgpool_switch_xlog'
LANGUAGE C STRICT;
diff --git a/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql b/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql
index 699ac215c..17f2ff558 100644
--- a/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql
+++ b/src/sql/pgpool-recovery/pgpool_recovery--1.3.sql
@@ -45,7 +45,7 @@ RETURNS bool
AS '$libdir/pgpool-recovery', 'pgpool_pgctl'
LANGUAGE C STRICT;
-CREATE FUNCTION pgpool_switch_xlog(IN arcive_dir text)
+CREATE FUNCTION pgpool_switch_xlog(IN archive_dir text)
RETURNS text
AS 'MODULE_PATHNAME', 'pgpool_switch_xlog'
LANGUAGE C STRICT;
diff --git a/src/sql/pgpool-regclass/pgpool-regclass.c b/src/sql/pgpool-regclass/pgpool-regclass.c
index 5d9d024fb..bbb3d8ccf 100644
--- a/src/sql/pgpool-regclass/pgpool-regclass.c
+++ b/src/sql/pgpool-regclass/pgpool-regclass.c
@@ -16,7 +16,7 @@
* is" without express or implied warranty.
*
* pgpool-regclass.c is similar to PostgreSQL builtin function
- * reglcass but does not throw exceptions.
+ * regclass but does not throw exceptions.
* If something goes wrong, it returns InvalidOid.
*/
@@ -97,7 +97,7 @@ pgpool_regclass(PG_FUNCTION_ARGS)
/*
* RangeVarGetRelid() of PostgreSQL 9.2 or later, has third argument
- * "missing_ok" which suppresses ERROR exception, but returns invlaid_oid.
+ * "missing_ok" which suppresses ERROR exception, but returns invalid_oid.
* See include/catalog/namespace.h
*/
result = RangeVarGetRelid(rel, true, true);
diff --git a/src/sql/pgpool_adm/pgpool_adm.c b/src/sql/pgpool_adm/pgpool_adm.c
index ff6cd04f0..f7950f7f9 100644
--- a/src/sql/pgpool_adm/pgpool_adm.c
+++ b/src/sql/pgpool_adm/pgpool_adm.c
@@ -186,8 +186,8 @@ _pcp_node_info(PG_FUNCTION_ARGS)
TupleDescInitEntry(tupledesc, (AttrNumber) 4, "weight", FLOAT4OID, -1, 0);
TupleDescInitEntry(tupledesc, (AttrNumber) 5, "role", TEXTOID, -1, 0);
TupleDescInitEntry(tupledesc, (AttrNumber) 6, "replication_delay", INT8OID, -1, 0);
- TupleDescInitEntry(tupledesc, (AttrNumber) 7, "replcation_state", TEXTOID, -1, 0);
- TupleDescInitEntry(tupledesc, (AttrNumber) 8, "replcation_sync_state", TEXTOID, -1, 0);
+ TupleDescInitEntry(tupledesc, (AttrNumber) 7, "replication_state", TEXTOID, -1, 0);
+ TupleDescInitEntry(tupledesc, (AttrNumber) 8, "replication_sync_state", TEXTOID, -1, 0);
TupleDescInitEntry(tupledesc, (AttrNumber) 9, "last_status_change", TIMESTAMPOID, -1, 0);
tupledesc = BlessTupleDesc(tupledesc);
diff --git a/src/streaming_replication/pool_worker_child.c b/src/streaming_replication/pool_worker_child.c
index 5c2e9719e..d0be38b04 100644
--- a/src/streaming_replication/pool_worker_child.c
+++ b/src/streaming_replication/pool_worker_child.c
@@ -389,7 +389,7 @@ check_replication_time_lag(void)
if (status == -1 || (status == -2 && active_standby_node > 0))
{
ereport(LOG,
- (errmsg("get_query_result falied: status: %d", status)));
+ (errmsg("get_query_result failed: status: %d", status)));
}
for (i = 0; i < NUM_BACKENDS; i++)
diff --git a/src/test/C/test_extended.c b/src/test/C/test_extended.c
index 0eb568c77..5f90a03e1 100644
--- a/src/test/C/test_extended.c
+++ b/src/test/C/test_extended.c
@@ -43,7 +43,7 @@ main(int argc, char **argv)
int doTrace = 1; /* set 1 to start libpq trace */
int doTransaction = 1; /* set 1 to start explicit transaction */
int doSleep = 0; /* set non 0 seconds to sleep after connection
- * and beforfe starting command */
+ * and before starting command */
/* SQL commands to be executed */
static char *commands[] = {
diff --git a/src/test/extended-query-test/README b/src/test/extended-query-test/README
index 89b836e0f..db9e00b7a 100644
--- a/src/test/extended-query-test/README
+++ b/src/test/extended-query-test/README
@@ -31,7 +31,7 @@ names. Next you need to add expected output of pgproto to "expected"
directory. The file name must be identical to the file name added to
the tests directory. Note that source files lines like "1186" below <=
BE ErrorResponse(S ERROR V ERROR C 42P01 M relation
-"non_existsing_table" does not exist P 15 F parse_relation.c L 1186 R
+"non_existing_table" does not exist P 15 F parse_relation.c L 1186 R
parserOpenTable ) will be replaced with "xxx" to avoid the source code
version differences.
diff --git a/src/test/extended-query-test/test.sh b/src/test/extended-query-test/test.sh
index 9cafc75a1..3f7cfea39 100755
--- a/src/test/extended-query-test/test.sh
+++ b/src/test/extended-query-test/test.sh
@@ -184,7 +184,7 @@ do
failcnt=`expr $failcnt + 1`
else
extra_fail=0
- # excute extra scripts if exists.
+ # execute extra scripts if exists.
if [ -x $extra_scripts/$i ]
then
$extra_scripts/$i > $results/$i.extra 2>&1
@@ -280,7 +280,7 @@ else
failcnt=`expr $failcnt + 1`
else
extra_fail=0
- # excute extra scripts if exists.
+ # execute extra scripts if exists.
if [ -x $extra_scripts/$i ]
then
$extra_scripts/$i > $results/$i.extra 2>&1
diff --git a/src/test/parser/expected/var.out b/src/test/parser/expected/var.out
index 5d6d1f1e5..2ce8e62e3 100644
--- a/src/test/parser/expected/var.out
+++ b/src/test/parser/expected/var.out
@@ -9,8 +9,8 @@ SET TIME ZONE
SET LOCAL TIME ZONE
SET TIME ZONE
SET var FROM CURRENT
-SET XML OPTOIN DOCUMENT
-SET XML OPTOIN CONTENT
+SET XML OPTION DOCUMENT
+SET XML OPTION CONTENT
syntax error: show 'x';
SHOW x
SHOW ALL
diff --git a/src/test/pgpool_setup.in b/src/test/pgpool_setup.in
index a9ef952bb..7926f44b9 100644
--- a/src/test/pgpool_setup.in
+++ b/src/test/pgpool_setup.in
@@ -39,11 +39,11 @@
# -r: use pg_rewind for base backup if possible.
#
# The user run this script will become the PostgreSQL super user as
-# well. Current directory must be empty. Assume that appropreate
+# well. Current directory must be empty. Assume that appropriate
# pgpool and PostgreSQL binaries are in the command search path.
# The user must have passwordless access to localhost over SSH.
#
-# Rayout after executing this script:
+# Layout after executing this script:
# data[0-]: PostgreSQL database clusters
# log: pgpool.log and pgpool_status resides here
# run: pgpool-II pid file resides here(generated by pgpool-II)
@@ -61,7 +61,7 @@
# Starting port number to be used. Each PostgreSQL is assigned
# $BASEPORT + 2, $BASEPORT + 3 and so on.
# pgpool port and pcp_port will be assigned to $BASEPORT and $BASEPORT +1 .
-BASEPORT=${BASEBOPRT:-"11000"}
+BASEPORT=${BASEPORT:-"11000"}
ORIGBASEPORT=$BASEPORT
# PostgreSQL startig port number.
PGBASEPORT=`expr $BASEPORT + 2`
@@ -132,7 +132,7 @@ if [ $PGVERSION -gt 91 ];then
INITDBARG="$INITDBARG --data-checksums"
fi
-# pgpool-II configuration file localtion.
+# pgpool-II configuration file location.
CONF=$BASEDIR/etc/pgpool.conf
# failover script
FAILOVER_SCRIPT=$BASEDIR/etc/failover.sh
@@ -284,7 +284,7 @@ function create_pgpool_remote_start_script()
cat >> $1/$PGPOOL_REMOTE_START_SCRIPT <<'EOF'
#! /bin/sh
#
-# start postmaster on the recoveried node
+# start postmaster on the recovered node
#
if [ $# -ne 2 ]
then
diff --git a/src/test/regression/README b/src/test/regression/README
index 1ae68707c..6af63c6a5 100644
--- a/src/test/regression/README
+++ b/src/test/regression/README
@@ -15,7 +15,7 @@ clean.sh: remove files including PostgreSQL DB clusters created by regress.sh.
tests: test scripts live here. Each test case has its own
subdirectory. In the directory the test script resides and the
script name must be "test.sh". The script should return exit
- code 0 upon successfull completion of the test. Otherwise it
+ code 0 upon successful completion of the test. Otherwise it
should return non 0 value. To add a new test case, simply
create a shell script under this.
diff --git a/src/test/regression/tests/001.load_balance/test.sh b/src/test/regression/tests/001.load_balance/test.sh
index 675495a68..fc396f149 100755
--- a/src/test/regression/tests/001.load_balance/test.sh
+++ b/src/test/regression/tests/001.load_balance/test.sh
@@ -119,7 +119,7 @@ EOF
# If query match both primary_routing_query_pattern_list and read_only_function_list,
# read_only_function_list will be ignored, and query is sent to primary node only.
#
- # If replication node, all queries are load-blanced.
+ # If replication node, all queries are load-balanced.
if [[ $mode = "s" ]];then
node_id=0
else
@@ -129,7 +129,7 @@ EOF
if [ $? != 0 ];then
# expected result not found
- echo "fail: primary routing query: ${query} is load-blanced."
+ echo "fail: primary routing query: ${query} is load-balanced."
./shutdownall
exit 1
fi
@@ -184,7 +184,7 @@ EOF
fgrep "SELECT 1;" log/pgpool.log |grep "DB node id: 1">/dev/null 2>&1
if [ $? != 0 ];then
# the SELECT should not be executed on node 1
- echo ok: select is sent to only main node when not load-blanced.
+ echo ok: select is sent to only main node when not load-balanced.
ok=1
fi
# the SELECT should be executed on node 0
diff --git a/src/test/regression/tests/002.native_replication/PgTester.java b/src/test/regression/tests/002.native_replication/PgTester.java
index 97250118d..cf14dfb66 100644
--- a/src/test/regression/tests/002.native_replication/PgTester.java
+++ b/src/test/regression/tests/002.native_replication/PgTester.java
@@ -34,7 +34,7 @@ public class PgTester {
for(int cv = startValue; cv <= max; cv++){
query.setInt(1, cv);
query.execute();
- //System.out.println("interted "+cv);
+ //System.out.println("inserted "+cv);
}
query.close();
//conn.commit();
diff --git a/src/test/regression/tests/004.watchdog/test.sh b/src/test/regression/tests/004.watchdog/test.sh
index a9748d03f..71490857d 100755
--- a/src/test/regression/tests/004.watchdog/test.sh
+++ b/src/test/regression/tests/004.watchdog/test.sh
@@ -45,7 +45,7 @@ cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
# since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
echo 1 > $STANDBY_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
# First test check if both pgpool-II have found their correct place in watchdog cluster.
@@ -112,7 +112,7 @@ $PGPOOL_INSTALL_DIR/bin/pgpool -f $STANDBY_DIR/etc/pgpool.conf -m f stop
cd leader
./shutdownall
-echo "$success_count out of 4 successfull";
+echo "$success_count out of 4 successful";
if test $success_count -eq 4
then
diff --git a/src/test/regression/tests/005.jdbc/test.sh b/src/test/regression/tests/005.jdbc/test.sh
index 9743f8cf2..df58e75ab 100755
--- a/src/test/regression/tests/005.jdbc/test.sh
+++ b/src/test/regression/tests/005.jdbc/test.sh
@@ -17,7 +17,7 @@ do
# create test environment
echo -n "creating test environment..."
- # to avoid repication lag problem when testing under streaming
+ # to avoid replication lag problem when testing under streaming
# replication mode, set number of cluster to 1 when in the mode
if [ $mode = "s" ];then
n=1
diff --git a/src/test/regression/tests/010.rewrite_timestamp/test.sh b/src/test/regression/tests/010.rewrite_timestamp/test.sh
index a8eec96a5..b17658d1a 100755
--- a/src/test/regression/tests/010.rewrite_timestamp/test.sh
+++ b/src/test/regression/tests/010.rewrite_timestamp/test.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#-------------------------------------------------------------------
-# test script for unit test of rewriting timestamp qeries.
+# test script for unit test of rewriting timestamp queries.
# requires Ruby
cd timestamp
diff --git a/src/test/regression/tests/010.rewrite_timestamp/timestamp/main.c b/src/test/regression/tests/010.rewrite_timestamp/timestamp/main.c
index 0b7ad28e2..4903716bf 100644
--- a/src/test/regression/tests/010.rewrite_timestamp/timestamp/main.c
+++ b/src/test/regression/tests/010.rewrite_timestamp/timestamp/main.c
@@ -150,7 +150,7 @@ main(int argc, char **argv)
if (argc != 2)
{
- fprintf(stderr, "./timestmp-test query\n");
+ fprintf(stderr, "./timestamp-test query\n");
exit(1);
}
diff --git a/src/test/regression/tests/011.watchdog_quorum_failover/test.sh b/src/test/regression/tests/011.watchdog_quorum_failover/test.sh
index 7ca98d36a..9a5830617 100755
--- a/src/test/regression/tests/011.watchdog_quorum_failover/test.sh
+++ b/src/test/regression/tests/011.watchdog_quorum_failover/test.sh
@@ -59,7 +59,7 @@ cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
echo 1 > $STANDBY_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
# create standby2 environment
@@ -71,7 +71,7 @@ cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &
# First test check if both pgpool-II have found their correct place in watchdog cluster.
@@ -221,7 +221,7 @@ $PGPOOL_INSTALL_DIR/bin/pgpool -f $STANDBY2_DIR/etc/pgpool.conf -m f stop
cd leader
./shutdownall
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh b/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh
index 5ad89f6c2..ccccb86c6 100755
--- a/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh
+++ b/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh
@@ -61,7 +61,7 @@ cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
echo 1 > $STANDBY_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
#$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
# create standby2 environment but do not start pgpool
@@ -73,7 +73,7 @@ cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
#$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &
# First test check if both pgpool-II have found their correct place in watchdog cluster.
@@ -108,9 +108,9 @@ done
# now start other Pgpool-II nodes to complete the quorum
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
-# start the second stnadby pgpool-II by hand
+# start the second standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &
# now check if standby1 has successfully joined connected to the leader.
@@ -174,7 +174,7 @@ $PGPOOL_INSTALL_DIR/bin/pgpool -f $STANDBY2_DIR/etc/pgpool.conf -m f stop
cd leader
./shutdownall
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh b/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh
index d71fc7e5b..d74a827e9 100755
--- a/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh
+++ b/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh
@@ -61,7 +61,7 @@ cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
echo 1 > $STANDBY_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
# create standby2 environment but do not start pgpool
@@ -72,7 +72,7 @@ cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &
# First test check if both pgpool-II have found their correct place in watchdog cluster.
@@ -119,7 +119,7 @@ done
# raise an artificial communication error on standby for DB node 1
echo "1 down" > $STANDBY_DIR/log/backend_down_request
-echo "Checking if the standby successfuly process the failover request..."
+echo "Checking if the standby successfully process the failover request..."
for i in 1 2 3 4 5 6 7 8 9 10
do
grep -i "building consensus for request" $STANDBY_DIR/log/pgpool.log
@@ -195,7 +195,7 @@ $PGPOOL_INSTALL_DIR/bin/pgpool -f $STANDBY2_DIR/etc/pgpool.conf -m f stop
cd leader
./shutdownall
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/test/regression/tests/014.watchdog_test_quorum_bypass/test.sh b/src/test/regression/tests/014.watchdog_test_quorum_bypass/test.sh
index e6a47a6d7..2ee9128ec 100755
--- a/src/test/regression/tests/014.watchdog_test_quorum_bypass/test.sh
+++ b/src/test/regression/tests/014.watchdog_test_quorum_bypass/test.sh
@@ -65,14 +65,14 @@ wait_for_pgpool_startup
$PSQL -p 11000 -c "show pool_nodes" test|grep standby|grep down >/dev/null 2>&1
if [ $? = 0 ];then
- echo "Failover was successfuly executed"
+ echo "Failover was successfully executed"
success_count=$(( success_count + 1 ))
fi
cd leader
./shutdownall
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh b/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh
index 527123c75..c69bfe737 100755
--- a/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh
+++ b/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh
@@ -61,7 +61,7 @@ cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
echo 1 > $STANDBY_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
# create standby2 environment but do not start pgpool
@@ -72,7 +72,7 @@ cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
-# start the stnadby pgpool-II by hand
+# start the standby pgpool-II by hand
$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &
# First test check if both pgpool-II have found their correct place in watchdog cluster.
@@ -179,7 +179,7 @@ $PGPOOL_INSTALL_DIR/bin/pgpool -f $STANDBY2_DIR/etc/pgpool.conf -m f stop
cd leader
./shutdownall
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/test/regression/tests/017.node_0_is_down/test.sh b/src/test/regression/tests/017.node_0_is_down/test.sh
index 5dccb75c4..8c54e83bb 100755
--- a/src/test/regression/tests/017.node_0_is_down/test.sh
+++ b/src/test/regression/tests/017.node_0_is_down/test.sh
@@ -126,7 +126,7 @@ do
echo "Writing query in mode $mode failed by \"executing failover on backend\" as expected in test case 3"
fi
else
- echo "Writing query succeeded in test case 3 mode $mode. Suspicious sccess."
+ echo "Writing query succeeded in test case 3 mode $mode. Suspicious access."
./shutdownall
exit 1
fi
diff --git a/src/test/regression/tests/019.log_client_messages/test.sh b/src/test/regression/tests/019.log_client_messages/test.sh
index 23ebd4651..ad517cf9b 100755
--- a/src/test/regression/tests/019.log_client_messages/test.sh
+++ b/src/test/regression/tests/019.log_client_messages/test.sh
@@ -25,7 +25,7 @@ echo "done."
source ./bashrc.ports
export PGPORT=$PGPOOL_PORT
-# log_client_messages paramater change
+# log_client_messages parameter change
./startall
wait_for_pgpool_startup
@@ -54,7 +54,7 @@ do
done
# send cancel request
-# executing long runing query
+# executing long running query
$PSQL -c "select pg_sleep(30);" test &
# get psql process pid
psqlpid=$!
@@ -151,7 +151,7 @@ if [ $? = 0 ];then
success_count=$(( success_count + 1 ))
fi
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/test/regression/tests/020.allow_clear_text_frontend_auth/test.sh b/src/test/regression/tests/020.allow_clear_text_frontend_auth/test.sh
index 4a3aa2b00..5714b41d6 100755
--- a/src/test/regression/tests/020.allow_clear_text_frontend_auth/test.sh
+++ b/src/test/regression/tests/020.allow_clear_text_frontend_auth/test.sh
@@ -45,14 +45,14 @@ $PSQL -c "CREATE ROLE trust_user PASSWORD 'trust_password';ALTER ROLE trust_user
if $PSQL -c "SELECT rolname,substring(rolpassword, 1, 14) FROM pg_authid where rolname ='scram_user'" test|grep "SCRAM-SHA-256" >/dev/null 2>&1
then
- echo "scram_user authenticated setup successfuly"
+ echo "scram_user authenticated setup successfully"
else
echo "scram authentication setup failed"
failed=1
fi
if $PSQL -c "SELECT rolname,substring(rolpassword, 1, 4) FROM pg_authid where rolname ='md5_user'" test|grep "md5" >/dev/null 2>&1
then
- echo "md5 authenticated setup successfuly"
+ echo "md5 authenticated setup successfully"
else
echo "md5 authentication setup failed"
failed=1
@@ -69,7 +69,7 @@ export PGPASSFILE=$PWD/pgpass
if $PSQL -h 127.0.0.1 -U scram_user -c "SELECT user, inet_client_addr();" test|grep "scram_user" >/dev/null 2>&1
then
- echo "scram_user authenticated successfuly"
+ echo "scram_user authenticated successfully"
else
echo "scram authentication failed"
failed=1
@@ -77,7 +77,7 @@ fi
if $PSQL -h 127.0.0.1 -U md5_user -c "SELECT user, inet_client_addr();" test|grep "md5_user" >/dev/null 2>&1
then
- echo "md5_user authenticated successfuly"
+ echo "md5_user authenticated successfully"
else
echo "md5 authentication failed"
failed=1
diff --git a/src/test/regression/tests/021.pool_passwd_auth/test.sh b/src/test/regression/tests/021.pool_passwd_auth/test.sh
index 7fb4ccb19..c947faa57 100755
--- a/src/test/regression/tests/021.pool_passwd_auth/test.sh
+++ b/src/test/regression/tests/021.pool_passwd_auth/test.sh
@@ -59,14 +59,14 @@ $PSQL -c "CREATE ROLE trust_user PASSWORD 'trust_password';ALTER ROLE trust_user
if $PSQL -c "SELECT rolname,substring(rolpassword, 1, 14) FROM pg_authid where rolname ='scram_user'" test|grep "SCRAM-SHA-256" >/dev/null 2>&1
then
- echo "scram_user authenticated setup successfuly"
+ echo "scram_user authenticated setup successfully"
else
echo "scram authentication setup failed"
failed=1
fi
if $PSQL -c "SELECT rolname,substring(rolpassword, 1, 4) FROM pg_authid where rolname ='md5_user'" test|grep "md5" >/dev/null 2>&1
then
- echo "md5 authenticated setup successfuly"
+ echo "md5 authenticated setup successfully"
else
echo "md5 authentication setup failed"
failed=1
@@ -84,7 +84,7 @@ export PGPASSFILE=$PWD/pgpass
if $PSQL -h 127.0.0.1 -U scram_user -c "SELECT user, inet_client_addr();" test|grep "scram_user" >/dev/null 2>&1
then
- echo "scram_user authenticated successfuly"
+ echo "scram_user authenticated successfully"
else
echo "scram authentication failed"
failed=1
@@ -92,7 +92,7 @@ fi
if $PSQL -h 127.0.0.1 -U md5_user -c "SELECT user, inet_client_addr();" test|grep "md5_user" >/dev/null 2>&1
then
- echo "md5_user authenticated successfuly"
+ echo "md5_user authenticated successfully"
else
echo "md5 authentication failed"
failed=1
diff --git a/src/test/regression/tests/022.pool_passwd_alternative_auth/test.sh b/src/test/regression/tests/022.pool_passwd_alternative_auth/test.sh
index abf134033..00b4988ff 100755
--- a/src/test/regression/tests/022.pool_passwd_alternative_auth/test.sh
+++ b/src/test/regression/tests/022.pool_passwd_alternative_auth/test.sh
@@ -52,14 +52,14 @@ $PSQL -c "CREATE ROLE trust_user PASSWORD 'trust_password';ALTER ROLE trust_user
if $PSQL -c "SELECT rolname,substring(rolpassword, 1, 14) FROM pg_authid where rolname ='scram_user'" test|grep "SCRAM-SHA-256" >/dev/null 2>&1
then
- echo "scram_user authenticated setup successfuly"
+ echo "scram_user authenticated setup successfully"
else
echo "scram authentication setup failed"
failed=1
fi
if $PSQL -c "SELECT rolname,substring(rolpassword, 1, 4) FROM pg_authid where rolname ='md5_user'" test|grep "md5" >/dev/null 2>&1
then
- echo "md5 authenticated setup successfuly"
+ echo "md5 authenticated setup successfully"
else
echo "md5 authentication setup failed"
failed=1
@@ -77,7 +77,7 @@ export PGPASSFILE=$PWD/pgpass
if $PSQL -h 127.0.0.1 -U scram_user -c "SELECT user, inet_client_addr();" test|grep "scram_user" >/dev/null 2>&1
then
- echo "scram_user authenticated successfuly"
+ echo "scram_user authenticated successfully"
else
echo "scram authentication failed"
failed=1
@@ -85,7 +85,7 @@ fi
if $PSQL -h 127.0.0.1 -U md5_user -c "SELECT user, inet_client_addr();" test|grep "md5_user" >/dev/null 2>&1
then
- echo "md5_user authenticated successfuly"
+ echo "md5_user authenticated successfully"
else
echo "md5 authentication failed"
failed=1
diff --git a/src/test/regression/tests/023.ssl_connection/test.sh b/src/test/regression/tests/023.ssl_connection/test.sh
index 5c65a3345..17e375339 100755
--- a/src/test/regression/tests/023.ssl_connection/test.sh
+++ b/src/test/regression/tests/023.ssl_connection/test.sh
@@ -44,7 +44,7 @@ echo "ssl_key_file = '$SSL_KEY'" >> data0/postgresql.conf
echo "backend_hostname0 = 'localhost'" >> etc/pgpool.conf
# produce debug message since the only way to confirm the SSL
-# connectins is being established is, look into the debug log.
+# connections is being established is, look into the debug log.
echo "log_min_messages = debug5" >> etc/pgpool.conf
# allow to access IPv6 localhost
diff --git a/src/test/regression/tests/024.cert_auth/test.sh b/src/test/regression/tests/024.cert_auth/test.sh
index c434b2bbd..8f5082a0a 100755
--- a/src/test/regression/tests/024.cert_auth/test.sh
+++ b/src/test/regression/tests/024.cert_auth/test.sh
@@ -76,7 +76,7 @@ echo "Checking cert auth between Pgpool-II and frontend was ok."
./shutdownall
-# Starting CRL verfication
+# Starting CRL verification
# Adding valid CRL file in pgpool.conf file.
echo "ssl_crl_file = '$SSL_CRL'" >> etc/pgpool.conf
diff --git a/src/test/regression/tests/025.enable_shared_relcache/test.sh b/src/test/regression/tests/025.enable_shared_relcache/test.sh
index f5c4d52ef..8c7dedb0f 100755
--- a/src/test/regression/tests/025.enable_shared_relcache/test.sh
+++ b/src/test/regression/tests/025.enable_shared_relcache/test.sh
@@ -48,7 +48,7 @@ do
./shutdownall
echo "SELECT query don not use query cache"
- grep "commiting SELECT results to cache storage" log/pgpool.log > /dev/null 2>&1
+ grep "committing SELECT results to cache storage" log/pgpool.log > /dev/null 2>&1
if [ $? != 0 ];then
echo "... ok."
else
@@ -57,7 +57,7 @@ do
fi
echo "relation cache use query cache"
- grep "commiting relation cache to cache storage" log/pgpool.log > /dev/null 2>&1
+ grep "committing relation cache to cache storage" log/pgpool.log > /dev/null 2>&1
if [ $? = 0 ];then
echo "... ok."
else
diff --git a/src/test/regression/tests/026.temp_table/test.sh b/src/test/regression/tests/026.temp_table/test.sh
index 543637398..9ad6d319c 100755
--- a/src/test/regression/tests/026.temp_table/test.sh
+++ b/src/test/regression/tests/026.temp_table/test.sh
@@ -29,7 +29,7 @@ cmp results.txt ../expected.txt || exit 1
# test2: trace
-echo "check_temp_table = trace" >> etc/pgpoo.conf
+echo "check_temp_table = trace" >> etc/pgpool.conf
./pgpool_reload
diff --git a/src/test/regression/tests/027.auto_failback/test.sh b/src/test/regression/tests/027.auto_failback/test.sh
index 5f6d6faa5..419afd7e4 100755
--- a/src/test/regression/tests/027.auto_failback/test.sh
+++ b/src/test/regression/tests/027.auto_failback/test.sh
@@ -51,7 +51,7 @@ $PG_CTL -D data1 -w -m f start
echo "backend node 1 is restarted"
sleep 10;
-# check auto_failback is succuess
+# check auto_failback is success
$PSQL -c "show pool_nodes" test |grep down
if [ $? = 0 ];then
./shutdownall
@@ -81,7 +81,7 @@ if [ $? != 0 ];then
./shutdownall
exit 1
fi
-echo `date` ":backend node staus is still detached"
+echo `date` ":backend node status is still detached"
echo `date` ":sleep 40[sec]"
sleep 40;
diff --git a/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh b/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh
index b29bdc740..96fb68be5 100755
--- a/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh
+++ b/src/test/regression/tests/028.watchdog_enable_consensus_with_half_votes/test.sh
@@ -31,7 +31,7 @@ function wait_for_watchdog_startup
done
}
-# retun 0 if quorum exists.
+# return 0 if quorum exists.
function quorum_exists
{
$PGPOOL_INSTALL_DIR/bin/pcp_watchdog_info -v -w -h localhost -p $PCP_PORT >/dev/null 2>&1
diff --git a/src/test/regression/tests/054.postgres_fdw/test.sh b/src/test/regression/tests/054.postgres_fdw/test.sh
index 6a7fb3f23..b3b6f556f 100755
--- a/src/test/regression/tests/054.postgres_fdw/test.sh
+++ b/src/test/regression/tests/054.postgres_fdw/test.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#-------------------------------------------------------------------
# Check to see if postgres_fdw works with pgpool-II. Since
-# postres_fdw sets search_path to pg_catalog, pgpool_regclass() should
+# postgres_fdw sets search_path to pg_catalog, pgpool_regclass() should
# be registered as "pg_catalog.pgpool_regclass".
#
# Requires PostgreSQL 9.3 or later and contrib/postgres_fdw be
@@ -42,7 +42,7 @@ CREATE TABLE fr1(i INTEGER);
EOF
# detach node #1 so that pgpool does not access
-# postgres_fdw. Otherwise it will go into an inifinite loop.
+# postgres_fdw. Otherwise it will go into an infinite loop.
$PGPOOL_INSTALL_DIR/bin/pcp_detach_node -w -h localhost -p $PCP_PORT -n 1
if [ $? != 0 ];then
diff --git a/src/test/regression/tests/061.cancel_query/test.sh b/src/test/regression/tests/061.cancel_query/test.sh
index d8e89c70e..969deaea2 100755
--- a/src/test/regression/tests/061.cancel_query/test.sh
+++ b/src/test/regression/tests/061.cancel_query/test.sh
@@ -26,7 +26,7 @@ export PGPORT=$PGPOOL_PORT
sleep 1
-# executing long runing query
+# executing long running query
$PSQL -c "select pg_sleep(10000);" test &
# get psql process pid
diff --git a/src/test/regression/tests/064.bug153/test.sh b/src/test/regression/tests/064.bug153/test.sh
index 7ee9aed42..bc9eb1687 100755
--- a/src/test/regression/tests/064.bug153/test.sh
+++ b/src/test/regression/tests/064.bug153/test.sh
@@ -31,12 +31,12 @@ do
$PSQL test <<EOF
CREATE TABLE foo(x serial);
--- Below should be executed on the primary node in streaming replicatoion mode.
--- Below should be executed on both nodes in native replicatoion mode.
+-- Below should be executed on the primary node in streaming replication mode.
+-- Below should be executed on both nodes in native replication mode.
WITH r AS (INSERT INTO foo VALUES (default) RETURNING x) SELECT x FROM r;
--- Below should be executed on the primary node in streaming replicatoion mode.
--- Below should be executed on both nodes in native replicatoion mode.
+-- Below should be executed on the primary node in streaming replication mode.
+-- Below should be executed on both nodes in native replication mode.
WITH t AS (SELECT nextval('foo_x_seq')) SELECT * FROM t;
-- Below should be executed on node 1.
diff --git a/src/test/regression/tests/066.bug230/test.sh b/src/test/regression/tests/066.bug230/test.sh
index fdacaf917..1a1d123ea 100755
--- a/src/test/regression/tests/066.bug230/test.sh
+++ b/src/test/regression/tests/066.bug230/test.sh
@@ -18,7 +18,7 @@ do
# create test environment
echo -n "creating test environment..."
- # to avoid repication lag problem when testing under streaming
+ # to avoid replication lag problem when testing under streaming
# replication mode, set number of cluster to 1 when in the mode
if [ $mode = "s" ];then
n=1
diff --git a/src/test/regression/tests/071.execute_and_deallocate/test.sh b/src/test/regression/tests/071.execute_and_deallocate/test.sh
index 982356ee0..925347bc8 100755
--- a/src/test/regression/tests/071.execute_and_deallocate/test.sh
+++ b/src/test/regression/tests/071.execute_and_deallocate/test.sh
@@ -95,7 +95,7 @@ EOF
cd ..
done
-echo "$success_count out of $num_tests successfull";
+echo "$success_count out of $num_tests successful";
if test $success_count -eq $num_tests
then
diff --git a/src/tools/fe_port.c b/src/tools/fe_port.c
index 054df100a..7c305736c 100644
--- a/src/tools/fe_port.c
+++ b/src/tools/fe_port.c
@@ -167,7 +167,7 @@ errstart(int elevel, const char *filename, int lineno,
_fe_error_level = elevel;
/*
- * This is a basic version and for now we just supress all messages below
+ * This is a basic version and for now we just suppress all messages below
* WARNING for frontend
*/
if (_fe_error_level < WARNING)
diff --git a/src/tools/pcp/pcp_frontend_client.c b/src/tools/pcp/pcp_frontend_client.c
index 1b51adca3..0a0fff9e2 100644
--- a/src/tools/pcp/pcp_frontend_client.c
+++ b/src/tools/pcp/pcp_frontend_client.c
@@ -207,7 +207,7 @@ main(int argc, char **argv)
command_scope = 'l';
else
{
- fprintf(stderr, "%s: Invalid command socpe \"%s\", must be either \"cluster\" or \"local\" \n", progname, optarg);
+ fprintf(stderr, "%s: Invalid command scope \"%s\", must be either \"cluster\" or \"local\" \n", progname, optarg);
exit(1);
}
}
@@ -294,7 +294,7 @@ main(int argc, char **argv)
default:
/*
- * getopt_long whould already have emitted a complaint
+ * getopt_long should already have emitted a complaint
*/
fprintf(stderr, "Try \"%s --help\" for more information.\n\n", progname);
exit(1);
@@ -972,7 +972,7 @@ role_to_str(SERVER_ROLE role)
*
* titles: title string array
* types: printf format type string array (example: "d")
- * ntitles: size of the arrary
+ * ntitles: size of the array
*/
static char *
format_titles(const char **titles, const char **types, int ntitles)
diff --git a/src/tools/pgproto/buffer.c b/src/tools/pgproto/buffer.c
index f9163cfb6..083ea5eac 100644
--- a/src/tools/pgproto/buffer.c
+++ b/src/tools/pgproto/buffer.c
@@ -68,7 +68,7 @@ buffer_read_int(char *buf, char **bufp)
/*
* Read string and returns pg_malloced buffer. The string must start with a
- * double quation and end with a double quotation. The pointer in the buffer
+ * 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
* above, exit within this function.
*/
@@ -116,7 +116,7 @@ buffer_read_string(char *buf, char **bufp)
/*
* Read a character and returns it. The character must start with a single
- * quation and end with a single quotation. The pointer in the buffer afer
+ * quotation and end with a single quotation. The pointer in the buffer afer
* 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 49ec244d2..651fc1fcd 100644
--- a/src/tools/pgproto/extended_query.c
+++ b/src/tools/pgproto/extended_query.c
@@ -32,7 +32,7 @@
#include "pgproto/buffer.h"
/*
- * Send parse messae. "conn" should at the point right after the message kind
+ * Send parse message. "conn" should at the point right after the message kind
* was read.
*/
void
@@ -246,7 +246,7 @@ process_bind(char *buf, PGconn *conn)
}
/*
- * Send execute messae. "conn" should at the point right after the message
+ * Send execute message. "conn" should at the point right after the message
* kind was read.
*/
void
@@ -283,7 +283,7 @@ process_execute(char *buf, PGconn *conn)
}
/*
- * Send describe messae. "conn" should at the point right after the message kind
+ * Send describe message. "conn" should at the point right after the message kind
* was read.
*/
void
@@ -332,7 +332,7 @@ process_describe(char *buf, PGconn *conn)
}
/*
- * Send close messae. "conn" should at the point right after the message kind
+ * Send close message. "conn" should at the point right after the message kind
* was read.
*/
void
diff --git a/src/tools/pgproto/main.c b/src/tools/pgproto/main.c
index 6077788c9..02ffd379f 100644
--- a/src/tools/pgproto/main.c
+++ b/src/tools/pgproto/main.c
@@ -191,7 +191,7 @@ openfile(char *filename)
}
/*
- * Connect to the specifed PostgreSQL. If failed, do not return and exit
+ * Connect to the specified PostgreSQL. If failed, do not return and exit
* within this function.
*/
static PGconn *
@@ -460,7 +460,7 @@ process_message_type(int kind, char *buf, PGconn *conn)
}
/*
- * Process function call messaage
+ * Process function call message
*/
static void
process_function_call(char *buf, PGconn *conn)
diff --git a/src/tools/pgproto/read.c b/src/tools/pgproto/read.c
index a719d450b..eb2ad5ac3 100644
--- a/src/tools/pgproto/read.c
+++ b/src/tools/pgproto/read.c
@@ -37,7 +37,7 @@ static char *read_string(PGconn *conn);
/*
* Read message from connection until ready for query message is received. If
* a positive timeout is given, wait for timeout seconds then return if no
- * data is availble from the connection.
+ * data is available from the connection.
*/
void
read_until_ready_for_query(PGconn *conn, int timeout)
@@ -252,7 +252,7 @@ read_until_ready_for_query(PGconn *conn, int timeout)
break;
}
- /* If nap-bwteen-line is requested, nap for some time */
+ /* If nap-between-line is requested, nap for some time */
if (read_nap > 0)
{
(void) usleep(read_nap);
diff --git a/src/tools/watchdog/wd_cli.c b/src/tools/watchdog/wd_cli.c
index 8f44ae166..90db8164b 100644
--- a/src/tools/watchdog/wd_cli.c
+++ b/src/tools/watchdog/wd_cli.c
@@ -53,7 +53,7 @@
* lifecheck process should waits
* before giving up while fetching
* the configured watchdog node
- * infromation from watchdog
+ * information from watchdog
* process through IPC channel */
const char *progname = NULL;
@@ -179,7 +179,7 @@ main(int argc, char **argv)
status_ALIVE = true;
else
{
- fprintf(stderr, "ERROR: Invalid node status \"%s\", Allowd options are DEAD or ALIVE''\n",optarg);
+ fprintf(stderr, "ERROR: Invalid node status \"%s\", Allowed options are DEAD or ALIVE''\n",optarg);
exit(EXIT_FAILURE);
}
break;
@@ -293,7 +293,7 @@ main(int argc, char **argv)
default:
/*
- * getopt_long whould already have emitted a complaint
+ * getopt_long should already have emitted a complaint
*/
fprintf(stderr, "Try \"%s --help\" for more information.\n\n", progname);
exit(EXIT_FAILURE);
@@ -338,7 +338,7 @@ main(int argc, char **argv)
pool_config->wd_nodes.wd_node_info[pool_config->pgpool_node_id].wd_port);
pfree(conf_file_path);
- /* only use values from pg_config that are not provided explicitely*/
+ /* only use values from pg_config that are not provided explicitly*/
if (wd_authkey == NULL)
wd_authkey = pstrdup(pool_config->wd_authkey);
if (port < 0)
@@ -489,7 +489,7 @@ inform_node_status(LifeCheckNode * node, char *message, char* authkey)
if (json_data == NULL)
return false;
- for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSATION; x++)
+ for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSACTION; x++)
{
res = issue_command_to_watchdog(WD_NODE_STATUS_CHANGE_COMMAND, 0, json_data, strlen(json_data), false);
if (res)
diff --git a/src/utils/error/elog.c b/src/utils/error/elog.c
index 0c8f2c167..5e19331e8 100644
--- a/src/utils/error/elog.c
+++ b/src/utils/error/elog.c
@@ -302,7 +302,7 @@ errstart(int elevel, const char *filename, int lineno,
if (recursion_depth++ > 0 && elevel >= ERROR && elevel != FRONTEND_ONLY_ERROR)
{
/*
- * Ooops, error during error processing. Clear ErrorContext as
+ * Oops, error during error processing. Clear ErrorContext as
* discussed at top of file. We will not return to the original
* error's reporter or handler, so we don't need it.
*/
@@ -1737,7 +1737,7 @@ write_console(const char *line, int len)
/*
* Conversion on non-win32 platforms is not implemented yet. It requires
* non-throw version of pg_do_encoding_conversion(), that converts
- * unconvertable characters to '?' without errors.
+ * unconvertible characters to '?' without errors.
*/
#endif
@@ -2624,7 +2624,7 @@ proc_exit_prepare(int code)
error_context_stack = NULL;
/*
- * call on exit prepare if some function is specified this extention is
+ * call on exit prepare if some function is specified this extension is
* added by pgpool
*/
if (on_exit_prepare.function)
diff --git a/src/utils/pool_process_reporting.c b/src/utils/pool_process_reporting.c
index a012efd1e..6fc6aaed0 100644
--- a/src/utils/pool_process_reporting.c
+++ b/src/utils/pool_process_reporting.c
@@ -403,7 +403,7 @@ get_config(int *nrows)
/* - Syslog specific - */
StrNCpy(status[i].name, "syslog_facility", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "LOCAL%d", (pool_config->syslog_facility / 8) - 16);
- StrNCpy(status[i].desc, "syslog local faclity", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "syslog local facility", POOLCONFIG_MAXDESCLEN);
i++;
StrNCpy(status[i].name, "syslog_ident", POOLCONFIG_MAXNAMELEN);
@@ -692,7 +692,7 @@ get_config(int *nrows)
StrNCpy(status[i].name, "client_idle_limit_in_recovery", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%d", pool_config->client_idle_limit_in_recovery);
- StrNCpy(status[i].desc, "if idle for this seconds, child connection closes in recovery 2nd statge", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "if idle for this seconds, child connection closes in recovery 2nd stage", POOLCONFIG_MAXDESCLEN);
i++;
/* OTHERS */
@@ -807,17 +807,17 @@ get_config(int *nrows)
StrNCpy(status[i].name, "arping_cmd", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->arping_cmd);
- StrNCpy(status[i].desc, "send ARP REQUESTi to neighbour host", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "send ARP REQUEST to neighbour host", POOLCONFIG_MAXDESCLEN);
i++;
StrNCpy(status[i].name, "wd_heartbeat_keepalive", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%d", pool_config->wd_heartbeat_keepalive);
- StrNCpy(status[i].desc, "interval time of sending heartbeat siganl (sec)", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "interval time of sending heartbeat signal (sec)", POOLCONFIG_MAXDESCLEN);
i++;
StrNCpy(status[i].name, "wd_heartbeat_deadtime", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%d", pool_config->wd_heartbeat_deadtime);
- StrNCpy(status[i].desc, "deadtime interval for heartbeat siganl (sec)", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "deadtime interval for heartbeat signal (sec)", POOLCONFIG_MAXDESCLEN);
i++;
StrNCpy(status[i].name, "wd_life_point", POOLCONFIG_MAXNAMELEN);
@@ -961,7 +961,7 @@ get_config(int *nrows)
StrNCpy(status[i].name, "memqcache_memcached_port", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%d", pool_config->memqcache_memcached_port);
- StrNCpy(status[i].desc, "Memcached port number. Mondatory if memqcache_method=memcached", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "Memcached port number. Mandatory if memqcache_method=memcached", POOLCONFIG_MAXDESCLEN);
i++;
StrNCpy(status[i].name, "memqcache_total_size", POOLCONFIG_MAXNAMELEN);
@@ -996,7 +996,7 @@ get_config(int *nrows)
StrNCpy(status[i].name, "memqcache_cache_oiddir", POOLCONFIG_MAXNAMELEN);
snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->memqcache_oiddir);
- StrNCpy(status[i].desc, "Tempory work directory to record table oids", POOLCONFIG_MAXDESCLEN);
+ StrNCpy(status[i].desc, "Temporary work directory to record table oids", POOLCONFIG_MAXDESCLEN);
i++;
StrNCpy(status[i].name, "memqcache_stats_start_time", POOLCONFIG_MAXNAMELEN);
@@ -2059,7 +2059,7 @@ show_backend_stats(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend)
* offsettbl: offset array for each "data" member. The number of array
* elements must match with num_fields.
*
- * data: string data to be displayed as row data, 2-dimentions array. The
+ * data: string data to be displayed as row data, 2-dimensions array. The
* number of array elements must match with num_fields * nrows.
*
* row_size: byte length of data for 1 row.
diff --git a/src/utils/pool_relcache.c b/src/utils/pool_relcache.c
index fc2e35745..6f577e6f7 100644
--- a/src/utils/pool_relcache.c
+++ b/src/utils/pool_relcache.c
@@ -314,7 +314,7 @@ pool_search_relcache(POOL_RELCACHE * relcache, POOL_CONNECTION_POOL * backend, c
if (relcache->cache[index].refcnt != 0)
{
ereport(LOG,
- (errmsg("searching relcache. cache replacement occured")));
+ (errmsg("searching relcache. cache replacement occurred")));
}
diff --git a/src/utils/pool_select_walker.c b/src/utils/pool_select_walker.c
index da8d83ea5..1ca6a997e 100644
--- a/src/utils/pool_select_walker.c
+++ b/src/utils/pool_select_walker.c
@@ -1350,7 +1350,7 @@ make_function_name_from_funccall(FuncCall *fcall)
{
/*
* Function name. Max size is calculated as follows: schema
- * name(POOL_NAMEDATALEN byte) + quotation marks for schmea name(2 byte) +
+ * name(POOL_NAMEDATALEN byte) + quotation marks for schema name(2 byte) +
* period(1 byte) + table name (POOL_NAMEDATALEN byte) + quotation marks
* for table name(2 byte) + NULL(1 byte)
*/
@@ -1419,7 +1419,7 @@ make_table_name_from_rangevar(RangeVar *rangevar)
{
/*
* Table name. Max size is calculated as follows: schema
- * name(POOL_NAMEDATALEN byte) + quotation marks for schmea name(2 byte) +
+ * name(POOL_NAMEDATALEN byte) + quotation marks for schema name(2 byte) +
* period(1 byte) + table name (POOL_NAMEDATALEN byte) + quotation marks
* for table name(2 byte) + NULL(1 byte)
*/
diff --git a/src/utils/pool_signal.c b/src/utils/pool_signal.c
index 6d6f4672e..c4cdd6db1 100644
--- a/src/utils/pool_signal.c
+++ b/src/utils/pool_signal.c
@@ -171,7 +171,7 @@ pool_signal_parent(int sig)
if (processType != PT_PCP_WORKER && mypid != getppid())
{
/*
- * pgpool parent is no more alive, commiting sucide.
+ * pgpool parent is no more alive, committing suicide.
*/
ereport(PANIC,
(errmsg("pgpool-II main process died unexpectedly. exiting current process")));
diff --git a/src/utils/pool_stream.c b/src/utils/pool_stream.c
index dcb64188e..807e484b1 100644
--- a/src/utils/pool_stream.c
+++ b/src/utils/pool_stream.c
@@ -802,7 +802,7 @@ pool_flush_noerror(POOL_CONNECTION * cp)
errdetail("pg_terminate_backend was called on the backend")));
}
- /* if fail_over_on_backend_erro is true, then trigger failover */
+ /* if fail_over_on_backend_error is true, then trigger failover */
if (pool_config->failover_on_backend_error)
{
notice_backend_error(cp->db_node_id, REQ_DETAIL_SWITCHOVER);
@@ -847,7 +847,7 @@ pool_write_and_flush(POOL_CONNECTION * cp, void *buf, int len)
}
/*
- * same as pool_write_and_flush() but does not throws ereport when error occures
+ * same as pool_write_and_flush() but does not throws ereport when error occurs
*/
int
pool_write_and_flush_noerror(POOL_CONNECTION * cp, void *buf, int len)
diff --git a/src/utils/regex_array.c b/src/utils/regex_array.c
index fba8f9eb5..358e298c7 100644
--- a/src/utils/regex_array.c
+++ b/src/utils/regex_array.c
@@ -21,7 +21,7 @@
*/
/*
- * This module handles regular expressio arrary.
+ * This module handles regular expression array.
*/
#include <string.h>
@@ -159,7 +159,7 @@ regex_array_match(RegArray * ar, char *pattern)
* Destroy RegArray object
*/
void
-destroy_regex_arrary(RegArray * ar)
+destroy_regex_array(RegArray * ar)
{
pfree(ar->regex);
pfree(ar);
@@ -182,7 +182,7 @@ create_lrtoken_array(void)
}
/*
- * Extract tokens separated by delimi from str. Each token is separeted by delim2,
+ * Extract tokens separated by delimi from str. Each token is separated by delim2,
* and token lists are returned to left_tokens and right_tokens respectively.
* Nnumber of tokens is set to *n.
*/
diff --git a/src/watchdog/watchdog.c b/src/watchdog/watchdog.c
index 4d88b567a..6c0e2abc4 100644
--- a/src/watchdog/watchdog.c
+++ b/src/watchdog/watchdog.c
@@ -72,22 +72,22 @@
#define NODE_DOWN_REQUIRE_CONSENSUS
#define NODE_PROMOTE_REQUIRE_CONSENSUS
-typedef enum IPC_CMD_PREOCESS_RES
+typedef enum IPC_CMD_PROCESS_RES
{
IPC_CMD_COMPLETE,
IPC_CMD_PROCESSING,
IPC_CMD_ERROR,
IPC_CMD_OK,
IPC_CMD_TRY_AGAIN
-} IPC_CMD_PREOCESS_RES;
+} IPC_CMD_PROCESS_RES;
#define MIN_SECS_CONNECTION_RETRY 10 /* Time in seconds to retry connection
* with node once it was failed */
#define MAX_SECS_ESC_PROC_EXIT_WAIT 5 /* maximum amount of seconds to wait
- * for escalation/de-esclation process
- * to exit normaly before moving on */
+ * for escalation/de-escalation process
+ * to exit normally before moving on */
#define BEACON_MESSAGE_INTERVAL_SECONDS 10 /* interval between beacon
* messages */
@@ -259,7 +259,7 @@ typedef struct WDPacketData
typedef enum WDNodeCommandState
{
- COMMAMD_STATE_INIT,
+ COMMAND_STATE_INIT,
COMMAND_STATE_SENT,
COMMAND_STATE_REPLIED,
COMMAND_STATE_SEND_ERROR,
@@ -361,7 +361,7 @@ typedef struct wd_cluster
bool ipc_auth_needed;
int current_failover_id;
struct timeval last_bcast_srv_msg_time; /* timestamp when last packet was
- * boradcasted by the local node */
+ * broadcasted by the local node */
char last_bcast_srv_msg;
List *unidentified_socks;
@@ -418,7 +418,7 @@ static WDFailoverCMDResults compute_failover_consensus(POOL_REQUEST_KIND reqKind
static int send_command_packet_to_remote_nodes(WDCommandData * ipcCommand, bool source_included);
static void wd_command_is_complete(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES wd_command_processor_for_node_lost_event(WDCommandData * ipcCommand, WatchdogNode * wdLostNode);
+static IPC_CMD_PROCESS_RES wd_command_processor_for_node_lost_event(WDCommandData * ipcCommand, WatchdogNode * wdLostNode);
volatile sig_atomic_t reload_config_signal = 0;
volatile sig_atomic_t sigchld_request = 0;
@@ -493,7 +493,7 @@ static int send_message_of_type(WatchdogNode * wdNode, char type, WDPacketData *
static bool send_cluster_service_message(WatchdogNode * wdNode, WDPacketData * replyFor, char message);
-static int accept_incomming_connections(fd_set *rmask, int pending_fds_count);
+static int accept_incoming_connections(fd_set *rmask, int pending_fds_count);
static int standard_packet_processor(WatchdogNode * wdNode, WDPacketData * pkt);
static void cluster_service_message_processor(WatchdogNode * wdNode, WDPacketData * pkt);
@@ -515,7 +515,7 @@ static int watchdog_state_machine(WD_EVENTS event, WatchdogNode * wdNode, WDPack
static int watchdog_state_machine_nw_error(WD_EVENTS event, WatchdogNode * wdNode, WDPacketData * pkt, WDCommandData * clusterCommand);
static int watchdog_state_machine_nw_isolation(WD_EVENTS event, WatchdogNode * wdNode, WDPacketData * pkt, WDCommandData * clusterCommand);
-static int I_am_leader_and_cluser_in_split_brain(WatchdogNode * otherLeaderNode);
+static int I_am_leader_and_cluster_in_split_brain(WatchdogNode * otherLeaderNode);
static void handle_split_brain(WatchdogNode * otherLeaderNode, WDPacketData * pkt);
static bool beacon_message_received_from_node(WatchdogNode * wdNode, WDPacketData * pkt);
@@ -536,16 +536,16 @@ static WDCommandData * get_wd_cluster_command_from_reply(WDPacketData * pkt);
static WDCommandData * get_wd_IPC_command_from_reply(WDPacketData * pkt);
static WDCommandData * get_wd_IPC_command_from_socket(int sock);
-static IPC_CMD_PREOCESS_RES process_IPC_command(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_nodeStatusChange_command(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_nodeList_command(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_get_runtime_variable_value_request(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_online_recovery(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_failover_indication(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_data_request_from_leader(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_failover_command(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandData * ipcCommand);
-static IPC_CMD_PREOCESS_RES process_IPC_execute_cluster_command(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_command(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_nodeStatusChange_command(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_nodeList_command(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_get_runtime_variable_value_request(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_online_recovery(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_failover_indication(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_data_request_from_leader(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_failover_command(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_failover_command_on_coordinator(WDCommandData * ipcCommand);
+static IPC_CMD_PROCESS_RES process_IPC_execute_cluster_command(WDCommandData * ipcCommand);
static bool write_ipc_command_with_result_data(WDCommandData * ipcCommand, char type, char *data, int len);
@@ -651,7 +651,7 @@ wd_initialize_monitoring_interfaces(void)
*idx;
ereport(LOG,
- (errmsg("ensure availibility on any interface")));
+ (errmsg("ensure availability on any interface")));
if_ni = if_nameindex();
if (if_ni == NULL)
@@ -827,7 +827,7 @@ clear_command_node_result(WDCommandNodeResult * nodeResult)
nodeResult->result_type = WD_NO_MESSAGE;
nodeResult->result_data = NULL;
nodeResult->result_data_len = 0;
- nodeResult->cmdState = COMMAMD_STATE_INIT;
+ nodeResult->cmdState = COMMAND_STATE_INIT;
}
static int
@@ -909,7 +909,7 @@ wd_create_recv_socket(int port)
/*
* creates a socket in non blocking mode and connects it to the hostname and port
- * the out parameter connected is set to true if the connection is successfull
+ * the out parameter connected is set to true if the connection is successful
*/
static int
wd_create_client_socket(char *hostname, int port, bool *connected)
@@ -994,7 +994,7 @@ wd_create_client_socket(char *hostname, int port, bool *connected)
return sock;
}
-/* returns the number of successfull connections */
+/* returns the number of successful connections */
static int
connect_with_all_configured_nodes(void)
{
@@ -1067,7 +1067,7 @@ connect_to_node(WatchdogNode * wdNode)
return (wdNode->client_socket.sock_state != WD_SOCK_ERROR);
}
-/* signal handler for SIGHUP and SIGCHILD handler */
+/* signal handler for SIGHUP and SIGCHLD handler */
static RETSIGTYPE watchdog_signal_handler(int sig)
{
if (sig == SIGHUP)
@@ -1109,7 +1109,7 @@ fork_watchdog_child(void)
{
on_exit_reset();
- SetProcessGlobalVaraibles(PT_WATCHDOG);
+ SetProcessGlobalVariables(PT_WATCHDOG);
/* call watchdog child main */
POOL_SETMASK(&UnBlockSig);
@@ -1243,7 +1243,7 @@ watchdog_main(void)
{
int processed_fds = 0;
- processed_fds += accept_incomming_connections(&rmask, (select_ret - processed_fds));
+ processed_fds += accept_incoming_connections(&rmask, (select_ret - processed_fds));
processed_fds += update_successful_outgoing_cons(&wmask, (select_ret - processed_fds));
processed_fds += read_sockets(&rmask, (select_ret - processed_fds));
}
@@ -1401,7 +1401,7 @@ prepare_fds(fd_set *rmask, fd_set *wmask, fd_set *emask)
}
/*
- * I know this is getting complex but we need to add all incomming
+ * I know this is getting complex but we need to add all incoming
* unassigned connection sockets these one will go for reading
*/
foreach(lc, g_cluster.unidentified_socks)
@@ -1732,7 +1732,7 @@ read_sockets(fd_set *rmask, int pending_fds_count)
/*
* special case we want to remove the socket from
* ipc_command_sock list manually, so mark the issuing
- * socket of ipcComman to invalid value
+ * socket of ipcCommand to invalid value
*/
ipcCommand->sourceIPCSocket = -1;
}
@@ -1874,7 +1874,7 @@ read_ipc_socket_and_process(int sock, bool *remove_socket)
int data_len,
ret;
WDCommandData *ipcCommand;
- IPC_CMD_PREOCESS_RES res;
+ IPC_CMD_PROCESS_RES res;
*remove_socket = true;
@@ -1984,7 +1984,7 @@ read_ipc_socket_and_process(int sock, bool *remove_socket)
return (res != IPC_CMD_ERROR);
}
-static IPC_CMD_PREOCESS_RES process_IPC_command(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_command(WDCommandData * ipcCommand)
{
/* authenticate the client first */
if (check_and_report_IPC_authentication(ipcCommand) == false)
@@ -2041,7 +2041,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_command(WDCommandData * ipcCommand)
return IPC_CMD_ERROR;
}
-static IPC_CMD_PREOCESS_RES
+static IPC_CMD_PROCESS_RES
process_IPC_execute_cluster_command(WDCommandData * ipcCommand)
{
/* get the json for node list */
@@ -2097,7 +2097,7 @@ ERROR_EXIT:
return IPC_CMD_ERROR;
}
-static IPC_CMD_PREOCESS_RES process_IPC_get_runtime_variable_value_request(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_get_runtime_variable_value_request(WDCommandData * ipcCommand)
{
/* get the json for node list */
JsonNode *jNode = NULL;
@@ -2162,7 +2162,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_get_runtime_variable_value_request(WDCom
return IPC_CMD_COMPLETE;
}
-static IPC_CMD_PREOCESS_RES process_IPC_nodeList_command(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_nodeList_command(WDCommandData * ipcCommand)
{
/* get the json for node list */
JsonNode *jNode = NULL;
@@ -2197,7 +2197,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_nodeList_command(WDCommandData * ipcComm
return IPC_CMD_COMPLETE;
}
-static IPC_CMD_PREOCESS_RES process_IPC_nodeStatusChange_command(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_nodeStatusChange_command(WDCommandData * ipcCommand)
{
int nodeStatus;
int nodeID;
@@ -2457,7 +2457,7 @@ process_remote_failover_command_on_coordinator(WatchdogNode * wdNode, WDPacketDa
}
else
{
- IPC_CMD_PREOCESS_RES res;
+ IPC_CMD_PROCESS_RES res;
WDCommandData *ipcCommand = create_command_object(pkt->len);
ipcCommand->sourcePacket.type = pkt->type;
@@ -2493,7 +2493,7 @@ process_remote_failover_command_on_coordinator(WatchdogNode * wdNode, WDPacketDa
}
static bool
-reply_to_failove_command(WDCommandData * ipcCommand, WDFailoverCMDResults cmdResult, unsigned int failoverID)
+reply_to_failover_command(WDCommandData * ipcCommand, WDFailoverCMDResults cmdResult, unsigned int failoverID)
{
bool ret = false;
JsonNode *jNode = jw_create_with_object(true);
@@ -2573,8 +2573,8 @@ static WDFailoverCMDResults compute_failover_consensus(POOL_REQUEST_KIND reqKind
}
/*
- * So we reached here means quorum is present Now come to dificult part of
- * enusring the consensus
+ * So we reached here means quorum is present Now come to difficult part of
+ * ensuring the consensus
*/
if (pool_config->failover_require_consensus == true)
{
@@ -2598,7 +2598,7 @@ static WDFailoverCMDResults compute_failover_consensus(POOL_REQUEST_KIND reqKind
ereport(LOG, (
errmsg("we have got the consensus to perform the failover"),
errdetail("%d node(s) voted in the favor", failoverObj->request_count)));
- /* restor the flag value to the one from the first call */
+ /* restore the flag value to the one from the first call */
*flags = failoverObj->reqFlags;
/* remove this object, It is no longer needed */
remove_failover_object(failoverObj);
@@ -2685,7 +2685,7 @@ static WDFailoverObject * add_failover(POOL_REQUEST_KIND reqKind, int *node_id_l
/*
* The function processes all failover commands on leader node
*/
-static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_failover_command_on_coordinator(WDCommandData * ipcCommand)
{
char *func_name;
int node_count = 0;
@@ -2705,7 +2705,7 @@ static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandDat
ereport(LOG, (
errmsg("failed to process failover command"),
errdetail("unable to parse the command data")));
- reply_to_failove_command(ipcCommand, FAILOVER_RES_INVALID_FUNCTION, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_INVALID_FUNCTION, 0);
return IPC_CMD_COMPLETE;
}
@@ -2717,7 +2717,7 @@ static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandDat
reqKind = PROMOTE_NODE_REQUEST;
else
{
- reply_to_failove_command(ipcCommand, FAILOVER_RES_INVALID_FUNCTION, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_INVALID_FUNCTION, 0);
return IPC_CMD_COMPLETE;
}
@@ -2753,9 +2753,9 @@ static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandDat
ret = promote_backend(node_id_list[0], flags);
if (ret == true)
- reply_to_failove_command(ipcCommand, FAILOVER_RES_WILL_BE_DONE, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_WILL_BE_DONE, 0);
else
- reply_to_failove_command(ipcCommand, FAILOVER_RES_ERROR, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_ERROR, 0);
}
else
{
@@ -2763,7 +2763,7 @@ static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandDat
* It was the request from the local node, Just reply the caller
* to get on with the failover
*/
- reply_to_failove_command(ipcCommand, FAILOVER_RES_PROCEED, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_PROCEED, 0);
}
return IPC_CMD_COMPLETE;
}
@@ -2795,11 +2795,11 @@ static IPC_CMD_PREOCESS_RES process_failover_command_on_coordinator(WDCommandDat
register_inform_quarantine_nodes_req();
}
- reply_to_failove_command(ipcCommand, res, 0);
+ reply_to_failover_command(ipcCommand, res, 0);
return IPC_CMD_COMPLETE;
}
-static IPC_CMD_PREOCESS_RES process_IPC_failover_command(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_failover_command(WDCommandData * ipcCommand)
{
if (is_local_node_true_leader())
{
@@ -2846,7 +2846,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_failover_command(WDCommandData * ipcComm
return IPC_CMD_ERROR;
}
-static IPC_CMD_PREOCESS_RES process_IPC_online_recovery(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_online_recovery(WDCommandData * ipcCommand)
{
if (get_local_node_state() == WD_STANDBY ||
get_local_node_state() == WD_COORDINATOR)
@@ -2884,7 +2884,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_online_recovery(WDCommandData * ipcComma
return IPC_CMD_TRY_AGAIN;
}
-static IPC_CMD_PREOCESS_RES process_IPC_data_request_from_leader(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_data_request_from_leader(WDCommandData * ipcCommand)
{
/*
* if cluster or myself is not in stable state just return cluster in
@@ -2896,7 +2896,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_data_request_from_leader(WDCommandData *
if (get_local_node_state() == WD_STANDBY)
{
/*
- * set the command id in the IPC packet before forwaring it on the
+ * set the command id in the IPC packet before forwarding it on the
* watchdog socket
*/
wd_packet_shallow_copy(&ipcCommand->sourcePacket, &ipcCommand->commandPacket);
@@ -2941,7 +2941,7 @@ static IPC_CMD_PREOCESS_RES process_IPC_data_request_from_leader(WDCommandData *
return IPC_CMD_TRY_AGAIN;
}
-static IPC_CMD_PREOCESS_RES process_IPC_failover_indication(WDCommandData * ipcCommand)
+static IPC_CMD_PROCESS_RES process_IPC_failover_indication(WDCommandData * ipcCommand)
{
WDFailoverCMDResults res = FAILOVER_RES_NOT_ALLOWED;
@@ -3010,13 +3010,13 @@ static IPC_CMD_PREOCESS_RES process_IPC_failover_indication(WDCommandData * ipcC
ereport(LOG,
(errmsg("received the failover indication from Pgpool-II on IPC interface, but only leader can do failover")));
}
- reply_to_failove_command(ipcCommand, res, 0);
+ reply_to_failover_command(ipcCommand, res, 0);
return IPC_CMD_COMPLETE;
}
-/* Failover start basically does nothing fency, It just sets the failover_in_progress
+/* Failover start basically does nothing fancy, It just sets the failover_in_progress
* flag and inform all nodes that the failover is in progress.
*
* only the local node that is a leader can start the failover.
@@ -3319,7 +3319,7 @@ is_node_active_and_reachable(WatchdogNode * wdNode)
}
static int
-accept_incomming_connections(fd_set *rmask, int pending_fds_count)
+accept_incoming_connections(fd_set *rmask, int pending_fds_count)
{
int processed_fds = 0;
int fd;
@@ -3341,7 +3341,7 @@ accept_incomming_connections(fd_set *rmask, int pending_fds_count)
}
/* accept failed */
ereport(DEBUG1,
- (errmsg("Failed to accept incomming watchdog connection")));
+ (errmsg("Failed to accept incoming watchdog connection")));
}
else
{
@@ -3866,7 +3866,7 @@ cluster_service_message_processor(WatchdogNode * wdNode, WDPacketData * pkt)
case CLUSTER_IAM_TRUE_LEADER:
{
/*
- * The cluster was in split-brain and remote node thiks it is
+ * The cluster was in split-brain and remote node thinks it is
* the worthy leader
*/
if (get_local_node_state() == WD_COORDINATOR)
@@ -4180,7 +4180,7 @@ standard_packet_processor(WatchdogNode * wdNode, WDPacketData * pkt)
if (get_local_node_state() != WD_COORDINATOR)
{
/*
- * This fight dosen't belong to me brodcast the
+ * This fight doesn't belong to me broadcast the
* message about cluster in split-brain
*/
@@ -4203,7 +4203,7 @@ standard_packet_processor(WatchdogNode * wdNode, WDPacketData * pkt)
else if (WD_LEADER_NODE == wdNode && oldQuorumStatus != wdNode->quorum_status)
{
/* inform Pgpool main about quorum status changes */
- register_watchdog_quorum_change_interupt();
+ register_watchdog_quorum_change_interrupt();
}
}
@@ -4400,7 +4400,7 @@ send_message(WatchdogNode * wdNode, WDPacketData * pkt)
return count;
}
-static IPC_CMD_PREOCESS_RES wd_command_processor_for_node_lost_event(WDCommandData * ipcCommand, WatchdogNode * wdLostNode)
+static IPC_CMD_PROCESS_RES wd_command_processor_for_node_lost_event(WDCommandData * ipcCommand, WatchdogNode * wdLostNode)
{
if (ipcCommand->sendToNode)
{
@@ -4518,7 +4518,7 @@ node_lost_while_ipc_command(WatchdogNode * wdNode)
foreach(lc, g_cluster.ipc_commands)
{
WDCommandData *ipcCommand = lfirst(lc);
- IPC_CMD_PREOCESS_RES res = wd_command_processor_for_node_lost_event(ipcCommand, wdNode);
+ IPC_CMD_PROCESS_RES res = wd_command_processor_for_node_lost_event(ipcCommand, wdNode);
if (res != IPC_CMD_PROCESSING)
{
@@ -4539,7 +4539,7 @@ node_lost_while_ipc_command(WatchdogNode * wdNode)
/*
* The function walks through all command and resends
- * the failed maessage again if it can.
+ * the failed message again if it can.
*/
static void
service_ipc_commands(void)
@@ -4754,7 +4754,7 @@ watchdog_internal_command_packet_processor(WatchdogNode * wdNode, WDPacketData *
}
else if (pkt->type == WD_REJECT_MESSAGE || pkt->type == WD_ERROR_MESSAGE)
{
- /* Error or reject message by any node imidiately finishes the command */
+ /* Error or reject message by any node immediately finishes the command */
ereport(DEBUG1,
(errmsg("command %c with command id %d is finished with COMMAND_FINISHED_NODE_REJECTED", pkt->type, pkt->command_id)));
clusterCommand->commandStatus = COMMAND_FINISHED_NODE_REJECTED;
@@ -4888,7 +4888,7 @@ issue_watchdog_internal_command(WatchdogNode * wdNode, WDPacketData * pkt, int t
}
if (nodeResult == NULL)
{
- /* should never hapen */
+ /* should never happen */
ereport(WARNING,
(errmsg("Internal error. Not able to locate node result slot")));
MemoryContextDelete(clusterCommand->memoryContext);
@@ -5115,7 +5115,7 @@ is_local_node_true_leader(void)
}
/*
- * returns true if no message is swollowed by the
+ * returns true if no message is swallowed by the
* processor and no further action is required
*/
static bool
@@ -5171,7 +5171,7 @@ wd_commands_packet_processor(WD_EVENTS event, WatchdogNode * wdNode, WDPacketDat
if (ipcCommand == NULL)
return false;
- /* Just forward the data to IPC socket and finsh the command */
+ /* Just forward the data to IPC socket and finish the command */
if (write_ipc_command_with_result_data(ipcCommand, WD_IPC_CMD_RESULT_OK, pkt->data, pkt->len) == false)
ereport(LOG,
(errmsg("failed to forward data message to IPC command socket")));
@@ -5195,9 +5195,9 @@ wd_commands_packet_processor(WD_EVENTS event, WatchdogNode * wdNode, WDPacketDat
if (ipcCommand->commandPacket.type == WD_IPC_FAILOVER_COMMAND)
{
if (pkt->type == WD_ACCEPT_MESSAGE)
- reply_to_failove_command(ipcCommand, FAILOVER_RES_PROCEED, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_PROCEED, 0);
else
- reply_to_failove_command(ipcCommand, FAILOVER_RES_LEADER_REJECTED, 0);
+ reply_to_failover_command(ipcCommand, FAILOVER_RES_LEADER_REJECTED, 0);
return true;
}
@@ -5327,7 +5327,7 @@ watchdog_state_machine(WD_EVENTS event, WatchdogNode * wdNode, WDPacketData * pk
else if (event == WD_EVENT_PACKET_RCV)
{
print_packet_node_info(pkt, wdNode, false);
- /* update the last receiv time */
+ /* update the last receive time */
gettimeofday(&wdNode->last_rcv_time, NULL);
if (pkt->type == WD_INFO_MESSAGE)
@@ -5651,14 +5651,14 @@ watchdog_state_machine_initializing(WD_EVENTS event, WatchdogNode * wdNode, WDPa
switch (event)
{
case WD_EVENT_WD_STATE_CHANGED:
- /* set 1 sec timeout, save ourself from recurrsion */
+ /* set 1 sec timeout, save ourself from recursion */
set_timeout(1);
break;
case WD_EVENT_TIMEOUT:
{
/*
- * If leader node exists in cluser, Join it otherwise try
+ * If leader node exists in cluster, Join it otherwise try
* becoming a leader
*/
if (WD_LEADER_NODE)
@@ -5893,7 +5893,7 @@ watchdog_state_machine_coordinator(WD_EVENTS event, WatchdogNode * wdNode, WDPac
(errmsg("declare coordinator command finished with status:[%s]",
clusterCommand->commandStatus == COMMAND_FINISHED_ALL_REPLIED ?
"ALL NODES REPLIED" :
- "COMMAND TIMEED OUT"),
+ "COMMAND TIMED OUT"),
errdetail("The command was sent to %d nodes and %d nodes replied to it",
clusterCommand->commandSendToCount,
clusterCommand->commandReplyFromCount
@@ -5904,7 +5904,7 @@ watchdog_state_machine_coordinator(WD_EVENTS event, WatchdogNode * wdNode, WDPac
errdetail("our declare coordinator message is accepted by all nodes")));
set_cluster_leader_node(g_cluster.localNode);
- register_watchdog_state_change_interupt();
+ register_watchdog_state_change_interrupt();
/*
* Check if the quorum is present then start the
@@ -5950,7 +5950,7 @@ watchdog_state_machine_coordinator(WD_EVENTS event, WatchdogNode * wdNode, WDPac
else if (clusterCommand->commandStatus == COMMAND_FINISHED_TIMEOUT)
{
ereport(DEBUG1,
- (errmsg("I am the cluster leader node command finished with status:[COMMAND TIMEED OUT] which is success"),
+ (errmsg("I am the cluster leader node command finished with status:[COMMAND TIMED OUT] which is success"),
errdetail("The command was sent to %d nodes and %d nodes replied to it",
clusterCommand->commandSendToCount,
clusterCommand->commandReplyFromCount
@@ -6001,7 +6001,7 @@ watchdog_state_machine_coordinator(WD_EVENTS event, WatchdogNode * wdNode, WDPac
}
/* inform to the cluster about the new quorum status */
send_message_of_type(NULL, WD_INFO_MESSAGE, NULL);
- register_watchdog_quorum_change_interupt();
+ register_watchdog_quorum_change_interrupt();
}
}
break;
@@ -6045,7 +6045,7 @@ watchdog_state_machine_coordinator(WD_EVENTS event, WatchdogNode * wdNode, WDPac
/*
* Okay this is the case when only our VIP is lost
* but network interface seems to be working fine
- * try to re-aquire the VIP
+ * try to re-acquire the VIP
*/
wd_IP_up();
}
@@ -6406,7 +6406,7 @@ beacon_message_received_from_node(WatchdogNode * wdNode, WDPacketData * pkt)
* 1 : local node should remain as the leader/coordinator
*/
static int
-I_am_leader_and_cluser_in_split_brain(WatchdogNode * otherLeaderNode)
+I_am_leader_and_cluster_in_split_brain(WatchdogNode * otherLeaderNode)
{
if (get_local_node_state() != WD_COORDINATOR)
return 0;
@@ -6480,7 +6480,7 @@ I_am_leader_and_cluser_in_split_brain(WatchdogNode * otherLeaderNode)
return 1;
}
}
- else /* decide on which node is the older mater */
+ else /* decide on which node is the older master */
{
if (otherLeaderNode->current_state_time.tv_sec < g_cluster.localNode->current_state_time.tv_sec)
{
@@ -6507,7 +6507,7 @@ I_am_leader_and_cluser_in_split_brain(WatchdogNode * otherLeaderNode)
static void
handle_split_brain(WatchdogNode * otherLeaderNode, WDPacketData * pkt)
{
- int decide_leader = I_am_leader_and_cluser_in_split_brain(otherLeaderNode);
+ int decide_leader = I_am_leader_and_cluster_in_split_brain(otherLeaderNode);
if (decide_leader == 0)
{
@@ -6717,7 +6717,7 @@ watchdog_state_machine_standby(WD_EVENTS event, WatchdogNode * wdNode, WDPacketD
if (clusterCommand->commandStatus == COMMAND_FINISHED_ALL_REPLIED ||
clusterCommand->commandStatus == COMMAND_FINISHED_TIMEOUT)
{
- register_watchdog_state_change_interupt();
+ register_watchdog_state_change_interrupt();
ereport(LOG,
(errmsg("successfully joined the watchdog cluster as standby node"),
@@ -6798,7 +6798,7 @@ watchdog_state_machine_standby(WD_EVENTS event, WatchdogNode * wdNode, WDPacketD
case WD_FAILOVER_END:
{
- register_backend_state_sync_req_interupt();
+ register_backend_state_sync_req_interrupt();
}
break;
@@ -6895,7 +6895,7 @@ watchdog_state_machine_standby(WD_EVENTS event, WatchdogNode * wdNode, WDPacketD
else if (last_rcv_sec >= (2 * BEACON_MESSAGE_INTERVAL_SECONDS))
{
/*
- * We have not received a last becacon from leader ask for the
+ * We have not received a last beacon from leader ask for the
* node info from leader node
*/
ereport(WARNING,
@@ -7468,7 +7468,7 @@ verify_authhash_for_node(WatchdogNode * wdNode, char *authhash)
/*
* function authenticates the IPC command by looking for the
* auth key in the JSON data of IPC command.
- * For IPC commands comming from outer wrold the function validates the
+ * For IPC commands coming from outer world the function validates the
* authkey in JSON packet with configured pool_config->wd_authkey.
* if internal_client_only is true then the JSON data must contain the
* shared key present in the pgpool-II shared memory. This can be used
@@ -7572,7 +7572,7 @@ check_and_report_IPC_authentication(WDCommandData * ipcCommand)
case WD_IPC_ONLINE_RECOVERY_COMMAND:
case WD_EXECUTE_CLUSTER_COMMAND:
case WD_GET_LEADER_DATA_REQUEST:
- /* only allowed internaly. */
+ /* only allowed internally. */
internal_client_only = true;
break;
diff --git a/src/watchdog/wd_commands.c b/src/watchdog/wd_commands.c
index 43efab4de..e1aae9e07 100644
--- a/src/watchdog/wd_commands.c
+++ b/src/watchdog/wd_commands.c
@@ -110,7 +110,7 @@ get_watchdog_quorum_state(char* wd_authkey)
/*
- * Function gets the runtime value of watchdog varibale using the
+ * Function gets the runtime value of watchdog variable using the
* watchdog IPC
*/
WDGenericData *
@@ -420,7 +420,7 @@ extern void set_wd_command_timeout(int sec)
wd_command_timeout_sec = sec;
}
-/* The function returs the simple JSON string that contains
+/* The function returns the simple JSON string that contains
* only one KEY,VALUE along with the authkey key value if provided
*/
char *
diff --git a/src/watchdog/wd_escalation.c b/src/watchdog/wd_escalation.c
index 686ac0e89..9acd4e49e 100644
--- a/src/watchdog/wd_escalation.c
+++ b/src/watchdog/wd_escalation.c
@@ -73,7 +73,7 @@ fork_escalation_process(void)
return pid;
}
on_exit_reset();
- SetProcessGlobalVaraibles(PT_WATCHDOG_UTILITY);
+ SetProcessGlobalVariables(PT_WATCHDOG_UTILITY);
POOL_SETMASK(&UnBlockSig);
@@ -161,7 +161,7 @@ fork_plunging_process(void)
return pid;
}
on_exit_reset();
- SetProcessGlobalVaraibles(PT_WATCHDOG_UTILITY);
+ SetProcessGlobalVariables(PT_WATCHDOG_UTILITY);
POOL_SETMASK(&UnBlockSig);
diff --git a/src/watchdog/wd_heartbeat.c b/src/watchdog/wd_heartbeat.c
index d9bd98aca..d9ace72ec 100644
--- a/src/watchdog/wd_heartbeat.c
+++ b/src/watchdog/wd_heartbeat.c
@@ -208,14 +208,14 @@ wd_create_hb_recv_socket(WdHbIf * hb_if)
errdetail("setsockopt(SO_BINDTODEVICE) failed with reason: \"%m\"")));
}
ereport(LOG,
- (errmsg("createing watchdog heartbeat receive socket."),
+ (errmsg("creating watchdog heartbeat receive socket."),
errdetail("bind receive socket to device: \"%s\"", i.ifr_name)));
}
else
ereport(LOG,
(errmsg("failed to create watchdog heartbeat receive socket."),
- errdetail("setsockopt(SO_BINDTODEVICE) requies root privilege")));
+ errdetail("setsockopt(SO_BINDTODEVICE) requires root privilege")));
}
#else
ereport(LOG,
@@ -363,7 +363,7 @@ wd_hb_receiver(int fork_wait_time, WdHbIf * hb_if)
}
on_exit_reset();
- SetProcessGlobalVaraibles(PT_HB_RECEIVER);
+ SetProcessGlobalVariables(PT_HB_RECEIVER);
if (fork_wait_time > 0)
{
@@ -496,7 +496,7 @@ wd_hb_sender(int fork_wait_time, WdHbIf * hb_if)
}
on_exit_reset();
- SetProcessGlobalVaraibles(PT_HB_SENDER);
+ SetProcessGlobalVariables(PT_HB_SENDER);
if (fork_wait_time > 0)
{
diff --git a/src/watchdog/wd_if.c b/src/watchdog/wd_if.c
index 575925483..1de2337e2 100644
--- a/src/watchdog/wd_if.c
+++ b/src/watchdog/wd_if.c
@@ -312,7 +312,7 @@ exec_if_cmd(char *path, char *command)
if (pid == 0)
{
on_exit_reset();
- SetProcessGlobalVaraibles(PT_WATCHDOG_UTILITY);
+ SetProcessGlobalVariables(PT_WATCHDOG_UTILITY);
close(STDOUT_FILENO);
dup2(pfd[1], STDOUT_FILENO);
close(pfd[0]);
diff --git a/src/watchdog/wd_internal_commands.c b/src/watchdog/wd_internal_commands.c
index afab3c58f..d628ead42 100644
--- a/src/watchdog/wd_internal_commands.c
+++ b/src/watchdog/wd_internal_commands.c
@@ -210,7 +210,7 @@ wd_start_recovery(void)
(errmsg("start recovery command lock failed"),
errdetail("watchdog cluster is not in stable state"),
errhint("try again when the cluster is fully initialized")));
- return CLUSTER_IN_TRANSATIONING;
+ return CLUSTER_IN_TRANSACTIONING;
}
else if (type == WD_IPC_CMD_TIMEOUT)
{
@@ -259,7 +259,7 @@ wd_end_recovery(void)
(errmsg("end recovery command lock failed"),
errdetail("watchdog cluster is not in stable state"),
errhint("try again when the cluster is fully initialized")));
- return CLUSTER_IN_TRANSATIONING;
+ return CLUSTER_IN_TRANSACTIONING;
}
else if (type == WD_IPC_CMD_TIMEOUT)
{
@@ -308,7 +308,7 @@ wd_execute_cluster_command(char* clusterCommand,
(errmsg("execute cluster command failed"),
errdetail("watchdog cluster is not in stable state"),
errhint("try again when the cluster is fully initialized")));
- return CLUSTER_IN_TRANSATIONING;
+ return CLUSTER_IN_TRANSACTIONING;
}
else if (type == WD_IPC_CMD_TIMEOUT)
{
@@ -440,7 +440,7 @@ wd_issue_failover_command(char *func_name, int *node_id_set, int count, unsigned
* send the degenerate backend request to watchdog.
* now watchdog can respond to the request in following ways.
*
- * 1 - It can tell the caller to procees with failover. This
+ * 1 - It can tell the caller to process with failover. This
* happens when the current node is the leader watchdog node.
*
* 2 - It can tell the caller to failover not allowed
diff --git a/src/watchdog/wd_ipc_conn.c b/src/watchdog/wd_ipc_conn.c
index d84471d20..32b330e96 100644
--- a/src/watchdog/wd_ipc_conn.c
+++ b/src/watchdog/wd_ipc_conn.c
@@ -232,7 +232,7 @@ issue_command_to_watchdog(char type, int timeout_sec, char *data, int data_len,
else
{
/*
- * For non blocking mode if we are sucessful in sending the command
+ * For non blocking mode if we are successful in sending the command
* that means the command is success
*/
result = palloc0(sizeof(WDIPCCmdResult));
diff --git a/src/watchdog/wd_lifecheck.c b/src/watchdog/wd_lifecheck.c
index 1e384d9ed..1f2fd3af3 100644
--- a/src/watchdog/wd_lifecheck.c
+++ b/src/watchdog/wd_lifecheck.c
@@ -357,7 +357,7 @@ fork_lifecheck_child(void)
if (pid == 0)
{
on_exit_reset();
- SetProcessGlobalVaraibles(PT_LIFECHECK);
+ SetProcessGlobalVariables(PT_LIFECHECK);
/* call lifecheck child main */
POOL_SETMASK(&UnBlockSig);
@@ -534,7 +534,7 @@ inform_node_status(LifeCheckNode * node, char *message)
if (json_data == NULL)
return false;
- for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSATION; x++)
+ for (x = 0; x < MAX_SEC_WAIT_FOR_CLUSTER_TRANSACTION; x++)
{
res = issue_command_to_watchdog(WD_NODE_STATUS_CHANGE_COMMAND, 0, json_data, strlen(json_data), false);
if (res)
@@ -690,7 +690,7 @@ is_wd_lifecheck_ready(void)
else
{
ereport(ERROR,
- (errmsg("checking if watchdog is ready, unkown watchdog mode \"%d\"",
+ (errmsg("checking if watchdog is ready, unknown watchdog mode \"%d\"",
pool_config->wd_lifecheck_method)));
}
}
@@ -1020,7 +1020,7 @@ wd_ping_pgpool(LifeCheckNode * node, char* password)
return ping_pgpool(conn);
}
-/* inner function for issueing lifecheck query */
+/* inner function for issuing lifecheck query */
static int
ping_pgpool(PGconn *conn)
{
diff --git a/src/watchdog/wd_ping.c b/src/watchdog/wd_ping.c
index 7d4c72d88..6e758c448 100644
--- a/src/watchdog/wd_ping.c
+++ b/src/watchdog/wd_ping.c
@@ -134,7 +134,7 @@ wd_issue_ping_command(char *hostname, int *outfd)
{
/* CHILD */
on_exit_reset();
- SetProcessGlobalVaraibles(PT_WATCHDOG_UTILITY);
+ SetProcessGlobalVariables(PT_WATCHDOG_UTILITY);
close(STDOUT_FILENO);
dup2(pfd[1], STDOUT_FILENO);
diff --git a/src/watchdog/wd_utils.c b/src/watchdog/wd_utils.c
index 048ef8ddd..d9d8c7153 100644
--- a/src/watchdog/wd_utils.c
+++ b/src/watchdog/wd_utils.c
@@ -212,7 +212,7 @@ wd_calc_hash_error:
/*
* string_replace:
* returns the new palloced string after replacing all
- * occurances of pattern in string with replacement string
+ * occurrences of pattern in string with replacement string
*/
char *
string_replace(const char *string, const char *pattern, const char *replacement)
[parent: 518012e0b8b6]