revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 06:42:42 +01:00
Code Issues Releases Wiki Activity

ManiphestReportController: Separate legacy and synthetic data handling

Browse source 
Summary:
Due to code additions in rPcb957f8d and rPadbd7d4f required due to rPd321cc81, the code intertwines handling legacy data with handling/creating modern data.
Make things more understandable by clearly separating between both (handle one after the other) and by renaming some variables for clarity, so it will become slightly easier in the future to investigate this bottleneck (it is the only code querying the ManiphestTransaction table, leading to timeouts in large Phorge installations).

Also add a specific reference to the corresponding code change in a code comment, instead of a vague "late 2017".
Also, don't use the variable name `$table` for two different things (database vs AphrontTableView) in the same function.

Test Plan: Carefully read the code. Optionally, play with http://phorge.localhost/maniphest/report/burn/ with and without setting a project filter having tasks created in the codebase before 2017-11-22, and compare that the output is still the same.

Reviewers: O1 Blessed Committers, 20after4

Reviewed By: O1 Blessed Committers, 20after4

Subscribers: 20after4, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Differential Revision: https://we.phorge.it/D25828
This commit is contained in:
Andre Klapper 2024-10-21 16:30:18 +02:00
parent 5f4587bb88
commit d643ca4c4c
1 changed files with 60 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
src/applications/maniphest/controller/ManiphestReportController.php
View file

