[pgpool-committers: 7150] pgpool: Apply language cleanup mega patch.
Tatsuo Ishii
ishii at sraoss.co.jp
Thu Sep 17 19:02:09 JST 2020
Apply language cleanup mega patch.
black/white_function_list -> write_function_list, read_only_function_list
black_query_pattern -> primay_routing_query_pattern
black/white_memqcache_table_list -> cache_unsafe/cache_safe_table_list
Watchdog: replace master to 'leader' for 'master' watchdog nodes
ALWAYS_MASTER flag is changed to ALWAYS_PRIMARY.
Replace relcache_query_target option 'master' to 'primary'.
Replace Master Node with Main node ( node id with 0 or youngest live ).
Replace follow_master with follow_primary with parameters.
Replace some remaining occurrences of master with primary/main/leader
Patch contributed by: Umar Hayat
Reviewed by me:
Branch
------
master
Details
-------
https://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=9e366c14e75aedfa3357e71800d6e3ac9847a39a
Modified Files
--------------
doc.ja/src/sgml/advanced.sgml | 16 +-
doc.ja/src/sgml/connection-pooling.sgml | 2 +-
doc.ja/src/sgml/connection-settings.sgml | 22 +-
doc.ja/src/sgml/example-AWS.sgml | 22 +-
doc.ja/src/sgml/example-Aurora.sgml | 10 +-
doc.ja/src/sgml/example-cluster.sgml | 20 +-
doc.ja/src/sgml/example-watchdog.sgml | 10 +-
doc.ja/src/sgml/failover.sgml | 102 ++---
doc.ja/src/sgml/healthcheck.sgml | 4 +-
doc.ja/src/sgml/intro.sgml | 2 +-
doc.ja/src/sgml/loadbalance.sgml | 126 +++---
doc.ja/src/sgml/memcache.sgml | 38 +-
doc.ja/src/sgml/misc-config.sgml | 8 +-
doc.ja/src/sgml/online-recovery.sgml | 30 +-
doc.ja/src/sgml/ref/pcp_promote_node.sgml | 18 +-
doc.ja/src/sgml/ref/pcp_watchdog_info.sgml | 12 +-
doc.ja/src/sgml/ref/pgpool_setup.sgml | 2 +-
doc.ja/src/sgml/ref/pgpool_show.sgml | 8 +-
.../src/sgml/ref/show_pool_health_check_stats.sgml | 2 +-
doc.ja/src/sgml/ref/watchdog_setup.sgml | 12 +-
doc.ja/src/sgml/release-3.4.sgml | 4 +-
doc.ja/src/sgml/release-3.5.sgml | 4 +-
doc.ja/src/sgml/release-3.6.sgml | 14 +-
doc.ja/src/sgml/release-3.7.sgml | 8 +-
doc.ja/src/sgml/release-4.0.sgml | 16 +-
doc.ja/src/sgml/release-4.1.sgml | 10 +-
doc.ja/src/sgml/release-4.2.sgml | 22 +-
doc.ja/src/sgml/restrictions.sgml | 12 +-
doc.ja/src/sgml/runtime.sgml | 12 +-
doc.ja/src/sgml/start.sgml | 32 +-
doc.ja/src/sgml/stream-check.sgml | 4 +-
doc.ja/src/sgml/watchdog.sgml | 28 +-
doc/src/sgml/advanced.sgml | 16 +-
doc/src/sgml/connection-pooling.sgml | 2 +-
doc/src/sgml/connection-settings.sgml | 26 +-
doc/src/sgml/example-AWS.sgml | 14 +-
doc/src/sgml/example-Aurora.sgml | 4 +-
doc/src/sgml/example-cluster.sgml | 22 +-
doc/src/sgml/example-watchdog.sgml | 10 +-
doc/src/sgml/failover.sgml | 60 +--
doc/src/sgml/healthcheck.sgml | 2 +-
doc/src/sgml/installation.sgml | 10 +-
doc/src/sgml/intro.sgml | 2 +-
doc/src/sgml/loadbalance.sgml | 96 ++---
doc/src/sgml/memcache.sgml | 28 +-
doc/src/sgml/misc-config.sgml | 16 +-
doc/src/sgml/online-recovery.sgml | 18 +-
doc/src/sgml/ref/pcp_promote_node.sgml | 14 +-
doc/src/sgml/ref/pcp_watchdog_info.sgml | 12 +-
doc/src/sgml/ref/pgpool_setup.sgml | 2 +-
doc/src/sgml/ref/pgpool_show.sgml | 6 +-
doc/src/sgml/ref/show_pool_health_check_stats.sgml | 2 +-
doc/src/sgml/ref/watchdog_setup.sgml | 12 +-
doc/src/sgml/release-3.4.sgml | 2 +-
doc/src/sgml/release-3.5.sgml | 2 +-
doc/src/sgml/release-3.6.sgml | 4 +-
doc/src/sgml/release-3.7.sgml | 4 +-
doc/src/sgml/release-4.0.sgml | 8 +-
doc/src/sgml/release-4.1.sgml | 6 +-
doc/src/sgml/release-4.2.sgml | 16 +-
doc/src/sgml/restrictions.sgml | 12 +-
doc/src/sgml/runtime.sgml | 12 +-
doc/src/sgml/start.sgml | 32 +-
doc/src/sgml/watchdog.sgml | 38 +-
src/Makefile.am | 4 +-
src/Makefile.in | 4 +-
src/auth/pool_auth.c | 52 +--
src/config/pool_config.c | 32 +-
src/config/pool_config.l | 32 +-
src/config/pool_config_variables.c | 92 ++--
src/context/pool_query_context.c | 178 ++++----
src/context/pool_session_context.c | 32 +-
src/include/context/pool_query_context.h | 2 +-
src/include/context/pool_session_context.h | 14 +-
src/include/pcp/libpcp_ext.h | 4 +-
src/include/pcp/pcp.h | 4 +-
src/include/pool.h | 30 +-
src/include/pool_config.h | 60 +--
src/include/pool_config_variables.h | 2 +-
src/include/protocol/pool_proto_modules.h | 4 +-
src/include/query_cache/pool_memqcache.h | 4 +-
src/include/watchdog/watchdog.h | 2 +-
src/include/watchdog/wd_internal_commands.h | 2 +-
src/include/watchdog/wd_ipc_defines.h | 6 +-
src/include/watchdog/wd_json_data.h | 2 +-
src/libs/pcp/pcp.c | 12 +-
src/main/pgpool_main.c | 148 +++----
src/main/pool_internal_comms.c | 2 +-
src/pcp_con/pcp_worker.c | 6 +-
src/pcp_con/recovery.c | 14 +-
src/pgpool.spec | 2 +-
src/protocol/CommandComplete.c | 20 +-
src/protocol/child.c | 32 +-
src/protocol/pool_connection_pool.c | 76 ++--
src/protocol/pool_pg_utils.c | 10 +-
src/protocol/pool_process_query.c | 210 ++++-----
src/protocol/pool_proto2.c | 84 ++--
src/protocol/pool_proto_modules.c | 240 +++++------
src/query_cache/pool_memqcache.c | 30 +-
src/rewrite/pool_lobj.c | 12 +-
src/rewrite/pool_timestamp.c | 6 +-
src/sample/pgpool.conf.sample-logical | 60 +--
src/sample/pgpool.conf.sample-raw | 62 +--
src/sample/pgpool.conf.sample-replication | 60 +--
src/sample/pgpool.conf.sample-slony | 62 +--
src/sample/pgpool.conf.sample-snapshot | 60 +--
src/sample/pgpool.conf.sample-stream | 62 +--
src/sample/pgpool_recovery | 2 +-
src/sample/scripts/failover.sh.sample | 38 +-
src/sample/scripts/follow_primary.sh.sample | 171 ++++++++
src/sample/scripts/recovery_2nd_stage.sample | 2 +-
.../dml-adaptive-test/extended-query-test/test.sh | 2 +-
.../dml-adaptive-test/simple-query-test/test.sh | 2 +-
...disable-load-balance-always-black-function.data | 4 +-
...isable-load-balance-default-black-function.data | 4 +-
.../disable-load-balance-off-black-function.data | 4 +-
...disable-load-balance-simple-black-function.data | 4 +-
.../disable-load-balance-trans-black-function.data | 4 +-
.../tests/disable-load-balance-white-function.data | 2 +-
src/test/pgpool_setup.in | 94 ++--
src/test/regression/clean.sh | 12 +-
src/test/regression/libs.sh | 4 +-
src/test/regression/tests/001.load_balance/test.sh | 56 +--
.../tests/003.failover/create_expected.sql | 4 +-
.../tests/003.failover/create_expected_node0.sql | 4 +-
src/test/regression/tests/004.watchdog/.gitignore | 2 +-
src/test/regression/tests/004.watchdog/leader.conf | 18 +
src/test/regression/tests/004.watchdog/test.sh | 42 +-
.../tests/005.jdbc/CreateTempTableTest.java | 2 +-
src/test/regression/tests/006.memqcache/test.sh | 20 +-
.../tests/010.rewrite_timestamp/timestamp/main.c | 4 +-
.../tests/011.watchdog_quorum_failover/.gitignore | 2 +-
.../tests/011.watchdog_quorum_failover/leader.conf | 21 +
.../tests/011.watchdog_quorum_failover/test.sh | 56 +--
.../.gitignore | 2 +-
.../leader.conf | 25 ++
.../test.sh | 48 +--
.../.gitignore | 2 +-
.../leader.conf | 25 ++
.../test.sh | 46 +-
.../014.watchdog_test_quorum_bypass/.gitignore | 2 +-
.../014.watchdog_test_quorum_bypass/leader.conf | 25 ++
.../tests/014.watchdog_test_quorum_bypass/test.sh | 28 +-
.../.gitignore | 2 +-
.../leader.conf | 25 ++
.../015.watchdog_master_and_backend_fail/test.sh | 52 +--
.../tests/016.node_0_is_not_primary/test.sh | 8 +-
src/test/regression/tests/051.bug60/bug.sql | 4 +-
src/test/regression/tests/067.bug231/test.sh | 2 +-
.../tests/071.execute_and_deallocate/test.sh | 2 +-
src/tools/pcp/pcp_frontend_client.c | 16 +-
src/utils/pool_process_reporting.c | 82 ++--
src/utils/pool_relcache.c | 4 +-
src/utils/pool_select_walker.c | 58 +--
src/utils/pool_stream.c | 6 +-
src/utils/ps_status.c | 4 +-
src/watchdog/watchdog.c | 476 ++++++++++-----------
src/watchdog/wd_internal_commands.c | 18 +-
src/watchdog/wd_json_data.c | 8 +-
159 files changed, 2417 insertions(+), 2107 deletions(-)
More information about the pgpool-committers
mailing list