Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix multiple module support for older pg versions #62

Merged
merged 4 commits into from
Jul 13, 2024
Merged

Fix multiple module support for older pg versions #62

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a42888f
Fix pg11- pg_stat_activity support
rjuju Jul 13, 2024
46bc6e4
Fix pg14- pg_stat_database support
rjuju Jul 13, 2024
2c49539
Fix pg13- pg_replication_slots support
rjuju Jul 13, 2024
62355f4
Fix pg13-- pg_stat_slru query
rjuju Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions powa--5.0.0dev.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4265,8 +4265,10 @@ BEGIN
v_txid, v_current_lsn,
s.active,
s.active_pid, s.xmin AS slot_xmin, s.catalog_xmin,
s.restart_lsn, s.confirmed_flush_lsn, NULL as wal_status,
NULL as safe_wal_size, false AS two_phase, false AS conflicting
s.restart_lsn, s.confirmed_flush_lsn,
NULL::text as wal_status,
NULL::bigint as safe_wal_size,
false AS two_phase, false AS conflicting
FROM (SELECT now() AS now) n
LEFT JOIN pg_catalog.pg_replication_slots AS s ON true;
-- confirmed_flush_lsn added in pg9.6
Expand All @@ -4277,8 +4279,10 @@ BEGIN
v_txid, v_current_lsn,
s.active,
s.active_pid, s.xmin AS slot_xmin, s.catalog_xmin,
s.restart_lsn, s.confirmed_flush_lsn, NULL as wal_status,
NULL as safe_wal_size, false AS two_phase, false AS conflicting
s.restart_lsn, s.confirmed_flush_lsn,
NULL::text as wal_status,
NULL::bigint as safe_wal_size,
false AS two_phase, false AS conflicting
FROM (SELECT now() AS now) n
LEFT JOIN pg_catalog.pg_replication_slots AS s ON true;
-- active_pid added in pg9.5
Expand All @@ -4289,8 +4293,10 @@ BEGIN
v_txid, v_current_lsn,
s.active,
s.active_pid, s.xmin AS slot_xmin, s.catalog_xmin,
s.restart_lsn, NULL AS confirmed_flush_lsn, NULL as wal_status,
NULL as safe_wal_size, false AS two_phase, false AS conflicting
s.restart_lsn, NULL::pg_lsn AS confirmed_flush_lsn,
NULL::text as wal_status,
NULL::bigint as safe_wal_size,
false AS two_phase, false AS conflicting
FROM (SELECT now() AS now) n
LEFT JOIN pg_catalog.pg_replication_slots AS s ON true;
ELSE
Expand All @@ -4299,9 +4305,11 @@ BEGIN
s.slot_type, s.datoid, false AS temporary,
v_txid, v_current_lsn,
s.active,
NULL AS active_pid, s.xmin AS slot_xmin, s.catalog_xmin,
s.restart_lsn, NULL AS confirmed_flush_lsn, NULL as wal_status,
NULL as safe_wal_size, false AS two_phase, false AS conflicting
NULL::int AS active_pid, s.xmin AS slot_xmin, s.catalog_xmin,
s.restart_lsn, NULL::pg_lsn AS confirmed_flush_lsn,
NULL::text as wal_status,
NULL::bigint as safe_wal_size,
false AS two_phase, false AS conflicting
FROM (SELECT now() AS now) n
LEFT JOIN pg_catalog.pg_replication_slots AS s ON true;
END IF;
Expand Down Expand Up @@ -4368,26 +4376,27 @@ BEGIN
s.application_name, s.client_addr, s.backend_start,
s.xact_start,
s.query_start, s.state_change, s.state, s.backend_xid,
s.backend_xmin, NULL AS query_id, s.backend_type
s.backend_xmin, NULL::bigint AS query_id, s.backend_type
FROM pg_catalog.pg_stat_activity AS s;
-- backend_type added in pg10+
ELSIF current_setting('server_version_num')::int >= 100000 THEN
RETURN QUERY SELECT now(),
txid,
s.datid, s.pid, NULL AS leader_pid, s.usesysid,
s.datid, s.pid, NULL::integer AS leader_pid, s.usesysid,
s.application_name, s.client_addr, s.backend_start,
s.xact_start,
s.query_start, s.state_change, s.state, s.backend_xid,
s.backend_xmin, NULL AS query_id, s.backend_type
s.backend_xmin, NULL::bigint AS query_id, s.backend_type
FROM pg_catalog.pg_stat_activity AS s;
ELSE
RETURN QUERY SELECT now(),
txid,
s.datid, s.pid, NULL AS leader_pid, s.usesysid,
s.datid, s.pid, NULL::integer AS leader_pid, s.usesysid,
s.application_name, s.client_addr, s.backend_start,
s.xact_start,
s.query_start, s.state_change, s.state, s.backend_xid,
s.backend_xmin, NULL AS query_id, NULL AS backend_type
s.backend_xmin, NULL::bigint AS query_id,
NULL::text AS backend_type
FROM pg_catalog.pg_stat_activity AS s;
END IF;
ELSE
Expand Down Expand Up @@ -4584,10 +4593,11 @@ BEGIN
s.tup_inserted, s.tup_updated, s.tup_deleted, s.conflicts,
s.temp_files, s.temp_bytes, s.deadlocks, s.checksum_failures,
s.checksum_last_failure, s.blk_read_time, s.blk_write_time,
NULL AS session_time, NULL AS active_time,
NULL AS idle_in_transaction_time,
NULL AS sessions, NULL AS sessions_abandoned,
NULL AS sessions_fatal, NULL AS sessions_killed,
NULL::double precision AS session_time,
NULL::double precision AS active_time,
NULL::double precision AS idle_in_transaction_time,
NULL::bigint AS sessions, NULL::bigint AS sessions_abandoned,
NULL::bigint AS sessions_fatal, NULL::bigint AS sessions_killed,
s.stats_reset
FROM pg_catalog.pg_stat_database AS s;
ELSE
Expand All @@ -4596,11 +4606,13 @@ BEGIN
s.blks_read, s.blks_hit, s.tup_returned, s.tup_fetched,
s.tup_inserted, s.tup_updated, s.tup_deleted, s.conflicts,
s.temp_files, s.temp_bytes, s.deadlocks, 0 AS checksum_failures,
NULL AS checksum_last_failure, s.blk_read_time, s.blk_write_time,
NULL AS session_time, NULL AS active_time,
NULL AS idle_in_transaction_time,
NULL AS sessions, NULL AS sessions_abandoned,
NULL AS sessions_fatal, NULL AS sessions_killed,
NULL::double precision AS checksum_last_failure,
s.blk_read_time, s.blk_write_time,
NULL::double precision AS session_time,
NULL::double precision AS active_time,
NULL::double precision AS idle_in_transaction_time,
NULL::bigint AS sessions, NULL::bigint AS sessions_abandoned,
NULL::bigint AS sessions_fatal, NULL::bigint AS sessions_killed,
s.stats_reset
FROM pg_catalog.pg_stat_database AS s;
END IF;
Expand Down Expand Up @@ -4823,7 +4835,7 @@ BEGIN
0::bigint AS blks_zeroed, 0::bigint AS blks_hit,
0::bigint AS blks_read, 0::bigint AS blks_written,
0::bigint AS blks_exists,
0::bigint AS flushes, 0::bigint as truncates
0::bigint AS flushes, 0::bigint as truncates,
NULL::timestamp with time zone AS stats_reset
WHERE false;
END IF;
Expand Down
Loading