jenkins-bot has submitted this change and it was merged.

Change subject: [cirrus] Activate BM25 on top 10 wikis: Step 1
......................................................................


[cirrus] Activate BM25 on top 10 wikis: Step 1

Add options needed to customize query builders, rescore profiles and
similarity.
Only similarity config is activated (needed to run a reindex).

Bug: T147508
Change-Id: Icd0c6ce182637e95880434983e15d764c7072b66
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 59 insertions(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 20271f0..fe07079 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -140,13 +140,17 @@
 $wgCirrusSearchReplicas = $wmgCirrusSearchReplicas;
 $wgCirrusSearchMaxShardsPerNode = $wmgCirrusSearchMaxShardsPerNode;
 $wgCirrusSearchPreferRecentDefaultDecayPortion = 
$wmgCirrusSearchPreferRecentDefaultDecayPortion;
-$wgCirrusSearchBoostLinks = $wmgCirrusSearchBoostLinks;
 $wgCirrusSearchWeights = array_merge( $wgCirrusSearchWeights, 
$wmgCirrusSearchWeightsOverrides );
 $wgCirrusSearchPowerSpecialRandom = $wmgCirrusSearchPowerSpecialRandom;
 $wgCirrusSearchAllFields = $wmgCirrusSearchAllFields;
 $wgCirrusSearchNamespaceWeights = $wmgCirrusSearchNamespaceWeightOverrides +
        $wgCirrusSearchNamespaceWeights;
 
+$wgCirrusSimilarityProfile = $wmgCirrusSimilarityProfile;
+$wgCirrusSearchRescoreProfile = $wmgCirrusSearchRescoreProfile;
+$wgCirrusSearchFullTextQueryBuilderProfile = 
$wmgCirrusSearchFullTextQueryBuilderProfile;
+$wgCirrusSearchIgnoreOnWikiBoostTemplates = 
$wmgCirrusSearchIgnoreOnWikiBoostTemplates;
+
 // We had an incident of filling up the entire clusters redis instances after
 // 6 hours, half of that seems reasonable.
 $wgCirrusSearchDropDelayedJobsAfter = 60 * 60 * 3;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e174ebe..ac4e25e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16618,6 +16618,7 @@
        'wikinews' => .6,
 ],
 
+// TODO: remove (handled by wmgCirrusSearchRescoreProfile)
 'wmgCirrusSearchBoostLinks' => [
        'default' => true,
        'commonswiki' => false,
@@ -16634,6 +16635,59 @@
        'default' => false,
 ],
 
+'wmgCirrusSimilarityProfile' => [
+       'default' => 'default',
+       'enwiki' => 'wmf_defaults',
+       'arwiki' => 'wmf_defaults',
+       'dewiki' => 'wmf_defaults',
+       'eswiki' => 'wmf_defaults',
+       'frwiki' => 'wmf_defaults',
+       'itwiki' => 'wmf_defaults',
+       'nlwiki' => 'wmf_defaults',
+       'ruwiki' => 'wmf_defaults',
+       'plwiki' => 'wmf_defaults',
+       'ptwiki' => 'wmf_defaults',
+],
+
+'wmgCirrusSearchRescoreProfile' => [
+       'default' => 'classic',
+       'commonswiki' => 'classic_noboostlinks',
+       // TODO: switch to wsum_inclinks_pv
+       'enwiki' => 'classic',
+       // TODO: switch to wsum_inclinks
+       'arwiki' => 'classic',
+       'dewiki' => 'classic',
+       'eswiki' => 'classic',
+       'frwiki' => 'classic',
+       'itwiki' => 'classic',
+       'nlwiki' => 'classic',
+       'ruwiki' => 'classic',
+       'plwiki' => 'classic',
+       'ptwiki' => 'classic',
+],
+
+'wmgCirrusSearchFullTextQueryBuilderProfile' => [
+       'default' => 'default',
+       // TODO: switch to perfield_builder
+       'enwiki' => 'default',
+       'arwiki' => 'default',
+       'dewiki' => 'default',
+       'eswiki' => 'default',
+       'frwiki' => 'default',
+       'itwiki' => 'default',
+       'nlwiki' => 'default',
+       'ruwiki' => 'default',
+       'plwiki' => 'default',
+       'ptwiki' => 'default',
+],
+
+'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
+       'default' => false,
+       // TODO: turn on (on wiki boost templates have to high boosts for
+       // enwiki)
+       'enwiki' => false,
+],
+
 // Shard each wiki to be under 2gb per shard if possible.  Changing this for a 
wiki
 // requires an in place reindex.  Last full review 2014-07-01.  See
 // 
https://wikitech.wikimedia.org/wiki/Search/New#Estimating_the_number_of_shards_required

-- 
To view, visit https://gerrit.wikimedia.org/r/315297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd0c6ce182637e95880434983e15d764c7072b66
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to