@ -71,6 +71,9 @@ final class ManiphestReportController extends ManiphestController {
} }
/**
* @return array<AphrontListFilterView, PHUIObjectBoxView>
*/
public function renderBurn() { public function renderBurn() {
$request = $this->getRequest(); $request = $this->getRequest();
$viewer = $request->getUser(); $viewer = $request->getUser();
@ -84,11 +87,13 @@ final class ManiphestReportController extends ManiphestController {
$handle = $handles[$project_phid]; $handle = $handles[$project_phid];
} }
$table = new ManiphestTransaction(); $xtable = new ManiphestTransaction();
$conn = $table->establishConnection('r'); $conn = $xtable->establishConnection('r');
// Get legacy data: Querying the task transaction table is only needed for
// code before rPd321cc81 got merged on 2017-11-22.
if ($project_phid) { if ($project_phid) {
$joins = qsprintf( $legacy_joins = qsprintf(
$conn, $conn,
'JOIN %T t ON x.objectPHID = t.phid 'JOIN %T t ON x.objectPHID = t.phid
JOIN %T p ON p.src = t.phid AND p.type = %d AND p.dst = %s', JOIN %T p ON p.src = t.phid AND p.type = %d AND p.dst = %s',
@ -96,59 +101,26 @@ final class ManiphestReportController extends ManiphestController {
PhabricatorEdgeConfig::TABLE_NAME_EDGE, PhabricatorEdgeConfig::TABLE_NAME_EDGE,
PhabricatorProjectObjectHasProjectEdgeType::EDGECONST, PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
$project_phid); $project_phid);
$create_joins = qsprintf(
$conn,
'JOIN %T p ON p.src = t.phid AND p.type = %d AND p.dst = %s',
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
$project_phid);
} else { } else {
$joins = qsprintf($conn, ''); $legacy_joins = qsprintf($conn, '');
$create_joins = qsprintf($conn, '');
} }
$data = queryfx_all( $legacy_data = queryfx_all(
$conn, $conn,
'SELECT x.transactionType, x.oldValue, x.newValue, x.dateCreated 'SELECT x.transactionType, x.oldValue, x.newValue, x.dateCreated
FROM %T x %Q FROM %T x %Q
WHERE transactionType IN (%Ls) WHERE transactionType IN (%Ls)
ORDER BY x.dateCreated ASC', ORDER BY x.dateCreated ASC',
$table->getTableName(), $xtable->getTableName(),
$joins, $legacy_joins,
array( array(
ManiphestTaskStatusTransaction::TRANSACTIONTYPE, ManiphestTaskStatusTransaction::TRANSACTIONTYPE,
ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE, ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE,
)); ));
// See PHI273. After the move to EditEngine, we no longer create a
// "status" transaction if a task is created directly into the default
// status. This likely impacted API/email tasks after 2016 and all other
// tasks after late 2017. Until Facts can fix this properly, use the
// task creation dates to generate synthetic transactions which look like
// the older transactions that this page expects.
$default_status = ManiphestTaskStatus::getDefaultStatus();
$duplicate_status = ManiphestTaskStatus::getDuplicateStatus();
// Build synthetic transactions which take status from `null` to the
// default value.
$create_rows = queryfx_all(
$conn,
'SELECT t.dateCreated FROM %T t %Q',
id(new ManiphestTask())->getTableName(),
$create_joins);
foreach ($create_rows as $key => $create_row) {
$create_rows[$key] = array(
'transactionType' => 'status',
'oldValue' => null,
'newValue' => $default_status,
'dateCreated' => $create_row['dateCreated'],
);
}
// Remove any actual legacy status transactions which take status from // Remove any actual legacy status transactions which take status from
// `null` to any open status. // `null` to any open status.
foreach ($data as $key => $row) { foreach ($legacy_data as $key => $row) {
if ($row['transactionType'] != 'status') { if ($row['transactionType'] != 'status') {
continue; continue;
} }
@ -168,12 +140,50 @@ final class ManiphestReportController extends ManiphestController {
} }
// If this is a legacy "create" transaction, discard it in favor of the // If this is a legacy "create" transaction, discard it in favor of the
// synthetic one. // synthetic transaction to be created below.
unset($data[$key]); unset($legacy_data[$key]);
} }
// Merge the synthetic rows into the real transactions. // Since rPd321cc81, after the move to EditEngine, we no longer create a
$data = array_merge($create_rows, $data); // "status" transaction if a task is created directly into the default
// status. This likely impacted API/email tasks after 2016 and all other
// tasks after deploying the Phorge codebase from 2017-11-22.
// Until Facts can fix this properly, use the task creation dates to
// generate synthetic transactions which look like the older transactions
// that this page expects.
$default_status = ManiphestTaskStatus::getDefaultStatus();
$duplicate_status = ManiphestTaskStatus::getDuplicateStatus();
if ($project_phid) {
$synth_joins = qsprintf(
$conn,
'JOIN %T p ON p.src = t.phid AND p.type = %d AND p.dst = %s',
PhabricatorEdgeConfig::TABLE_NAME_EDGE,
PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
$project_phid);
} else {
$synth_joins = qsprintf($conn, '');
}
// Build synthetic transactions which take status from `null` to the
// default value.
$synth_data = queryfx_all(
$conn,
'SELECT t.dateCreated FROM %T t %Q',
id(new ManiphestTask())->getTableName(),
$synth_joins);
foreach ($synth_data as $key => $synth_row) {
$synth_data[$key] = array(
'transactionType' => 'status',
'oldValue' => null,
'newValue' => $default_status,
'dateCreated' => $synth_row['dateCreated'],
);
}
// Merge the synthetic transactions into the legacy transactions.
$data = array_merge($synth_data, $legacy_data);
$data = array_values($data); $data = array_values($data);
$data = isort($data, 'dateCreated'); $data = isort($data, 'dateCreated');
@ -412,6 +422,11 @@ final class ManiphestReportController extends ManiphestController {
return array($filter, $chart_view); return array($filter, $chart_view);
} }
/**
* @param array $tokens
* @param bool $has_window
* @return AphrontListFilterView
*/
private function renderReportFilters(array $tokens, $has_window) { private function renderReportFilters(array $tokens, $has_window) {
$request = $this->getRequest(); $request = $this->getRequest();
$viewer = $request->getUser(); $viewer = $request->getUser();