mirror of
https://github.com/postgres/postgres.git
synced 2025-05-01 01:04:50 +03:00
pg_upgrade: Parallelize postfix operator check.
This commit makes use of the new task framework in pg_upgrade to parallelize the check for user-defined postfix operators. This step will now process multiple databases concurrently when pg_upgrade's --jobs option is provided a value greater than 1. Reviewed-by: Daniel Gustafsson, Ilya Gladyshev Discussion: https://postgr.es/m/20240516211638.GA1688936%40nathanxps13
This commit is contained in:
parent
9db3018cf8
commit
c34eabfbbf
@ -1314,45 +1314,65 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
|
|||||||
check_ok();
|
check_ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Callback function for processing result of query for
|
||||||
|
* check_for_user_defined_postfix_ops()'s UpgradeTask. If the query returned
|
||||||
|
* any rows (i.e., the check failed), write the details to the report file.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
process_user_defined_postfix_ops(DbInfo *dbinfo, PGresult *res, void *arg)
|
||||||
|
{
|
||||||
|
UpgradeTaskReport *report = (UpgradeTaskReport *) arg;
|
||||||
|
int ntups = PQntuples(res);
|
||||||
|
bool db_used = false;
|
||||||
|
int i_oproid = PQfnumber(res, "oproid");
|
||||||
|
int i_oprnsp = PQfnumber(res, "oprnsp");
|
||||||
|
int i_oprname = PQfnumber(res, "oprname");
|
||||||
|
int i_typnsp = PQfnumber(res, "typnsp");
|
||||||
|
int i_typname = PQfnumber(res, "typname");
|
||||||
|
|
||||||
|
AssertVariableIsOfType(&process_user_defined_postfix_ops,
|
||||||
|
UpgradeTaskProcessCB);
|
||||||
|
|
||||||
|
if (!ntups)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (int rowno = 0; rowno < ntups; rowno++)
|
||||||
|
{
|
||||||
|
if (report->file == NULL &&
|
||||||
|
(report->file = fopen_priv(report->path, "w")) == NULL)
|
||||||
|
pg_fatal("could not open file \"%s\": %m", report->path);
|
||||||
|
if (!db_used)
|
||||||
|
{
|
||||||
|
fprintf(report->file, "In database: %s\n", dbinfo->db_name);
|
||||||
|
db_used = true;
|
||||||
|
}
|
||||||
|
fprintf(report->file, " (oid=%s) %s.%s (%s.%s, NONE)\n",
|
||||||
|
PQgetvalue(res, rowno, i_oproid),
|
||||||
|
PQgetvalue(res, rowno, i_oprnsp),
|
||||||
|
PQgetvalue(res, rowno, i_oprname),
|
||||||
|
PQgetvalue(res, rowno, i_typnsp),
|
||||||
|
PQgetvalue(res, rowno, i_typname));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Verify that no user defined postfix operators exist.
|
* Verify that no user defined postfix operators exist.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
check_for_user_defined_postfix_ops(ClusterInfo *cluster)
|
check_for_user_defined_postfix_ops(ClusterInfo *cluster)
|
||||||
{
|
{
|
||||||
int dbnum;
|
UpgradeTaskReport report;
|
||||||
FILE *script = NULL;
|
UpgradeTask *task = upgrade_task_create();
|
||||||
char output_path[MAXPGPATH];
|
const char *query;
|
||||||
|
|
||||||
prep_status("Checking for user-defined postfix operators");
|
|
||||||
|
|
||||||
snprintf(output_path, sizeof(output_path), "%s/%s",
|
|
||||||
log_opts.basedir,
|
|
||||||
"postfix_ops.txt");
|
|
||||||
|
|
||||||
/* Find any user defined postfix operators */
|
|
||||||
for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
|
|
||||||
{
|
|
||||||
PGresult *res;
|
|
||||||
bool db_used = false;
|
|
||||||
int ntups;
|
|
||||||
int rowno;
|
|
||||||
int i_oproid,
|
|
||||||
i_oprnsp,
|
|
||||||
i_oprname,
|
|
||||||
i_typnsp,
|
|
||||||
i_typname;
|
|
||||||
DbInfo *active_db = &cluster->dbarr.dbs[dbnum];
|
|
||||||
PGconn *conn = connectToServer(cluster, active_db->db_name);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The query below hardcodes FirstNormalObjectId as 16384 rather than
|
* The query below hardcodes FirstNormalObjectId as 16384 rather than
|
||||||
* interpolating that C #define into the query because, if that
|
* interpolating that C #define into the query because, if that #define is
|
||||||
* #define is ever changed, the cutoff we want to use is the value
|
* ever changed, the cutoff we want to use is the value used by
|
||||||
* used by pre-version 14 servers, not that of some future version.
|
* pre-version 14 servers, not that of some future version.
|
||||||
*/
|
*/
|
||||||
res = executeQueryOrDie(conn,
|
query = "SELECT o.oid AS oproid, "
|
||||||
"SELECT o.oid AS oproid, "
|
|
||||||
" n.nspname AS oprnsp, "
|
" n.nspname AS oprnsp, "
|
||||||
" o.oprname, "
|
" o.oprname, "
|
||||||
" tn.nspname AS typnsp, "
|
" tn.nspname AS typnsp, "
|
||||||
@ -1365,45 +1385,29 @@ check_for_user_defined_postfix_ops(ClusterInfo *cluster)
|
|||||||
" o.oprleft = t.oid AND "
|
" o.oprleft = t.oid AND "
|
||||||
" t.typnamespace = tn.oid AND "
|
" t.typnamespace = tn.oid AND "
|
||||||
" o.oprright = 0 AND "
|
" o.oprright = 0 AND "
|
||||||
" o.oid >= 16384");
|
" o.oid >= 16384";
|
||||||
ntups = PQntuples(res);
|
|
||||||
i_oproid = PQfnumber(res, "oproid");
|
|
||||||
i_oprnsp = PQfnumber(res, "oprnsp");
|
|
||||||
i_oprname = PQfnumber(res, "oprname");
|
|
||||||
i_typnsp = PQfnumber(res, "typnsp");
|
|
||||||
i_typname = PQfnumber(res, "typname");
|
|
||||||
for (rowno = 0; rowno < ntups; rowno++)
|
|
||||||
{
|
|
||||||
if (script == NULL &&
|
|
||||||
(script = fopen_priv(output_path, "w")) == NULL)
|
|
||||||
pg_fatal("could not open file \"%s\": %m", output_path);
|
|
||||||
if (!db_used)
|
|
||||||
{
|
|
||||||
fprintf(script, "In database: %s\n", active_db->db_name);
|
|
||||||
db_used = true;
|
|
||||||
}
|
|
||||||
fprintf(script, " (oid=%s) %s.%s (%s.%s, NONE)\n",
|
|
||||||
PQgetvalue(res, rowno, i_oproid),
|
|
||||||
PQgetvalue(res, rowno, i_oprnsp),
|
|
||||||
PQgetvalue(res, rowno, i_oprname),
|
|
||||||
PQgetvalue(res, rowno, i_typnsp),
|
|
||||||
PQgetvalue(res, rowno, i_typname));
|
|
||||||
}
|
|
||||||
|
|
||||||
PQclear(res);
|
prep_status("Checking for user-defined postfix operators");
|
||||||
|
|
||||||
PQfinish(conn);
|
report.file = NULL;
|
||||||
}
|
snprintf(report.path, sizeof(report.path), "%s/%s",
|
||||||
|
log_opts.basedir,
|
||||||
|
"postfix_ops.txt");
|
||||||
|
|
||||||
if (script)
|
upgrade_task_add_step(task, query, process_user_defined_postfix_ops,
|
||||||
|
true, &report);
|
||||||
|
upgrade_task_run(task, cluster);
|
||||||
|
upgrade_task_free(task);
|
||||||
|
|
||||||
|
if (report.file)
|
||||||
{
|
{
|
||||||
fclose(script);
|
fclose(report.file);
|
||||||
pg_log(PG_REPORT, "fatal");
|
pg_log(PG_REPORT, "fatal");
|
||||||
pg_fatal("Your installation contains user-defined postfix operators, which are not\n"
|
pg_fatal("Your installation contains user-defined postfix operators, which are not\n"
|
||||||
"supported anymore. Consider dropping the postfix operators and replacing\n"
|
"supported anymore. Consider dropping the postfix operators and replacing\n"
|
||||||
"them with prefix operators or function calls.\n"
|
"them with prefix operators or function calls.\n"
|
||||||
"A list of user-defined postfix operators is in the file:\n"
|
"A list of user-defined postfix operators is in the file:\n"
|
||||||
" %s", output_path);
|
" %s", report.path);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
check_ok();
|
check_ok();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user