Page MenuHomePhabricator
Files F13989601

D17495.diff
No OneTemporary
Actions

D17495.diff
View Options

diff --git a/resources/sql/autopatches/20170313.reviewers.01.sql b/resources/sql/autopatches/20170313.reviewers.01.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20170313.reviewers.01.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_differential.differential_reviewer (
+ id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ revisionPHID VARBINARY(64) NOT NULL,
+ reviewerPHID VARBINARY(64) NOT NULL,
+ reviewerStatus VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT},
+ dateCreated INT UNSIGNED NOT NULL,
+ dateModified INT UNSIGNED NOT NULL,
+ UNIQUE KEY `key_revision` (revisionPHID, reviewerPHID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -491,6 +491,7 @@
'DifferentialRevertPlanCommitMessageField' => 'applications/differential/field/DifferentialRevertPlanCommitMessageField.php',
'DifferentialRevertPlanField' => 'applications/differential/customfield/DifferentialRevertPlanField.php',
'DifferentialReviewedByCommitMessageField' => 'applications/differential/field/DifferentialReviewedByCommitMessageField.php',
+ 'DifferentialReviewer' => 'applications/differential/storage/DifferentialReviewer.php',
'DifferentialReviewerDatasource' => 'applications/differential/typeahead/DifferentialReviewerDatasource.php',
'DifferentialReviewerForRevisionEdgeType' => 'applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php',
'DifferentialReviewerProxy' => 'applications/differential/storage/DifferentialReviewerProxy.php',
@@ -5247,6 +5248,7 @@
'DifferentialRevertPlanCommitMessageField' => 'DifferentialCommitMessageCustomField',
'DifferentialRevertPlanField' => 'DifferentialStoredCustomField',
'DifferentialReviewedByCommitMessageField' => 'DifferentialCommitMessageField',
+ 'DifferentialReviewer' => 'DifferentialDAO',
'DifferentialReviewerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
'DifferentialReviewerForRevisionEdgeType' => 'PhabricatorEdgeType',
'DifferentialReviewerProxy' => 'Phobject',
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
new file mode 100644
--- /dev/null
+++ b/src/applications/differential/storage/DifferentialReviewer.php
@@ -0,0 +1,24 @@
+<?php
+
+final class DifferentialReviewer
+ extends DifferentialDAO {
+
+ protected $revisionPHID;
+ protected $reviewerPHID;
+ protected $reviewerStatus;
+
+ protected function getConfiguration() {
+ return array(
+ self::CONFIG_COLUMN_SCHEMA => array(
+ 'reviewerStatus' => 'text64',
+ ),
+ self::CONFIG_KEY_SCHEMA => array(
+ 'key_revision' => array(
+ 'columns' => array('revisionPHID', 'reviewerPHID'),
+ 'unique' => true,
+ ),
+ ),
+ ) + parent::getConfiguration();
+ }
+
+}
diff --git a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
--- a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
@@ -116,6 +116,9 @@
);
}
+ // This is currently double-writing: to the old (edge) store and the new
+ // (reviewer) store. Do the old edge write first.
+
$src_phid = $revision->getPHID();
$edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST;
@@ -131,6 +134,42 @@
}
$editor->save();
+
+ // Now, do the new write.
+
+ if ($map) {
+ $table = new DifferentialReviewer();
+
+ $reviewers = $table->loadAllWhere(
+ 'revisionPHID = %s AND reviewerPHID IN (%Ls)',
+ $src_phid,
+ array_keys($map));
+ $reviewers = mpull($reviewers, null, 'getReviewerPHID');
+
+ foreach ($map as $dst_phid => $edge_data) {
+ $reviewer = idx($reviewers, $dst_phid);
+ if (!$reviewer) {
+ $reviewer = id(new DifferentialReviewer())
+ ->setRevisionPHID($src_phid)
+ ->setReviewerPHID($dst_phid);
+ }
+
+ $reviewer->setReviewerStatus($status);
+
+ if ($status == DifferentialReviewerStatus::STATUS_RESIGNED) {
+ if ($reviewer->getID()) {
+ $reviewer->delete();
+ }
+ } else {
+ try {
+ $reviewer->save();
+ } catch (AphrontDuplicateKeyQueryException $ex) {
+ // At least for now, just ignore it if we lost a race.
+ }
+ }
+ }
+ }
+
}
}
diff --git a/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php
--- a/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php
@@ -106,6 +106,9 @@
public function applyExternalEffects($object, $value) {
$src_phid = $object->getPHID();
+ // This is currently double-writing: to the old (edge) store and the new
+ // (reviewer) store. Do the old edge write first.
+
$old = $this->generateOldValue($object);
$new = $value;
$edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST;
@@ -138,6 +141,51 @@
}
$editor->save();
+
+ // Now, do the new write.
+
+ $table = new DifferentialReviewer();
+ $table_name = $table->getTableName();
+ $conn = $table->establishConnection('w');
+
+ if ($rem) {
+ queryfx(
+ $conn,
+ 'DELETE FROM %T WHERE revisionPHID = %s AND reviewerPHID IN (%Ls)',
+ $table_name,
+ $src_phid,
+ array_keys($rem));
+ }
+
+ if ($new) {
+ $reviewers = $table->loadAllWhere(
+ 'revisionPHID = %s AND reviewerPHID IN (%Ls)',
+ $src_phid,
+ array_keys($new));
+ $reviewers = mpull($reviewers, null, 'getReviewerPHID');
+
+ foreach ($new as $dst_phid => $status) {
+ $old_status = idx($old, $dst_phid);
+ if ($old_status === $status) {
+ continue;
+ }
+
+ $reviewer = idx($reviewers, $dst_phid);
+ if (!$reviewer) {
+ $reviewer = id(new DifferentialReviewer())
+ ->setRevisionPHID($src_phid)
+ ->setReviewerPHID($dst_phid);
+ }
+
+ $reviewer->setReviewerStatus($status);
+
+ try {
+ $reviewer->save();
+ } catch (AphrontDuplicateKeyQueryException $ex) {
+ // At least for now, just ignore it if we lost a race.
+ }
+ }
+ }
}
public function getTitle() {

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 22, 9:39 PM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6742890
Default Alt Text
D17495.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility