Merge pull request #13 from NikolayS/postgres10

Postgres10

Author: NikolayS

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
         environment:
           - PGHOST: 127.0.0.1
           - PGUSER: root
-      - image: circleci/postgres:9.6
+      - image: circleci/postgres:10
         environment:
           - POSTGRES_USER: root
           - POSTGRES_DB: test
@@ -34,5 +34,5 @@ jobs:
             #for f in ~/postgres_dba/sql/*; do psql test -f "$f">/dev/null; done
             #echo "\set postgres_dba_wide false" > ~/.psqlrc
             #for f in ~/postgres_dba/sql/*; do psql test -f "$f">/dev/null; done
-            diff -b test/regression/1_basic.out <(psql test -f ~/postgres_dba/sql/1_basic.sql | grep Role)
-            diff -b test/regression/a1_alignment_padding.out <(psql test -f ~/postgres_dba/sql/a1_alignment_padding.sql | grep align)
+            diff -b test/regression/1_basic.out <(psql test -f warmup.psql -f ~/postgres_dba/sql/1_basic.sql | grep Role)
+            diff -b test/regression/a1_alignment_padding.out <(psql test -f warmup.psql -f ~/postgres_dba/sql/a1_alignment_padding.sql | grep align)

init/generate.sh

@@ -2,16 +2,31 @@
 # Generate start.psql based on the contents of "sql" directory
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+WARMUP="warmup.psql"
 OUT="start.psql"
 
+echo "" > "$WARMUP"
+echo "" > "$OUT"
+
 cd "$DIR/.."
-cat > "$OUT" <<- VersCheck
+cat > "$WARMUP" <<- VersCheck
 -- check if "\if" is supported (psql 10+)
 \if false
   \echo cannot work, you need psql version 10+ (Postgres server can be older)
   select 1/0;
 \endif
 
+select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\\\1')::numeric >= 10 as postgres_dba_pgvers_10plus \gset
+\if :postgres_dba_pgvers_10plus
+  \set postgres_dba_last_wal_receive_lsn pg_last_wal_receive_lsn
+  \set postgres_dba_last_wal_replay_lsn pg_last_wal_replay_lsn
+  \set postgres_dba_is_wal_replay_paused pg_is_wal_replay_paused
+\else
+  \set postgres_dba_last_wal_receive_lsn pg_last_xlog_receive_location
+  \set postgres_dba_last_wal_replay_lsn pg_last_xlog_replay_location
+  \set postgres_dba_is_wal_replay_paused pg_is_xlog_replay_paused
+\endif
+
 -- TODO: improve work with custom GUCs for Postgres 9.5 and older
 select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\\\1')::numeric >= 9.6 as postgres_dba_pgvers_96plus \gset
 \if :postgres_dba_pgvers_96plus
@@ -22,6 +37,9 @@ select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\\\1')::numeric
   reset client_min_messages;
 \endif
 VersCheck
+
+echo "\\i $WARMUP" >> "$OUT"
+
 echo "\\echo '\\033[1;35mMenu:\\033[0m'" >> "$OUT"
 for f in ./sql/*.sql
 do

sql/1_basic.sql

@@ -11,10 +11,10 @@ select
   case
     when pg_is_in_recovery()  then 'Replica' || ' (delay: '
       || ((((case
-          when pg_last_xlog_receive_location() = pg_last_xlog_replay_location() then 0
+          when :postgres_dba_last_wal_receive_lsn() = :postgres_dba_last_wal_replay_lsn() then 0
           else extract (epoch from now() - pg_last_xact_replay_timestamp())
         end)::int)::text || ' second')::interval)::text
-      || '; paused: ' || pg_is_xlog_replay_paused()::text || ')'
+      || '; paused: ' || :postgres_dba_is_wal_replay_paused()::text || ')'
     else 'Master'
   end as value
 union all

start.psql

@@ -1,18 +1,5 @@
--- check if "\if" is supported (psql 10+)
-\if false
-  \echo cannot work, you need psql version 10+ (Postgres server can be older)
-  select 1/0;
-\endif
 
--- TODO: improve work with custom GUCs for Postgres 9.5 and older
-select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\1')::numeric >= 9.6 as postgres_dba_pgvers_96plus \gset
-\if :postgres_dba_pgvers_96plus
-  select coalesce(current_setting('postgres_dba.wide', true), 'off') = 'on' as postgres_dba_wide \gset
-\else
-  set client_min_messages to 'fatal';
-  select :postgres_dba_wide as postgres_dba_wide \gset
-  reset client_min_messages;
-\endif
+\i warmup.psql
 \echo '\033[1;35mMenu:\033[0m'
 \echo '   1 – Node Information: master/replica, lag, DB size, tmp files, etc'
 \echo '   2 – Table Size'

warmup.psql

@@ -0,0 +1,26 @@
+-- check if "\if" is supported (psql 10+)
+\if false
+  \echo cannot work, you need psql version 10+ (Postgres server can be older)
+  select 1/0;
+\endif
+
+select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\1')::numeric >= 10 as postgres_dba_pgvers_10plus \gset
+\if :postgres_dba_pgvers_10plus
+  \set postgres_dba_last_wal_receive_lsn pg_last_wal_receive_lsn
+  \set postgres_dba_last_wal_replay_lsn pg_last_wal_replay_lsn
+  \set postgres_dba_is_wal_replay_paused pg_is_wal_replay_paused
+\else
+  \set postgres_dba_last_wal_receive_lsn pg_last_xlog_receive_location
+  \set postgres_dba_last_wal_replay_lsn pg_last_xlog_replay_location
+  \set postgres_dba_is_wal_replay_paused pg_is_xlog_replay_paused
+\endif
+
+-- TODO: improve work with custom GUCs for Postgres 9.5 and older
+select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\1')::numeric >= 9.6 as postgres_dba_pgvers_96plus \gset
+\if :postgres_dba_pgvers_96plus
+  select coalesce(current_setting('postgres_dba.wide', true), 'off') = 'on' as postgres_dba_wide \gset
+\else
+  set client_min_messages to 'fatal';
+  select :postgres_dba_wide as postgres_dba_wide \gset
+  reset client_min_messages;
+\endif