From 806091c96f9b81f7631e4e37a05af377b473b5da Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 9 Feb 2017 15:10:09 -0500 Subject: Remove all references to "xlog" from SQL-callable functions in pg_proc. Commit f82ec32ac30ae7e3ec7c84067192535b2ff8ec0e renamed the pg_xlog directory to pg_wal. To make things consistent, and because "xlog" is terrible terminology for either "transaction log" or "write-ahead log" rename all SQL-callable functions that contain "xlog" in the name to instead contain "wal". (Note that this may pose an upgrade hazard for some users.) Similarly, rename the xlog_position argument of the functions that create slots to be called wal_position. Discussion: https://www.postgresql.org/message-id/CA+Tgmob=YmA=H3DbW1YuOXnFVgBheRmyDkWcD9M8f=5bGWYEoQ@mail.gmail.com --- src/test/modules/commit_ts/t/002_standby.pl | 8 ++++---- src/test/modules/commit_ts/t/003_standby_2.pl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/modules/commit_ts') diff --git a/src/test/modules/commit_ts/t/002_standby.pl b/src/test/modules/commit_ts/t/002_standby.pl index ff600445406..203b75d35bc 100644 --- a/src/test/modules/commit_ts/t/002_standby.pl +++ b/src/test/modules/commit_ts/t/002_standby.pl @@ -31,9 +31,9 @@ my $master_ts = $master->safe_psql('postgres', qq{SELECT ts.* FROM pg_class, pg_xact_commit_timestamp(xmin) AS ts WHERE relname = 't10'} ); my $master_lsn = - $master->safe_psql('postgres', 'select pg_current_xlog_location()'); + $master->safe_psql('postgres', 'select pg_current_wal_location()'); $standby->poll_query_until('postgres', - qq{SELECT '$master_lsn'::pg_lsn <= pg_last_xlog_replay_location()}) + qq{SELECT '$master_lsn'::pg_lsn <= pg_last_wal_replay_location()}) or die "slave never caught up"; my $standby_ts = $standby->safe_psql('postgres', @@ -45,9 +45,9 @@ $master->append_conf('postgresql.conf', 'track_commit_timestamp = off'); $master->restart; $master->safe_psql('postgres', 'checkpoint'); $master_lsn = - $master->safe_psql('postgres', 'select pg_current_xlog_location()'); + $master->safe_psql('postgres', 'select pg_current_wal_location()'); $standby->poll_query_until('postgres', - qq{SELECT '$master_lsn'::pg_lsn <= pg_last_xlog_replay_location()}) + qq{SELECT '$master_lsn'::pg_lsn <= pg_last_wal_replay_location()}) or die "slave never caught up"; $standby->safe_psql('postgres', 'checkpoint'); diff --git a/src/test/modules/commit_ts/t/003_standby_2.pl b/src/test/modules/commit_ts/t/003_standby_2.pl index 1775b22dadf..d7898b83556 100644 --- a/src/test/modules/commit_ts/t/003_standby_2.pl +++ b/src/test/modules/commit_ts/t/003_standby_2.pl @@ -30,9 +30,9 @@ $master->append_conf('postgresql.conf', 'track_commit_timestamp = off'); $master->restart; $master->safe_psql('postgres', 'checkpoint'); my $master_lsn = - $master->safe_psql('postgres', 'select pg_current_xlog_location()'); + $master->safe_psql('postgres', 'select pg_current_wal_location()'); $standby->poll_query_until('postgres', - qq{SELECT '$master_lsn'::pg_lsn <= pg_last_xlog_replay_location()}) + qq{SELECT '$master_lsn'::pg_lsn <= pg_last_wal_replay_location()}) or die "slave never caught up"; $standby->safe_psql('postgres', 'checkpoint'); -- cgit v1.2.3