DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/389682 )
Change subject: [cleanup] Remove MultiSearch backport ...................................................................... [cleanup] Remove MultiSearch backport This removes backport for https://github.com/ruflin/Elastica/pull/1224 which is no longer needed. Change-Id: I8a41aa4e3af33c980c80e5994241a6bb86ad73a0 --- M autoload.php M includes/BuildDocument/RedirectsAndIncomingLinks.php D includes/Elastica/MultiSearch.php M includes/OtherIndexes.php M includes/Searcher.php M maintenance/updateSuggesterIndex.php 6 files changed, 4 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/82/389682/1 diff --git a/autoload.php b/autoload.php index 77c95f1..bdbd894 100644 --- a/autoload.php +++ b/autoload.php @@ -39,7 +39,6 @@ 'CirrusSearch\\Dump' => __DIR__ . '/includes/Dump.php', 'CirrusSearch\\ElasticaErrorHandler' => __DIR__ . '/includes/ElasticaErrorHandler.php', 'CirrusSearch\\Elastica\\LtrQuery' => __DIR__ . '/includes/Elastica/LtrQuery.php', - 'CirrusSearch\\Elastica\\MultiSearch' => __DIR__ . '/includes/Elastica/MultiSearch.php', 'CirrusSearch\\Elastica\\PooledHttp' => __DIR__ . '/includes/Elastica/PooledHttp.php', 'CirrusSearch\\Elastica\\PooledHttps' => __DIR__ . '/includes/Elastica/PooledHttps.php', 'CirrusSearch\\Elastica\\ReindexRequest' => __DIR__ . '/includes/Elastica/ReindexRequest.php', diff --git a/includes/BuildDocument/RedirectsAndIncomingLinks.php b/includes/BuildDocument/RedirectsAndIncomingLinks.php index b61e818..67d52e8 100644 --- a/includes/BuildDocument/RedirectsAndIncomingLinks.php +++ b/includes/BuildDocument/RedirectsAndIncomingLinks.php @@ -6,8 +6,8 @@ use CirrusSearch\SearchConfig; use CirrusSearch\SearchRequestLog; use CirrusSearch\Connection; -use CirrusSearch\Elastica\MultiSearch as MultiSearch; use CirrusSearch\Search\CirrusIndexField; +use Elastica\Multi\Search as MultiSearch; use Elastica\Query\BoolQuery; use Elastica\Query\Terms; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/Elastica/MultiSearch.php b/includes/Elastica/MultiSearch.php deleted file mode 100644 index bbf4282..0000000 --- a/includes/Elastica/MultiSearch.php +++ /dev/null @@ -1,33 +0,0 @@ -<?php - -namespace CirrusSearch\Elastica; - -/** - * backport for https://github.com/ruflin/Elastica/pull/1224 - */ -class MultiSearch extends \Elastica\Multi\Search { - /** - * @param \Elastica\Search $search - * - * @return string - */ - protected function _getSearchData( \Elastica\Search $search ) { - $header = $this->_getSearchDataHeader( $search ); - $header = empty( $header ) ? new \stdClass() : $header; - $query = $search->getQuery(); - $toKeep = [ - 'index' => true, - 'types' => true, - 'search_type' => true, - 'routing' => true, - 'preference' => true, - ]; - $queryOptions = array_diff_key( $header, $toKeep ); - $actualHeader = array_intersect_key( $header, $toKeep ); - - $data = \Elastica\JSON::stringify( $actualHeader )."\n"; - $queryBody = $query->toArray() + $queryOptions; - $data .= \Elastica\JSON::stringify( $queryBody )."\n"; - return $data; - } -} diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php index 075af0c..d2782e1 100644 --- a/includes/OtherIndexes.php +++ b/includes/OtherIndexes.php @@ -3,7 +3,7 @@ namespace CirrusSearch; use MediaWiki\Logger\LoggerFactory; -use CirrusSearch\Elastica\MultiSearch as MultiSearch; +use Elastica\Multi\Search as MultiSearch; use Title; /** diff --git a/includes/Searcher.php b/includes/Searcher.php index 80a9c0d..20a28e7 100644 --- a/includes/Searcher.php +++ b/includes/Searcher.php @@ -12,8 +12,8 @@ use CirrusSearch\Search\ResultSet; use CirrusSearch\Search\TeamDraftInterleaver; use CirrusSearch\Query\FullTextQueryBuilder; -use CirrusSearch\Elastica\MultiSearch as MultiSearch; use Elastica\Exception\RuntimeException; +use Elastica\Multi\Search as MultiSearch; use Elastica\Query\BoolQuery; use Elastica\Query\MultiMatch; use Elastica\Search; diff --git a/maintenance/updateSuggesterIndex.php b/maintenance/updateSuggesterIndex.php index b01d603..272132d 100644 --- a/maintenance/updateSuggesterIndex.php +++ b/maintenance/updateSuggesterIndex.php @@ -12,9 +12,9 @@ use CirrusSearch\BuildDocument\Completion\SuggestScoringMethod; use CirrusSearch\Maintenance\Validators\AnalyzersValidator; use CirrusSearch\SearchConfig; -use CirrusSearch\Elastica\MultiSearch as MultiSearch; use Elastica; use Elastica\Index; +use Elastica\Multi\Search as MultiSearch; use Elastica\Query; use Elastica\Request; use Elastica\Status; -- To view, visit https://gerrit.wikimedia.org/r/389682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a41aa4e3af33c980c80e5994241a6bb86ad73a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: DCausse <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
