Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15463120
D17518.id42142.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
15 KB
Referenced Files
None
Subscribers
None
D17518.id42142.diff
View Options
diff --git a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
--- a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
@@ -42,7 +42,6 @@
$revision = id(new DifferentialRevisionQuery())
->withIDs(array($revision_id))
->setViewer($request->getUser())
- ->needRelationships(true)
->needReviewerStatus(true)
->executeOne();
@@ -50,7 +49,7 @@
throw new ConduitException('ERR_BAD_REVISION');
}
- $reviewer_phids = array_values($revision->getReviewers());
+ $reviewer_phids = $revision->getReviewerPHIDs();
$diffs = id(new DifferentialDiffQuery())
->setViewer($request->getUser())
diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
--- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
@@ -182,7 +182,7 @@
$query->withBranches($branches);
}
- $query->needRelationships(true);
+ $query->needReviewerStatus(true);
$query->needCommitPHIDs(true);
$query->needDiffIDs(true);
$query->needActiveDiffs(true);
@@ -194,6 +194,14 @@
$request->getUser(),
$revisions);
+ if ($revisions) {
+ $ccs = id(new PhabricatorSubscribersQuery())
+ ->withObjectPHIDs(mpull($revisions, 'getPHID'))
+ ->execute();
+ } else {
+ $ccs = array();
+ }
+
$results = array();
foreach ($revisions as $revision) {
$diff = $revision->getActiveDiff();
@@ -224,8 +232,8 @@
'activeDiffPHID' => $diff->getPHID(),
'diffs' => $revision->getDiffIDs(),
'commits' => $revision->getCommitPHIDs(),
- 'reviewers' => array_values($revision->getReviewers()),
- 'ccs' => array_values($revision->getCCPHIDs()),
+ 'reviewers' => $revision->getReviewerPHIDs(),
+ 'ccs' => idx($ccs, $phid, array()),
'hashes' => $revision->getHashes(),
'auxiliary' => idx($field_data, $phid, array()),
'repositoryPHID' => $diff->getRepositoryPHID(),
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -17,7 +17,6 @@
$revision = id(new DifferentialRevisionQuery())
->withIDs(array($this->revisionID))
->setViewer($viewer)
- ->needRelationships(true)
->needReviewerStatus(true)
->needReviewerAuthority(true)
->executeOne();
@@ -103,9 +102,12 @@
$this->loadDiffProperties($diffs);
$props = $target_manual->getDiffProperties();
+ $subscriber_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
+ $revision->getPHID());
+
$object_phids = array_merge(
- $revision->getReviewers(),
- $revision->getCCPHIDs(),
+ $revision->getReviewerPHIDs(),
+ $subscriber_phids,
$revision->loadCommitPHIDs(),
array(
$revision->getAuthorPHID(),
@@ -782,7 +784,7 @@
->setLimit(10)
->needFlags(true)
->needDrafts(true)
- ->needRelationships(true);
+ ->needReviewerStatus(true);
foreach ($path_map as $path => $path_id) {
$query->withPath($repository->getID(), $path_id);
diff --git a/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php b/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php
--- a/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php
+++ b/src/applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php
@@ -26,7 +26,7 @@
return id(new DifferentialRevisionQuery())
->setViewer($this->getViewer())
->withIDs(array($object->getID()))
- ->needRelationships(true)
+ ->needReviewerStatus(true)
->executeOne();
}
@@ -37,7 +37,7 @@
public function getActiveUserPHIDs($object) {
$status = $object->getStatus();
if ($status == ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {
- return $object->getReviewers();
+ return $object->getReviewerPHIDs();
} else {
return array();
}
@@ -48,12 +48,13 @@
if ($status == ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {
return array();
} else {
- return $object->getReviewers();
+ return $object->getReviewerPHIDs();
}
}
public function getCCUserPHIDs($object) {
- return $object->getCCPHIDs();
+ return PhabricatorSubscribersQuery::loadSubscribersForPHID(
+ $object->getPHID());
}
public function getObjectTitle($object) {
diff --git a/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php b/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php
--- a/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php
+++ b/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php
@@ -85,7 +85,6 @@
$revision = id(new DifferentialRevisionQuery())
->withIDs(array($revision->getID()))
->setViewer(PhabricatorUser::getOmnipotentUser())
- ->needRelationships(true)
->needReviewerStatus(true)
->executeOne();
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -43,7 +43,6 @@
const ORDER_MODIFIED = 'order-modified';
const ORDER_CREATED = 'order-created';
- private $needRelationships = false;
private $needActiveDiffs = false;
private $needDiffIDs = false;
private $needCommitPHIDs = false;
@@ -227,20 +226,6 @@
}
-
- /**
- * Set whether or not the query will load and attach relationships.
- *
- * @param bool True to load and attach relationships.
- * @return this
- * @task config
- */
- public function needRelationships($need_relationships) {
- $this->needRelationships = $need_relationships;
- return $this;
- }
-
-
/**
* Set whether or not the query should load the active diff for each
* revision.
@@ -425,10 +410,6 @@
$table = new DifferentialRevision();
$conn_r = $table->establishConnection('r');
- if ($this->needRelationships) {
- $this->loadRelationships($conn_r, $revisions);
- }
-
if ($this->needCommitPHIDs) {
$this->loadCommitPHIDs($conn_r, $revisions);
}
@@ -854,40 +835,6 @@
);
}
- private function loadRelationships($conn_r, array $revisions) {
- assert_instances_of($revisions, 'DifferentialRevision');
-
- $type_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST;
- $type_subscriber = PhabricatorObjectHasSubscriberEdgeType::EDGECONST;
-
- $edges = id(new PhabricatorEdgeQuery())
- ->withSourcePHIDs(mpull($revisions, 'getPHID'))
- ->withEdgeTypes(array($type_reviewer, $type_subscriber))
- ->setOrder(PhabricatorEdgeQuery::ORDER_OLDEST_FIRST)
- ->execute();
-
- $type_map = array(
- DifferentialRevision::RELATION_REVIEWER => $type_reviewer,
- DifferentialRevision::RELATION_SUBSCRIBED => $type_subscriber,
- );
-
- foreach ($revisions as $revision) {
- $data = array();
- foreach ($type_map as $rel_type => $edge_type) {
- $revision_edges = $edges[$revision->getPHID()][$edge_type];
- foreach ($revision_edges as $dst_phid => $edge_data) {
- $data[] = array(
- 'relation' => $rel_type,
- 'objectPHID' => $dst_phid,
- 'reasonPHID' => null,
- );
- }
- }
-
- $revision->attachRelationships($data);
- }
- }
-
private function loadCommitPHIDs($conn_r, array $revisions) {
assert_instances_of($revisions, 'DifferentialRevision');
$commit_phids = queryfx_all(
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -19,7 +19,6 @@
return id(new DifferentialRevisionQuery())
->needFlags(true)
->needDrafts(true)
- ->needRelationships(true)
->needReviewerStatus(true);
}
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -38,7 +38,6 @@
protected $editPolicy = PhabricatorPolicies::POLICY_USER;
protected $properties = array();
- private $relationships = self::ATTACHABLE;
private $commits = self::ATTACHABLE;
private $activeDiff = self::ATTACHABLE;
private $diffIDs = self::ATTACHABLE;
@@ -69,7 +68,6 @@
return id(new DifferentialRevision())
->setViewPolicy($view_policy)
->setAuthorPHID($actor->getPHID())
- ->attachRelationships(array())
->attachRepository(null)
->attachActiveDiff(null)
->attachReviewerStatus(array())
@@ -238,64 +236,6 @@
return parent::save();
}
- public function loadRelationships() {
- if (!$this->getID()) {
- $this->relationships = array();
- return;
- }
-
- $data = array();
-
- $subscriber_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
- $this->getPHID(),
- PhabricatorObjectHasSubscriberEdgeType::EDGECONST);
- $subscriber_phids = array_reverse($subscriber_phids);
- foreach ($subscriber_phids as $phid) {
- $data[] = array(
- 'relation' => self::RELATION_SUBSCRIBED,
- 'objectPHID' => $phid,
- 'reasonPHID' => null,
- );
- }
-
- $reviewer_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
- $this->getPHID(),
- DifferentialRevisionHasReviewerEdgeType::EDGECONST);
- $reviewer_phids = array_reverse($reviewer_phids);
- foreach ($reviewer_phids as $phid) {
- $data[] = array(
- 'relation' => self::RELATION_REVIEWER,
- 'objectPHID' => $phid,
- 'reasonPHID' => null,
- );
- }
-
- return $this->attachRelationships($data);
- }
-
- public function attachRelationships(array $relationships) {
- $this->relationships = igroup($relationships, 'relation');
- return $this;
- }
-
- public function getReviewers() {
- return $this->getRelatedPHIDs(self::RELATION_REVIEWER);
- }
-
- public function getCCPHIDs() {
- return $this->getRelatedPHIDs(self::RELATION_SUBSCRIBED);
- }
-
- private function getRelatedPHIDs($relation) {
- $this->assertAttached($this->relationships);
-
- return ipull($this->getRawRelations($relation), 'objectPHID');
- }
-
- public function getRawRelations($relation) {
- return idx($this->relationships, $relation, array());
- }
-
public function getHashes() {
return $this->assertAttached($this->hashes);
}
@@ -402,6 +342,11 @@
return $this;
}
+ public function getReviewerPHIDs() {
+ $reviewers = $this->getReviewerStatus();
+ return mpull($reviewers, 'getReviewerPHID');
+ }
+
public function getReviewerPHIDsForEdit() {
$reviewers = $this->getReviewerStatus();
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -52,10 +52,7 @@
$phids = array();
foreach ($this->revisions as $revision) {
$phids[] = array($revision->getAuthorPHID());
-
- // TODO: Switch to getReviewerStatus(), but not all callers pass us
- // revisions with this data loaded.
- $phids[] = $revision->getReviewers();
+ $phids[] = $revision->getReviewerPHIDs();
}
return array_mergev($phids);
}
@@ -132,8 +129,7 @@
}
$reviewers = array();
- // TODO: As above, this should be based on `getReviewerStatus()`.
- foreach ($revision->getReviewers() as $reviewer) {
+ foreach ($revision->getReviewerPHIDs() as $reviewer) {
$reviewers[] = $this->handles[$reviewer]->renderLink();
}
if (!$reviewers) {
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1765,7 +1765,7 @@
->withUpdatedEpochBetween($recent, null)
->setOrder(DifferentialRevisionQuery::ORDER_MODIFIED)
->setLimit(10)
- ->needRelationships(true)
+ ->needReviewerStatus(true)
->needFlags(true)
->needDrafts(true)
->execute();
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
@@ -20,7 +20,7 @@
return array();
}
- return $revision->getReviewers();
+ return $revision->getReviewerPHIDs();
}
protected function getHeraldFieldStandardType() {
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
@@ -20,8 +20,8 @@
return array();
}
- return $revision->getReviewers();
- }
+ return $revision->getReviewerPHIDs();
+ }
protected function getHeraldFieldStandardType() {
return self::STANDARD_PHID_LIST;
diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
@@ -190,7 +190,6 @@
$revision = id(new DifferentialRevisionQuery())
->withIDs(array($revision_id))
->setViewer(PhabricatorUser::getOmnipotentUser())
- ->needRelationships(true)
->needReviewerStatus(true)
->executeOne();
if ($revision) {
diff --git a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
--- a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
+++ b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
@@ -190,7 +190,7 @@
$this->revision = id(new DifferentialRevisionQuery())
->setViewer(PhabricatorUser::getOmnipotentUser())
->withIDs(array($revision_id))
- ->needRelationships(true)
+ ->needReviewerStatus(true)
->executeOne();
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Apr 2, 8:29 PM (1 d, 16 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7653870
Default Alt Text
D17518.id42142.diff (15 KB)
Attached To
Mode
D17518: Remove obsolete "relationships" code from Differential
Attached
Detach File
Event Timeline
Log In to Comment