jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372154 )
Change subject: Apply token count limits to phrase queries on all wikis
......................................................................
Apply token count limits to phrase queries on all wikis
Bug: T172653
Change-Id: Icd35de974f6fa3ab73820ba8af3c101aab62ce70
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 6215815..bc38665 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -86,13 +86,8 @@
'super_detect_noop' => true,
'id_hash_mod_filter' => true,
'documentVersion' => true,
+ 'token_count_router' => true,
];
-
-# Investigate T169498, only activate token_count_router for spaceless
languages with sane
-# analysis chain and the perfield_builder ft builder.
-if ( $wgLanguageCode === 'zh' ) {
- $wgCirrusSearchWikimediaExtraPlugin['token_count_router'] = true;
-}
# Enable the "experimental" highlighter on all wikis
$wgCirrusSearchUseExperimentalHighlighter = true;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 76f2d8e..fdfcccf 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18393,12 +18393,11 @@
],
// @} end of wmgCirrusSearchRecycleCompletionSuggesterIndex
-// Disable phrase rescore on zh queries with too many tokens.
+// Disable phrase rescore on queries with too many tokens.
// Bandaid for T169498, should be removed when a proper
// fix is determined
'wmgCirrusSearchMaxPhraseTokens' => [
- 'default' => 'null',
- 'zh' => 10,
+ 'default' => 10,
],
// Configure ICU Folding, 'default': controlled by cirrus
--
To view, visit https://gerrit.wikimedia.org/r/372154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd35de974f6fa3ab73820ba8af3c101aab62ce70
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
