From faca1deea5b5a21aa936032114e7e1b1ba471884 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 6 Sep 2017 10:49:31 -0700 Subject: [PATCH] Remove the fulltext "reconstructDocument()" method Summary: Ref T12819. This was originally intended for debugging, but never actually used and not clearly useful. There are no callers and it probably does not work. Just get rid of it. Test Plan: Grepped for callers; none exist. Reviewers: chad Reviewed By: chad Maniphest Tasks: T12819 Differential Revision: https://secure.phabricator.com/D18544 --- ...habricatorElasticFulltextStorageEngine.php | 36 ---------- .../PhabricatorFulltextStorageEngine.php | 9 --- .../PhabricatorMySQLFulltextStorageEngine.php | 67 ------------------- 3 files changed, 112 deletions(-) diff --git a/src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php index 8c75c17e36..f6aead3759 100644 --- a/src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php +++ b/src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php @@ -105,42 +105,6 @@ class PhabricatorElasticFulltextStorageEngine $this->executeRequest($host, "/{$type}/{$phid}/", $spec, 'PUT'); } - public function reconstructDocument($phid) { - $type = phid_get_type($phid); - $host = $this->getHostForRead(); - $response = $this->executeRequest($host, "/{$type}/{$phid}", array()); - - if (empty($response['exists'])) { - return null; - } - - $hit = $response['_source']; - - $doc = new PhabricatorSearchAbstractDocument(); - $doc->setPHID($phid); - $doc->setDocumentType($response['_type']); - $doc->setDocumentTitle($hit['title']); - $doc->setDocumentCreated($hit['dateCreated']); - $doc->setDocumentModified($hit[$this->getTimestampField()]); - - foreach ($hit['field'] as $fdef) { - $field_type = $fdef['type']; - $doc->addField($field_type, $hit[$field_type], $fdef['aux']); - } - - foreach ($hit['relationship'] as $rtype => $rships) { - foreach ($rships as $rship) { - $doc->addRelationship( - $rtype, - $rship['phid'], - $rship['phidType'], - $rship['when']); - } - } - - return $doc; - } - private function buildSpec(PhabricatorSavedQuery $query) { $q = new PhabricatorElasticsearchQueryBuilder('bool'); $query_string = $query->getParameter('query'); diff --git a/src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php index 588ccc3e5e..ba019ea593 100644 --- a/src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php +++ b/src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php @@ -53,15 +53,6 @@ abstract class PhabricatorFulltextStorageEngine extends Phobject { abstract public function reindexAbstractDocument( PhabricatorSearchAbstractDocument $document); - /** - * Reconstruct the document for a given PHID. This is used for debugging - * and does not need to be perfect if it is unreasonable to implement it. - * - * @param phid Document PHID to reconstruct. - * @return PhabricatorSearchAbstractDocument Abstract document. - */ - abstract public function reconstructDocument($phid); - /** * Execute a search query. * diff --git a/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php index fe526a8133..c2e38d2db7 100644 --- a/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php +++ b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php @@ -91,73 +91,6 @@ final class PhabricatorMySQLFulltextStorageEngine } - /** - * Rebuild the PhabricatorSearchAbstractDocument that was used to index - * an object out of the index itself. This is primarily useful for debugging, - * as it allows you to inspect the search index representation of a - * document. - * - * @param phid PHID of a document which exists in the search index. - * @return null|PhabricatorSearchAbstractDocument Abstract document object - * which corresponds to the original abstract document used to - * build the document index. - */ - public function reconstructDocument($phid) { - $dao_doc = new PhabricatorSearchDocument(); - $dao_field = new PhabricatorSearchDocumentField(); - $dao_relationship = new PhabricatorSearchDocumentRelationship(); - - $t_doc = $dao_doc->getTableName(); - $t_field = $dao_field->getTableName(); - $t_relationship = $dao_relationship->getTableName(); - - $doc = queryfx_one( - $dao_doc->establishConnection('r'), - 'SELECT * FROM %T WHERE phid = %s', - $t_doc, - $phid); - - if (!$doc) { - return null; - } - - $fields = queryfx_all( - $dao_field->establishConnection('r'), - 'SELECT * FROM %T WHERE phid = %s', - $t_field, - $phid); - - $relationships = queryfx_all( - $dao_relationship->establishConnection('r'), - 'SELECT * FROM %T WHERE phid = %s', - $t_relationship, - $phid); - - $adoc = id(new PhabricatorSearchAbstractDocument()) - ->setPHID($phid) - ->setDocumentType($doc['documentType']) - ->setDocumentTitle($doc['documentTitle']) - ->setDocumentCreated($doc['documentCreated']) - ->setDocumentModified($doc['documentModified']); - - foreach ($fields as $field) { - $adoc->addField( - $field['field'], - $field['corpus'], - $field['auxPHID']); - } - - foreach ($relationships as $relationship) { - $adoc->addRelationship( - $relationship['relation'], - $relationship['relatedPHID'], - $relationship['relatedType'], - $relationship['relatedTime']); - } - - return $adoc; - } - public function executeSearch(PhabricatorSavedQuery $query) { $table = new PhabricatorSearchDocument(); $document_table = $table->getTableName();