DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386200 )
Change subject: Remove SearchContext::mergeRescore
......................................................................
Remove SearchContext::mergeRescore
Change-Id: Ia88ff2e695143923a660515c2e867e11fbba7b32
---
M includes/Search/SearchContext.php
1 file changed, 0 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/00/386200/1
diff --git a/includes/Search/SearchContext.php
b/includes/Search/SearchContext.php
index af9a6e1..e6ec666 100644
--- a/includes/Search/SearchContext.php
+++ b/includes/Search/SearchContext.php
@@ -69,13 +69,6 @@
private $rescoreProfile;
/**
- * @deprecated
- * @var array Set of rescore configurations as used by elasticsearch.
The query needs
- * to be an Elastica query.
- */
- private $rescore = [];
-
- /**
* @var FunctionScoreBuilder[] Extra scoring builders to use.
*/
private $extraScoreBuilders = [];
@@ -618,17 +611,6 @@
}
/**
- * @param array[] $rescores A set of rescore configurations as used by
elasticsearch. The
- * query needs to be an Elastica query.
- * @deprecated don't try to assemble rescore queries like that. Build
profiles and use
- * setRescoreProfile.
- */
- public function mergeRescore( $rescores ) {
- $this->isDirty = true;
- $this->rescore = array_merge( $this->rescore, $rescores );
- }
-
- /**
* rescore_query has to be in array form before we send it to
Elasticsearch but it is way
* easier to work with if we leave it in query form until now
*
@@ -640,12 +622,6 @@
foreach ( $rescores as $rescore ) {
$rescore['query']['rescore_query'] =
$rescore['query']['rescore_query']->toArray();
$result[] = $rescore;
- }
-
- /** @suppress PhanDeprecatedProperty to be removed soon */
- foreach ( $this->rescore as $additional ) {
- $additional['query']['rescore_query'] =
$additional['query']['rescore_query']->toArray();
- $result[] = $additional;
}
return $result;
--
To view, visit https://gerrit.wikimedia.org/r/386200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia88ff2e695143923a660515c2e867e11fbba7b32
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
