database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

vacuumdb: Skip temporary tables in query to build list of relations

Browse Source 
Running vacuumdb with a non-superuser while another user has created a
temporary table would lead to a mid-flight permission failure,
interrupting the operation.  vacuum_rel() skips temporary relations of
other backends, and it makes no sense for vacuumdb to know about these
relations, so let's switch it to ignore temporary relations entirely.

Adding a qual in the query based on relpersistence simplifies the
generation of its WHERE clause in vacuum_one_database(), per se the
removal of "has_where".

Author: VaibhaveS, Michael Paquier
Reviewed-by: Fujii Masao
Discussion: https://postgr.es/m/CAM_eQjwfAR=y3G1fGyS1U9FTmc+FyJm9amNfY2QCZBnDDbNPZg@mail.gmail.com
Backpatch-through: 12
This commit is contained in:
Michael Paquier
2024-09-25 14:44:53 +09:00
parent 90f5412a9a
commit 1ea4d9c001
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/bin/scripts/vacuumdb.c
View File

@@ -501,7 +501,6 @@ vacuum_one_database(ConnParams *cparams,
int ntups; int ntups;
bool failed = false; bool failed = false;
bool objects_listed = false; bool objects_listed = false;
bool has_where = false;
const char *initcmd; const char *initcmd;
const char *stage_commands[] = { const char *stage_commands[] = {
"SET default_statistics_target=1; SET vacuum_cost_delay=0;", "SET default_statistics_target=1; SET vacuum_cost_delay=0;",
@@ -675,7 +674,10 @@ vacuum_one_database(ConnParams *cparams,
" LEFT JOIN pg_catalog.pg_class t" " LEFT JOIN pg_catalog.pg_class t"
" ON c.reltoastrelid OPERATOR(pg_catalog.=) t.oid\n"); " ON c.reltoastrelid OPERATOR(pg_catalog.=) t.oid\n");
/* Used to match the tables or schemas listed by the user */ /*
* Used to match the tables or schemas listed by the user, completing the
* JOIN clause.
*/
if (objects_listed) if (objects_listed)
{ {
appendPQExpBufferStr(&catalog_query, " LEFT JOIN listed_objects" appendPQExpBufferStr(&catalog_query, " LEFT JOIN listed_objects"
@@ -686,14 +688,26 @@ vacuum_one_database(ConnParams *cparams,
appendPQExpBufferStr(&catalog_query, "c.oid\n"); appendPQExpBufferStr(&catalog_query, "c.oid\n");
else else
appendPQExpBufferStr(&catalog_query, "ns.oid\n"); appendPQExpBufferStr(&catalog_query, "ns.oid\n");
}
/*
* Exclude temporary tables, beginning the WHERE clause.
*/
appendPQExpBufferStr(&catalog_query,
" WHERE c.relpersistence != " CppAsString2(RELPERSISTENCE_TEMP));
/*
* Used to match the tables or schemas listed by the user, for the WHERE
* clause.
*/
if (objects_listed)
{
if (objfilter & OBJFILTER_SCHEMA_EXCLUDE) if (objfilter & OBJFILTER_SCHEMA_EXCLUDE)
appendPQExpBuffer(&catalog_query, appendPQExpBuffer(&catalog_query,
" WHERE listed_objects.object_oid IS NULL\n"); " AND listed_objects.object_oid IS NULL\n");
else else
appendPQExpBuffer(&catalog_query, appendPQExpBuffer(&catalog_query,
" WHERE listed_objects.object_oid IS NOT NULL\n"); " AND listed_objects.object_oid IS NOT NULL\n");
has_where = true;
} }
/* /*
@@ -705,11 +719,9 @@ vacuum_one_database(ConnParams *cparams,
if ((objfilter & OBJFILTER_TABLE) == 0) if ((objfilter & OBJFILTER_TABLE) == 0)
{ {
appendPQExpBuffer(&catalog_query, appendPQExpBuffer(&catalog_query,
" %s c.relkind OPERATOR(pg_catalog.=) ANY (array[" " AND c.relkind OPERATOR(pg_catalog.=) ANY (array["
CppAsString2(RELKIND_RELATION) ", " CppAsString2(RELKIND_RELATION) ", "
CppAsString2(RELKIND_MATVIEW) "])\n", CppAsString2(RELKIND_MATVIEW) "])\n");
has_where ? "AND" : "WHERE");
has_where = true;
} }
/* /*
@@ -722,25 +734,23 @@ vacuum_one_database(ConnParams *cparams,
if (vacopts->min_xid_age != 0) if (vacopts->min_xid_age != 0)
{ {
appendPQExpBuffer(&catalog_query, appendPQExpBuffer(&catalog_query,
" %s GREATEST(pg_catalog.age(c.relfrozenxid)," " AND GREATEST(pg_catalog.age(c.relfrozenxid),"
" pg_catalog.age(t.relfrozenxid)) " " pg_catalog.age(t.relfrozenxid)) "
" OPERATOR(pg_catalog.>=) '%d'::pg_catalog.int4\n" " OPERATOR(pg_catalog.>=) '%d'::pg_catalog.int4\n"
" AND c.relfrozenxid OPERATOR(pg_catalog.!=)" " AND c.relfrozenxid OPERATOR(pg_catalog.!=)"
" '0'::pg_catalog.xid\n", " '0'::pg_catalog.xid\n",
has_where ? "AND" : "WHERE", vacopts->min_xid_age); vacopts->min_xid_age);
has_where = true;
} }
if (vacopts->min_mxid_age != 0) if (vacopts->min_mxid_age != 0)
{ {
appendPQExpBuffer(&catalog_query, appendPQExpBuffer(&catalog_query,
" %s GREATEST(pg_catalog.mxid_age(c.relminmxid)," " AND GREATEST(pg_catalog.mxid_age(c.relminmxid),"
" pg_catalog.mxid_age(t.relminmxid)) OPERATOR(pg_catalog.>=)" " pg_catalog.mxid_age(t.relminmxid)) OPERATOR(pg_catalog.>=)"
" '%d'::pg_catalog.int4\n" " '%d'::pg_catalog.int4\n"
" AND c.relminmxid OPERATOR(pg_catalog.!=)" " AND c.relminmxid OPERATOR(pg_catalog.!=)"
" '0'::pg_catalog.xid\n", " '0'::pg_catalog.xid\n",
has_where ? "AND" : "WHERE", vacopts->min_mxid_age); vacopts->min_mxid_age);
has_where = true;
} }
/* /*