1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 14:00:56 +01:00

Execute project membership materialization as "SELECT" + "INSERT", not "INSERT ... SELECT"

Summary:
Ref T13596. See that task for discussion. Executing "INSERT ... SELECT" at default isolation levels requires more locking than executing "SELECT" + "INSERT" separately.

Decompose this "INSERT ... SELECT" into "SELECT + INSERT", and reformat it to execute a minimal set of changes instead of wiping everything out and then writing all of it back. In most cases, this means we write 1 row instead of `O(number of project members)` rows.

Test Plan:
  - Created a project. Added and removed members, looked at database and saw a consistent membership/materialization list.
  - Created a subproject. Added and removed members, looked at database and saw a consistent membership/materialization list.

I wasn't successful in reproducing the LOCK WAIT issue locally by trying various concurrent SELECT / INSERT / INSERT ... SELECT strategies. It may depend on the "DELETE + INSERT ... SELECT" structure used here, or versions/config/etc, so we'll have to see how that fares in production.

Maniphest Tasks: T13596

Differential Revision: https://secure.phabricator.com/D21527
This commit is contained in:
epriestley 2021-01-27 15:14:00 -08:00
parent d6fd365704
commit 9cbbbe2a87

View file

@ -73,27 +73,87 @@ final class PhabricatorProjectsMembershipIndexEngineExtension
$project->openTransaction(); $project->openTransaction();
// Delete any existing materialized member edges. // Copy current member edges to create new materialized edges.
queryfx(
// See T13596. Avoid executing this as an "INSERT ... SELECT" to reduce
// the required level of table locking. Since we're decomposing it into
// "SELECT" + "INSERT" anyway, we can also compute exactly which rows
// need to be modified.
$have_rows = queryfx_all(
$conn_w, $conn_w,
'DELETE FROM %T WHERE src = %s AND type = %s', 'SELECT dst FROM %T
WHERE src = %s AND type = %d',
PhabricatorEdgeConfig::TABLE_NAME_EDGE, PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$project_phid, $project_phid,
$material_type); $material_type);
// Copy current member edges to create new materialized edges. $want_rows = queryfx_all(
queryfx(
$conn_w, $conn_w,
'INSERT IGNORE INTO %T (src, type, dst, dateCreated, seq) 'SELECT dst, dateCreated, seq FROM %T
SELECT %s, %d, dst, dateCreated, seq FROM %T
WHERE src IN (%Ls) AND type = %d', WHERE src IN (%Ls) AND type = %d',
PhabricatorEdgeConfig::TABLE_NAME_EDGE, PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$project_phid,
$material_type,
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$source_phids, $source_phids,
$member_type); $member_type);
$have_phids = ipull($have_rows, 'dst', 'dst');
$want_phids = ipull($want_rows, null, 'dst');
$rem_phids = array_diff_key($have_phids, $want_phids);
$rem_phids = array_keys($rem_phids);
$add_phids = array_diff_key($want_phids, $have_phids);
$add_phids = array_keys($add_phids);
$rem_sql = array();
foreach ($rem_phids as $rem_phid) {
$rem_sql[] = qsprintf(
$conn_w,
'%s',
$rem_phid);
}
$add_sql = array();
foreach ($add_phids as $add_phid) {
$add_row = $want_phids[$add_phid];
$add_sql[] = qsprintf(
$conn_w,
'(%s, %d, %s, %d, %d)',
$project_phid,
$material_type,
$add_row['dst'],
$add_row['dateCreated'],
$add_row['seq']);
}
// Remove materialized members who are no longer project members.
if ($rem_sql) {
foreach (PhabricatorLiskDAO::chunkSQL($rem_sql) as $sql_chunk) {
queryfx(
$conn_w,
'DELETE FROM %T
WHERE src = %s AND type = %s AND dst IN (%LQ)',
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$project_phid,
$material_type,
$sql_chunk);
}
}
// Add project members who are not yet materialized members.
if ($add_sql) {
foreach (PhabricatorLiskDAO::chunkSQL($add_sql) as $sql_chunk) {
queryfx(
$conn_w,
'INSERT IGNORE INTO %T (src, type, dst, dateCreated, seq)
VALUES %LQ',
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$sql_chunk);
}
}
// Update the hasSubprojects flag. // Update the hasSubprojects flag.
queryfx( queryfx(
$conn_w, $conn_w,