Skip to content

Commit fce8f6f

Browse files
dima koushhajenkins-bot
authored andcommitted
Search: Delete sqlTermStoreSearchEngine
This patch does the following as well: * Updates the README that Elastic search configured is a requirement for the RESTful search to work Bug: T397137 Change-Id: Ia8f5f6c12ca8606dd49a11d521479de556bd9751
1 parent b98a326 commit fce8f6f

File tree

6 files changed

+14
-713
lines changed

6 files changed

+14
-713
lines changed

repo/domains/search/src/Infrastructure/DataAccess/SqlTermStoreSearchEngine.php

Lines changed: 0 additions & 202 deletions
This file was deleted.

repo/domains/search/src/WbSearch.ServiceWiring.php

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
use Wikibase\Repo\Domains\Search\Application\Validation\SearchLanguageValidator;
1515
use Wikibase\Repo\Domains\Search\Infrastructure\DataAccess\EntitySearchHelperPrefixSearchEngine;
1616
use Wikibase\Repo\Domains\Search\Infrastructure\DataAccess\InLabelSearchEngine;
17-
use Wikibase\Repo\Domains\Search\Infrastructure\DataAccess\SqlTermStoreSearchEngine;
18-
use Wikibase\Repo\Domains\Search\Infrastructure\DataAccess\TermRetriever;
1917
use Wikibase\Repo\Domains\Search\Infrastructure\LanguageCodeValidator;
2018
use Wikibase\Repo\Domains\Search\WbSearch;
2119
use Wikibase\Repo\RestApi\Middleware\MiddlewareHandler;
@@ -78,39 +76,17 @@
7876
] );
7977
},
8078

81-
/**
82-
* @return InLabelSearchEngine|SqlTermStoreSearchEngine
83-
*/
84-
'WbSearch.SearchEngine' => function( MediaWikiServices $services ) {
85-
global $wgSearchType;
86-
87-
$isWikibaseCirrusSearchEnabled = $services->getExtensionRegistry()->isLoaded( 'WikibaseCirrusSearch' );
88-
$isCirrusSearchEnabled = $wgSearchType === 'CirrusSearch';
89-
90-
$searchEngine = $isCirrusSearchEnabled && $isWikibaseCirrusSearchEnabled
91-
? WbSearch::getInLabelSearchEngine( $services )
92-
: new SqlTermStoreSearchEngine(
93-
WikibaseRepo::getMatchingTermsLookupFactory( $services )
94-
->getLookupForSource( WikibaseRepo::getLocalEntitySource( $services ) ),
95-
WikibaseRepo::getEntityLookup( $services ),
96-
new TermRetriever( WikibaseRepo::getFallbackLabelDescriptionLookupFactory( $services ), $services->getLanguageFactory() ),
97-
WikibaseRepo::getLanguageFallbackChainFactory( $services )
98-
);
99-
100-
return $searchEngine;
101-
},
102-
10379
'WbSearch.SimpleItemSearch' => function( MediaWikiServices $services ): SimpleItemSearch {
10480
return new SimpleItemSearch(
10581
new SimpleItemSearchValidator( WbSearch::getLanguageCodeValidator( $services ) ),
106-
WbSearch::getSearchEngine( $services )
82+
WbSearch::getInLabelSearchEngine( $services )
10783
);
10884
},
10985

11086
'WbSearch.SimplePropertySearch' => function( MediaWikiServices $services ): SimplePropertySearch {
11187
$validator = new SimplePropertySearchValidator( WbSearch::getLanguageCodeValidator( $services ) );
11288

113-
return new SimplePropertySearch( $validator, WbSearch::getSearchEngine( $services )
89+
return new SimplePropertySearch( $validator, WbSearch::getInLabelSearchEngine( $services )
11490
);
11591
},
11692

repo/domains/search/src/WbSearch.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Wikibase\Repo\Domains\Search\Application\UseCases\SimplePropertySearch\SimplePropertySearch;
1111
use Wikibase\Repo\Domains\Search\Application\Validation\SearchLanguageValidator;
1212
use Wikibase\Repo\Domains\Search\Infrastructure\DataAccess\InLabelSearchEngine;
13-
use Wikibase\Repo\Domains\Search\Infrastructure\DataAccess\SqlTermStoreSearchEngine;
1413
use Wikibase\Repo\RestApi\Middleware\MiddlewareHandler;
1514
use Wikibase\Repo\RestApi\Middleware\UnexpectedErrorHandlerMiddleware;
1615

@@ -35,13 +34,6 @@ public static function getLanguageCodeValidator( ?ContainerInterface $services =
3534
return ( $services ?: MediaWikiServices::getInstance() )->get( 'WbSearch.LanguageCodeValidator' );
3635
}
3736

38-
/**
39-
* @return InLabelSearchEngine|SqlTermStoreSearchEngine
40-
*/
41-
public static function getSearchEngine( ?ContainerInterface $services = null ) {
42-
return ( $services ?: MediaWikiServices::getInstance() )->get( 'WbSearch.SearchEngine' );
43-
}
44-
4537
public static function getMiddlewareHandler( ?ContainerInterface $services = null ): MiddlewareHandler {
4638
return ( $services ?: MediaWikiServices::getInstance() )->get( 'WbSearch.MiddlewareHandler' );
4739
}

0 commit comments

Comments
 (0)