Page MenuHomePhabricator
Files F13177142

D19869.diff
No OneTemporary
Actions

D19869.diff
View Options

diff --git a/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
--- a/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
+++ b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
@@ -43,12 +43,13 @@
$conn_r = $repository->establishConnection('r');
- $limit = '';
if ($this->limit) {
$limit = qsprintf(
$conn_r,
'LIMIT %d',
$this->limit + 1);
+ } else {
+ $limit = qsprintf($conn_r, '');
}
$raw_changes = queryfx_all(
diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
--- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
@@ -114,40 +114,36 @@
PhabricatorRepositoryCommit $commit,
array $changes) {
+ $conn = $repository->establishConnection('w');
+
$repository_id = (int)$repository->getID();
$commit_id = (int)$commit->getID();
- // NOTE: This SQL is being built manually instead of with qsprintf()
- // because some SVN changes affect an enormous number of paths (millions)
- // and this showed up as significantly slow on a profile at some point.
-
$changes_sql = array();
foreach ($changes as $change) {
- $values = array(
+ $changes_sql[] = qsprintf(
+ $conn,
+ '(%d, %d, %d, %nd, %nd, %d, %d, %d, %d)',
$repository_id,
(int)$change->getPathID(),
$commit_id,
- nonempty((int)$change->getTargetPathID(), 'null'),
- nonempty((int)$change->getTargetCommitID(), 'null'),
+ nonempty((int)$change->getTargetPathID(), null),
+ nonempty((int)$change->getTargetCommitID(), null),
(int)$change->getChangeType(),
(int)$change->getFileType(),
(int)$change->getIsDirect(),
- (int)$change->getCommitSequence(),
- );
- $changes_sql[] = '('.implode(', ', $values).')';
+ (int)$change->getCommitSequence());
}
- $conn_w = $repository->establishConnection('w');
-
queryfx(
- $conn_w,
+ $conn,
'DELETE FROM %T WHERE commitID = %d',
PhabricatorRepository::TABLE_PATHCHANGE,
$commit_id);
foreach (PhabricatorLiskDAO::chunkSQL($changes_sql) as $chunk) {
queryfx(
- $conn_w,
+ $conn,
'INSERT INTO %T
(repositoryID, pathID, commitID, targetPathID, targetCommitID,
changeType, fileType, isDirect, commitSequence)

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 7:29 PM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6275573
Default Alt Text
D19869.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility