From b6800bdb2779ac22bf6c37169dad28d9e04c5a16 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 31 May 2016 21:33:01 +0200 Subject: [PATCH] Keep using pg_relation_size on 8.4 and earlier pg_indexes_size doesn't exist either on 8.4, but that action is new, so let's not care for now. Also fix t/05_docs.t for the newly added actions. --- check_postgres.pl | 9 ++++++--- t/05_docs.t | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/check_postgres.pl b/check_postgres.pl index 01fcdfcf8..77aa39ae7 100755 --- a/check_postgres.pl +++ b/check_postgres.pl @@ -6321,7 +6321,10 @@ WHERE relkind IN (%2$s) $SQL .= $USERWHERECLAUSE; } - my $info = run_command($SQL, {emptyok => 1}); + my $SQL8 = $SQL; + $SQL8 =~ s/pg_table_size/pg_relation_size/g; # 8.4 and earlier + + my $info = run_command($SQL, {emptyok => 1, version => [ "<9.0 $SQL8" ] }); my $found = 0; for $db (@{$info->{db}}) { @@ -10157,8 +10160,8 @@ Items not specifically attributed are by GSM (Greg Sabino Mullane). =item B Released ???? - Change table_size to use pg_table_size(), i.e. to include the TOAST table - size in the numbers reported. Add new actions indexes_size and + Change table_size to use pg_table_size() on 9.0+, i.e. include the TOAST + table size in the numbers reported. Add new actions indexes_size and total_relation_size, using the respective pg_indexes_size() and pg_total_relation_size() functions. All size checks will now also check materialized views where applicable. diff --git a/t/05_docs.t b/t/05_docs.t index 7c7541a3f..7ef94999d 100644 --- a/t/05_docs.t +++ b/t/05_docs.t @@ -38,6 +38,7 @@ for my $action (@actions) { next if $action =~ /last_auto/; my $match = $action; + $match = 'relation_size' if $match =~ /^(index|table|indexes|total_relation)_size/; $match = 'pgb_pool' if $match =~ /pgb_pool/; if ($slurp !~ /\n\s*sub check_$match/) { -- 2.30.2