recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Rename "SearchEngine" to "FulltextStorageEngine"

Summary:
Ref T9979. I picked this name long before the advent of modern "Engine" architecture and it ended up being pretty confusing.

Rename "SearchEngine" (currently: mysql or elasticsearch, used to store and query fulltext indexes) to "FulltextStorageEngine" to make it more clear what it does and disambituate it from ApplicationSearch, which also has a bunch of stuff called "SearchEngine", "SearchEngineExtension", etc.

Test Plan: Grepped for `phabricatorsearchengine`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9979

Differential Revision: https://secure.phabricator.com/D14843

epriestley 23c42486 99c9df96

+23 -21
+6 -6
src/__phutil_library_map__.php
··· 2194 2194 'PhabricatorEditField' => 'applications/transactions/editfield/PhabricatorEditField.php', 2195 2195 'PhabricatorEditType' => 'applications/transactions/edittype/PhabricatorEditType.php', 2196 2196 'PhabricatorEditor' => 'infrastructure/PhabricatorEditor.php', 2197 - 'PhabricatorElasticSearchEngine' => 'applications/search/engine/PhabricatorElasticSearchEngine.php', 2197 + 'PhabricatorElasticFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php', 2198 2198 'PhabricatorElasticSearchSetupCheck' => 'applications/config/check/PhabricatorElasticSearchSetupCheck.php', 2199 2199 'PhabricatorEmailAddressesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php', 2200 2200 'PhabricatorEmailFormatSettingsPanel' => 'applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php', ··· 2333 2333 'PhabricatorFulltextEngineExtensionModule' => 'applications/search/index/PhabricatorFulltextEngineExtensionModule.php', 2334 2334 'PhabricatorFulltextIndexEngineExtension' => 'applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php', 2335 2335 'PhabricatorFulltextInterface' => 'applications/search/interface/PhabricatorFulltextInterface.php', 2336 + 'PhabricatorFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php', 2336 2337 'PhabricatorFundApplication' => 'applications/fund/application/PhabricatorFundApplication.php', 2337 2338 'PhabricatorGDSetupCheck' => 'applications/config/check/PhabricatorGDSetupCheck.php', 2338 2339 'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php', ··· 2541 2542 'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php', 2542 2543 'PhabricatorMySQLConfigOptions' => 'applications/config/option/PhabricatorMySQLConfigOptions.php', 2543 2544 'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php', 2544 - 'PhabricatorMySQLSearchEngine' => 'applications/search/engine/PhabricatorMySQLSearchEngine.php', 2545 + 'PhabricatorMySQLFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php', 2545 2546 'PhabricatorMySQLSetupCheck' => 'applications/config/check/PhabricatorMySQLSetupCheck.php', 2546 2547 'PhabricatorNamedQuery' => 'applications/search/storage/PhabricatorNamedQuery.php', 2547 2548 'PhabricatorNamedQueryQuery' => 'applications/search/query/PhabricatorNamedQueryQuery.php', ··· 3034 3035 'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/PhabricatorSearchDocumentRelationship.php', 3035 3036 'PhabricatorSearchDocumentTypeDatasource' => 'applications/search/typeahead/PhabricatorSearchDocumentTypeDatasource.php', 3036 3037 'PhabricatorSearchEditController' => 'applications/search/controller/PhabricatorSearchEditController.php', 3037 - 'PhabricatorSearchEngine' => 'applications/search/engine/PhabricatorSearchEngine.php', 3038 3038 'PhabricatorSearchEngineAPIMethod' => 'applications/search/engine/PhabricatorSearchEngineAPIMethod.php', 3039 3039 'PhabricatorSearchEngineAttachment' => 'applications/search/engineextension/PhabricatorSearchEngineAttachment.php', 3040 3040 'PhabricatorSearchEngineExtension' => 'applications/search/engineextension/PhabricatorSearchEngineExtension.php', ··· 6398 6398 'PhabricatorEditField' => 'Phobject', 6399 6399 'PhabricatorEditType' => 'Phobject', 6400 6400 'PhabricatorEditor' => 'Phobject', 6401 - 'PhabricatorElasticSearchEngine' => 'PhabricatorSearchEngine', 6401 + 'PhabricatorElasticFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine', 6402 6402 'PhabricatorElasticSearchSetupCheck' => 'PhabricatorSetupCheck', 6403 6403 'PhabricatorEmailAddressesSettingsPanel' => 'PhabricatorSettingsPanel', 6404 6404 'PhabricatorEmailFormatSettingsPanel' => 'PhabricatorSettingsPanel', ··· 6567 6567 'PhabricatorFulltextEngineExtension' => 'Phobject', 6568 6568 'PhabricatorFulltextEngineExtensionModule' => 'PhabricatorConfigModule', 6569 6569 'PhabricatorFulltextIndexEngineExtension' => 'PhabricatorIndexEngineExtension', 6570 + 'PhabricatorFulltextStorageEngine' => 'Phobject', 6570 6571 'PhabricatorFundApplication' => 'PhabricatorApplication', 6571 6572 'PhabricatorGDSetupCheck' => 'PhabricatorSetupCheck', 6572 6573 'PhabricatorGarbageCollector' => 'Phobject', ··· 6790 6791 'PhabricatorMustVerifyEmailController' => 'PhabricatorAuthController', 6791 6792 'PhabricatorMySQLConfigOptions' => 'PhabricatorApplicationConfigOptions', 6792 6793 'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine', 6793 - 'PhabricatorMySQLSearchEngine' => 'PhabricatorSearchEngine', 6794 + 'PhabricatorMySQLFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine', 6794 6795 'PhabricatorMySQLSetupCheck' => 'PhabricatorSetupCheck', 6795 6796 'PhabricatorNamedQuery' => array( 6796 6797 'PhabricatorSearchDAO', ··· 7399 7400 'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO', 7400 7401 'PhabricatorSearchDocumentTypeDatasource' => 'PhabricatorTypeaheadDatasource', 7401 7402 'PhabricatorSearchEditController' => 'PhabricatorSearchBaseController', 7402 - 'PhabricatorSearchEngine' => 'Phobject', 7403 7403 'PhabricatorSearchEngineAPIMethod' => 'ConduitAPIMethod', 7404 7404 'PhabricatorSearchEngineAttachment' => 'Phobject', 7405 7405 'PhabricatorSearchEngineExtension' => 'Phobject',
+3 -3
src/applications/config/check/PhabricatorElasticSearchSetupCheck.php
··· 11 11 return; 12 12 } 13 13 14 - $engine = new PhabricatorElasticSearchEngine(); 14 + $engine = new PhabricatorElasticFulltextStorageEngine(); 15 15 16 16 $index_exists = null; 17 17 $index_sane = null; ··· 70 70 } 71 71 72 72 protected function shouldUseElasticSearchEngine() { 73 - $search_engine = PhabricatorSearchEngine::loadEngine(); 74 - return ($search_engine instanceof PhabricatorElasticSearchEngine); 73 + $search_engine = PhabricatorFulltextStorageEngine::loadEngine(); 74 + return ($search_engine instanceof PhabricatorElasticFulltextStorageEngine); 75 75 } 76 76 77 77 }
+2 -2
src/applications/config/check/PhabricatorMySQLSetupCheck.php
··· 366 366 } 367 367 368 368 protected function shouldUseMySQLSearchEngine() { 369 - $search_engine = PhabricatorSearchEngine::loadEngine(); 370 - return $search_engine instanceof PhabricatorMySQLSearchEngine; 369 + $search_engine = PhabricatorFulltextStorageEngine::loadEngine(); 370 + return ($search_engine instanceof PhabricatorMySQLFulltextStorageEngine); 371 371 } 372 372 373 373 }
+1 -1
src/applications/maniphest/query/ManiphestTaskQuery.php
··· 499 499 $fulltext_query->setParameter('types', 500 500 array(ManiphestTaskPHIDType::TYPECONST)); 501 501 502 - $engine = PhabricatorSearchEngine::loadEngine(); 502 + $engine = PhabricatorFulltextStorageEngine::loadEngine(); 503 503 $fulltext_results = $engine->executeSearch($fulltext_query); 504 504 505 505 if (empty($fulltext_results)) {
+2 -2
src/applications/search/applicationpanel/PhabricatorSearchApplicationStorageEnginePanel.php
··· 16 16 $viewer = $this->getViewer(); 17 17 $application = $this->getApplication(); 18 18 19 - $active_engine = PhabricatorSearchEngine::loadEngine(); 20 - $engines = PhabricatorSearchEngine::loadAllEngines(); 19 + $active_engine = PhabricatorFulltextStorageEngine::loadEngine(); 20 + $engines = PhabricatorFulltextStorageEngine::loadAllEngines(); 21 21 22 22 $rows = array(); 23 23 $rowc = array();
+2 -1
src/applications/search/engine/PhabricatorElasticSearchEngine.php src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php
··· 1 1 <?php 2 2 3 - final class PhabricatorElasticSearchEngine extends PhabricatorSearchEngine { 3 + final class PhabricatorElasticFulltextStorageEngine 4 + extends PhabricatorFulltextStorageEngine { 4 5 5 6 private $uri; 6 7 private $index;
+2 -1
src/applications/search/engine/PhabricatorMySQLSearchEngine.php src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
··· 1 1 <?php 2 2 3 - final class PhabricatorMySQLSearchEngine extends PhabricatorSearchEngine { 3 + final class PhabricatorMySQLFulltextStorageEngine 4 + extends PhabricatorFulltextStorageEngine { 4 5 5 6 public function getEngineIdentifier() { 6 7 return 'mysql';
+1 -1
src/applications/search/engine/PhabricatorSearchEngine.php src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php
··· 5 5 * three capabilities: indexing, searching, and reconstruction (this can be 6 6 * stubbed out if an engine can't reasonably do it, it is used for debugging). 7 7 */ 8 - abstract class PhabricatorSearchEngine extends Phobject { 8 + abstract class PhabricatorFulltextStorageEngine extends Phobject { 9 9 10 10 /* -( Engine Metadata )---------------------------------------------------- */ 11 11
+1 -1
src/applications/search/engine/__tests__/PhabricatorSearchEngineTestCase.php
··· 3 3 final class PhabricatorSearchEngineTestCase extends PhabricatorTestCase { 4 4 5 5 public function testLoadAllEngines() { 6 - PhabricatorSearchEngine::loadAllEngines(); 6 + PhabricatorFulltextStorageEngine::loadAllEngines(); 7 7 $this->assertTrue(true); 8 8 } 9 9
+1 -1
src/applications/search/index/PhabricatorFulltextEngine.php
··· 40 40 $extension->indexFulltextObject($object, $document); 41 41 } 42 42 43 - $storage_engine = PhabricatorSearchEngine::loadEngine(); 43 + $storage_engine = PhabricatorFulltextStorageEngine::loadEngine(); 44 44 $storage_engine->reindexAbstractDocument($document); 45 45 } 46 46
+1 -1
src/applications/search/management/PhabricatorSearchManagementInitWorkflow.php
··· 13 13 public function execute(PhutilArgumentParser $args) { 14 14 $console = PhutilConsole::getConsole(); 15 15 16 - $engine = PhabricatorSearchEngine::loadEngine(); 16 + $engine = PhabricatorFulltextStorageEngine::loadEngine(); 17 17 18 18 $work_done = false; 19 19 if (!$engine->indexExists()) {
+1 -1
src/applications/search/query/PhabricatorSearchDocumentQuery.php
··· 74 74 ->setParameter('offset', $this->getOffset()) 75 75 ->setParameter('limit', $this->getRawResultLimit()); 76 76 77 - $engine = PhabricatorSearchEngine::loadEngine(); 77 + $engine = PhabricatorFulltextStorageEngine::loadEngine(); 78 78 79 79 return $engine->executeSearch($query); 80 80 }