From 04fd93e51e0368543773b72ed2dfef09d94080aa Mon Sep 17 00:00:00 2001 From: Austin McKinley Date: Fri, 26 May 2017 13:47:02 -0700 Subject: [PATCH] Drop DifferentialDraft storage Summary: Fixes T12104. Test Plan: Ran `bin/storage upgrade` and observed table dun got dropped. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: epriestley Maniphest Tasks: T12104 Differential Revision: https://secure.phabricator.com/D18034 --- .../sql/autopatches/20141106.uniqdrafts.php | 29 +------------------ .../20170526.dropdifferentialdrafts.sql | 1 + src/__phutil_library_map__.php | 2 -- .../storage/DifferentialDraft.php | 23 --------------- 4 files changed, 2 insertions(+), 53 deletions(-) create mode 100644 resources/sql/autopatches/20170526.dropdifferentialdrafts.sql delete mode 100644 src/applications/differential/storage/DifferentialDraft.php diff --git a/resources/sql/autopatches/20141106.uniqdrafts.php b/resources/sql/autopatches/20141106.uniqdrafts.php index 31d6a53cb7..85b05f9ced 100644 --- a/resources/sql/autopatches/20141106.uniqdrafts.php +++ b/resources/sql/autopatches/20141106.uniqdrafts.php @@ -1,30 +1,3 @@ establishConnection('w'); - -$duplicates = queryfx_all( - $conn_w, - 'SELECT DISTINCT u.id id FROM %T u - JOIN %T v - ON u.objectPHID = v.objectPHID - AND u.authorPHID = v.authorPHID - AND u.draftKey = v.draftKey - AND u.id < v.id', - $table->getTableName(), - $table->getTableName()); - -$duplicates = ipull($duplicates, 'id'); -foreach (PhabricatorLiskDAO::chunkSQL($duplicates) as $chunk) { - queryfx( - $conn_w, - 'DELETE FROM %T WHERE id IN (%Q)', - $table->getTableName(), - $chunk); -} +// This table has been removed; see T12104 for details. diff --git a/resources/sql/autopatches/20170526.dropdifferentialdrafts.sql b/resources/sql/autopatches/20170526.dropdifferentialdrafts.sql new file mode 100644 index 0000000000..057bcb0d90 --- /dev/null +++ b/resources/sql/autopatches/20170526.dropdifferentialdrafts.sql @@ -0,0 +1 @@ +DROP TABLE {$NAMESPACE}_differential.differential_draft; diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 9605ebfc14..1b742b5730 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -441,7 +441,6 @@ phutil_register_library_map(array( 'DifferentialDiffTransactionQuery' => 'applications/differential/query/DifferentialDiffTransactionQuery.php', 'DifferentialDiffViewController' => 'applications/differential/controller/DifferentialDiffViewController.php', 'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php', - 'DifferentialDraft' => 'applications/differential/storage/DifferentialDraft.php', 'DifferentialExactUserFunctionDatasource' => 'applications/differential/typeahead/DifferentialExactUserFunctionDatasource.php', 'DifferentialFieldParseException' => 'applications/differential/exception/DifferentialFieldParseException.php', 'DifferentialFieldValidationException' => 'applications/differential/exception/DifferentialFieldValidationException.php', @@ -5391,7 +5390,6 @@ phutil_register_library_map(array( 'DifferentialDiffTransactionQuery' => 'PhabricatorApplicationTransactionQuery', 'DifferentialDiffViewController' => 'DifferentialController', 'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher', - 'DifferentialDraft' => 'DifferentialDAO', 'DifferentialExactUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource', 'DifferentialFieldParseException' => 'Exception', 'DifferentialFieldValidationException' => 'Exception', diff --git a/src/applications/differential/storage/DifferentialDraft.php b/src/applications/differential/storage/DifferentialDraft.php deleted file mode 100644 index 7dbe2f68bd..0000000000 --- a/src/applications/differential/storage/DifferentialDraft.php +++ /dev/null @@ -1,23 +0,0 @@ - array( - 'draftKey' => 'text64', - ), - self::CONFIG_KEY_SCHEMA => array( - 'key_unique' => array( - 'columns' => array('objectPHID', 'authorPHID', 'draftKey'), - 'unique' => true, - ), - ), - ) + parent::getConfiguration(); - } - -}