open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce risks of conflicts in internal queries of REFRESH MATVIEW CONCURRENTLY

Browse Source 
The internal SQL queries used by REFRESH MATERIALIZED VIEW CONCURRENTLY
include some aliases for its diff and temporary relations with
rather-generic names: diff, newdata, newdata2 and mv.  Depending on the
queries used for the materialized view, using CONCURRENTLY could lead to
some internal failures if the query and those internal aliases conflict.

Those names have been chosen in 841c29c8.  This commit switches instead
to a naming pattern which is less likely going to cause conflicts, based
on an idea from Thomas Munro, by appending _$ to those aliases.  This is
not perfect as those new names could still conflict, but at least it has
the advantage to keep the code readable and simple while reducing the
likelihood of conflicts to be close to zero.

Reported-by: Mathis Rudolf
Author: Bharath Rupireddy
Reviewed-by: Bernd Helmle, Thomas Munro, Michael Paquier
Discussion: https://postgr.es/m/109c267a-10d2-3c53-b60e-720fcf44d9e8@credativ.de
Backpatch-through: 9.6
pull/71/head
Michael Paquier 4 years ago
parent 9d66067054
commit 75d66d10e0
1 changed files with 18 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      src/backend/commands/matview.c

36
src/backend/commands/matview.c
Unescape View File

@ -618,12 +618,12 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
*/ */
resetStringInfo(&querybuf); resetStringInfo(&querybuf);
appendStringInfo(&querybuf, appendStringInfo(&querybuf,
"SELECT newdata FROM %s newdata " "SELECT _$newdata FROM %s _$newdata "
"WHERE newdata IS NOT NULL AND EXISTS " "WHERE _$newdata IS NOT NULL AND EXISTS "
"(SELECT 1 FROM %s newdata2 WHERE newdata2 IS NOT NULL " "(SELECT 1 FROM %s _$newdata2 WHERE _$newdata2 IS NOT NULL "
"AND newdata2 OPERATOR(pg_catalog.*=) newdata " "AND _$newdata2 OPERATOR(pg_catalog.*=) _$newdata "
"AND newdata2.ctid OPERATOR(pg_catalog.<>) " "AND _$newdata2.ctid OPERATOR(pg_catalog.<>) "
"newdata.ctid)", "_$newdata.ctid)",
tempname, tempname); tempname, tempname);
if (SPI_execute(querybuf.data, false, 1) != SPI_OK_SELECT) if (SPI_execute(querybuf.data, false, 1) != SPI_OK_SELECT)
elog(ERROR, "SPI_exec failed: %s", querybuf.data); elog(ERROR, "SPI_exec failed: %s", querybuf.data);
@ -651,8 +651,8 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
resetStringInfo(&querybuf); resetStringInfo(&querybuf);
appendStringInfo(&querybuf, appendStringInfo(&querybuf,
"CREATE TEMP TABLE %s AS " "CREATE TEMP TABLE %s AS "
"SELECT mv.ctid AS tid, newdata " "SELECT _$mv.ctid AS tid, _$newdata "
"FROM %s mv FULL JOIN %s newdata ON (", "FROM %s _$mv FULL JOIN %s _$newdata ON (",
diffname, matviewname, tempname); diffname, matviewname, tempname);
/* /*
@ -745,9 +745,9 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
if (foundUniqueIndex) if (foundUniqueIndex)
appendStringInfoString(&querybuf, " AND "); appendStringInfoString(&querybuf, " AND ");
leftop = quote_qualified_identifier("newdata", leftop = quote_qualified_identifier("_$newdata",
NameStr(attr->attname)); NameStr(attr->attname));
rightop = quote_qualified_identifier("mv", rightop = quote_qualified_identifier("_$mv",
NameStr(attr->attname)); NameStr(attr->attname));
generate_operator_clause(&querybuf, generate_operator_clause(&querybuf,
@ -775,8 +775,8 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
Assert(foundUniqueIndex); Assert(foundUniqueIndex);
appendStringInfoString(&querybuf, appendStringInfoString(&querybuf,
" AND newdata OPERATOR(pg_catalog.*=) mv) " " AND _$newdata OPERATOR(pg_catalog.*=) _$mv) "
"WHERE newdata IS NULL OR mv IS NULL " "WHERE _$newdata IS NULL OR _$mv IS NULL "
"ORDER BY tid"); "ORDER BY tid");
/* Create the temporary "diff" table. */ /* Create the temporary "diff" table. */
@ -802,10 +802,10 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
/* Deletes must come before inserts; do them first. */ /* Deletes must come before inserts; do them first. */
resetStringInfo(&querybuf); resetStringInfo(&querybuf);
appendStringInfo(&querybuf, appendStringInfo(&querybuf,
"DELETE FROM %s mv WHERE ctid OPERATOR(pg_catalog.=) ANY " "DELETE FROM %s _$mv WHERE ctid OPERATOR(pg_catalog.=) ANY "
"(SELECT diff.tid FROM %s diff " "(SELECT _$diff.tid FROM %s _$diff "
"WHERE diff.tid IS NOT NULL " "WHERE _$diff.tid IS NOT NULL "
"AND diff.newdata IS NULL)", "AND _$diff._$newdata IS NULL)",
matviewname, diffname); matviewname, diffname);
if (SPI_exec(querybuf.data, 0) != SPI_OK_DELETE) if (SPI_exec(querybuf.data, 0) != SPI_OK_DELETE)
elog(ERROR, "SPI_exec failed: %s", querybuf.data); elog(ERROR, "SPI_exec failed: %s", querybuf.data);
@ -813,8 +813,8 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
/* Inserts go last. */ /* Inserts go last. */
resetStringInfo(&querybuf); resetStringInfo(&querybuf);
appendStringInfo(&querybuf, appendStringInfo(&querybuf,
"INSERT INTO %s SELECT (diff.newdata).* " "INSERT INTO %s SELECT (_$diff._$newdata).* "
"FROM %s diff WHERE tid IS NULL", "FROM %s _$diff WHERE tid IS NULL",
matviewname, diffname); matviewname, diffname);
if (SPI_exec(querybuf.data, 0) != SPI_OK_INSERT) if (SPI_exec(querybuf.data, 0) != SPI_OK_INSERT)
elog(ERROR, "SPI_exec failed: %s", querybuf.data); elog(ERROR, "SPI_exec failed: %s", querybuf.data);

Write Preview
Loading…
Cancel
Save