database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Tweak a bit the new TAP tests of REINDEX DATABASE/SYSTEM

Browse Source 
This renames the relation storing the relfilenode state into something
more generic as it also stores data for non-toast relations.  A
restriction on the number of digits used for the OID number when
filtering toast relation names is removed, while on it, as there is no
need for it.

Reported-by: Justin Pryzby
Reviewed-by: Justin Pryzby
Discussion: https://postgr.es/m/20220719022652.GE12702@telsasoft.com
This commit is contained in:
Michael Paquier 2022-07-21 11:00:48 +09:00
parent 171ab95f64
commit 2b99ce10c2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/scripts/t/090_reindexdb.pl
View File

@ -40,7 +40,7 @@ my $toast_index = $node->safe_psql('postgres',
# REINDEX operations. A set of relfilenodes is saved from the catalogs # REINDEX operations. A set of relfilenodes is saved from the catalogs
# and then compared with pg_class. # and then compared with pg_class.
$node->safe_psql('postgres', $node->safe_psql('postgres',
'CREATE TABLE toast_relfilenodes (parent regclass, indname regclass, relfilenode oid);' 'CREATE TABLE index_relfilenodes (parent regclass, indname regclass, relfilenode oid);'
); );
# Save the relfilenode of a set of toast indexes, one from the catalog # Save the relfilenode of a set of toast indexes, one from the catalog
# pg_constraint and one from the test table. # pg_constraint and one from the test table.
@ -58,8 +58,8 @@ my $fetch_index_relfilenodes = qq{SELECT i.indrelid, a.oid, a.relfilenode
JOIN pg_index i ON (i.indexrelid = a.oid) JOIN pg_index i ON (i.indexrelid = a.oid)
WHERE a.relname IN ('pg_constraint_oid_index', 'test1x')}; WHERE a.relname IN ('pg_constraint_oid_index', 'test1x')};
my $save_relfilenodes = my $save_relfilenodes =
"INSERT INTO toast_relfilenodes $fetch_toast_relfilenodes;" "INSERT INTO index_relfilenodes $fetch_toast_relfilenodes;"
. "INSERT INTO toast_relfilenodes $fetch_index_relfilenodes;"; . "INSERT INTO index_relfilenodes $fetch_index_relfilenodes;";
# Query to compare a set of relfilenodes saved with the contents of pg_class. # Query to compare a set of relfilenodes saved with the contents of pg_class.
# Note that this does not join using OIDs, as CONCURRENTLY would change them # Note that this does not join using OIDs, as CONCURRENTLY would change them
@ -68,10 +68,10 @@ my $save_relfilenodes =
# based on the name is enough to ensure a fixed output, where the name of the # based on the name is enough to ensure a fixed output, where the name of the
# parent table is included to provide more context. # parent table is included to provide more context.
my $compare_relfilenodes = qq(SELECT b.parent::regclass, my $compare_relfilenodes = qq(SELECT b.parent::regclass,
regexp_replace(b.indname::text, '(pg_toast.pg_toast_)\\d{4,5}(_index)', '\\1<oid>\\2'), regexp_replace(b.indname::text, '(pg_toast.pg_toast_)\\d+(_index)', '\\1<oid>\\2'),
CASE WHEN a.relfilenode = b.relfilenode THEN 'relfilenode is unchanged' CASE WHEN a.relfilenode = b.relfilenode THEN 'relfilenode is unchanged'
ELSE 'relfilenode has changed' END ELSE 'relfilenode has changed' END
FROM toast_relfilenodes b FROM index_relfilenodes b
JOIN pg_class a ON b.indname::text = a.oid::regclass::text JOIN pg_class a ON b.indname::text = a.oid::regclass::text
ORDER BY b.parent::text, b.indname::text); ORDER BY b.parent::text, b.indname::text);
@ -91,7 +91,7 @@ test1|test1x|relfilenode has changed),
# Re-save and run the second one. # Re-save and run the second one.
$node->safe_psql('postgres', $node->safe_psql('postgres',
"TRUNCATE toast_relfilenodes; $save_relfilenodes"); "TRUNCATE index_relfilenodes; $save_relfilenodes");
$node->issues_sql_like( $node->issues_sql_like(
[ 'reindexdb', '-s', 'postgres' ], [ 'reindexdb', '-s', 'postgres' ],
qr/statement: REINDEX SYSTEM postgres;/, qr/statement: REINDEX SYSTEM postgres;/,