Page MenuHomestyx hydra
Files F1495

No OneTemporary
Actions

View Options

diff --git a/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
index 5acfaf913a..91b150ce92 100644
--- a/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
+++ b/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
@@ -1,116 +1,176 @@
<?php
final class PhabricatorProjectsMembershipIndexEngineExtension
extends PhabricatorIndexEngineExtension {
const EXTENSIONKEY = 'project.members';
public function getExtensionName() {
return pht('Project Members');
}
public function shouldIndexObject($object) {
if (!($object instanceof PhabricatorProject)) {
return false;
}
return true;
}
public function indexObject(
PhabricatorIndexEngine $engine,
$object) {
$this->rematerialize($object);
}
public function rematerialize(PhabricatorProject $project) {
$materialize = $project->getAncestorProjects();
array_unshift($materialize, $project);
foreach ($materialize as $project) {
$this->materializeProject($project);
}
}
private function materializeProject(PhabricatorProject $project) {
$material_type = PhabricatorProjectMaterializedMemberEdgeType::EDGECONST;
$member_type = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
$project_phid = $project->getPHID();
if ($project->isMilestone()) {
$source_phids = array($project->getParentProjectPHID());
$has_subprojects = false;
} else {
$descendants = id(new PhabricatorProjectQuery())
->setViewer($this->getViewer())
->withAncestorProjectPHIDs(array($project->getPHID()))
->withIsMilestone(false)
->withHasSubprojects(false)
->execute();
$descendant_phids = mpull($descendants, 'getPHID');
if ($descendant_phids) {
$source_phids = $descendant_phids;
$has_subprojects = true;
} else {
$source_phids = array($project->getPHID());
$has_subprojects = false;
}
}
$conn_w = $project->establishConnection('w');
$any_milestone = queryfx_one(
$conn_w,
'SELECT id FROM %T
WHERE parentProjectPHID = %s AND milestoneNumber IS NOT NULL
LIMIT 1',
$project->getTableName(),
$project_phid);
$has_milestones = (bool)$any_milestone;
$project->openTransaction();
- // Delete any existing materialized member edges.
- queryfx(
+ // Copy current member edges to create new materialized edges.
+
+ // 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,
- 'DELETE FROM %T WHERE src = %s AND type = %s',
+ 'SELECT dst FROM %T
+ WHERE src = %s AND type = %d',
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$project_phid,
$material_type);
- // Copy current member edges to create new materialized edges.
- queryfx(
+ $want_rows = queryfx_all(
$conn_w,
- 'INSERT IGNORE INTO %T (src, type, dst, dateCreated, seq)
- SELECT %s, %d, dst, dateCreated, seq FROM %T
+ 'SELECT dst, dateCreated, seq FROM %T
WHERE src IN (%Ls) AND type = %d',
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
- $project_phid,
- $material_type,
- PhabricatorEdgeConfig::TABLE_NAME_EDGE,
$source_phids,
$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.
queryfx(
$conn_w,
'UPDATE %T SET hasSubprojects = %d WHERE id = %d',
$project->getTableName(),
(int)$has_subprojects,
$project->getID());
// Update the hasMilestones flag.
queryfx(
$conn_w,
'UPDATE %T SET hasMilestones = %d WHERE id = %d',
$project->getTableName(),
(int)$has_milestones,
$project->getID());
$project->saveTransaction();
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 26, 10:26 PM (1 d, 15 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1247
Default Alt Text
(5 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)