DCausse has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/313813

Change subject: Add relforge settings with wp10 and defaultsort
......................................................................

Add relforge settings with wp10 and defaultsort

Change-Id: Ia2cf519752bc5cc3895b1cf4bd0b667db0851e71
---
M tests/relforge/RelForgeSettings.php
A tests/relforge/en-wp-bm25-wp10-normal-sugg/ftbuilder.inc
A tests/relforge/en-wp-bm25-wp10-normal-sugg/misc.inc
A tests/relforge/en-wp-bm25-wp10-normal-sugg/rescore.inc
A tests/relforge/en-wp-bm25-wp10-normal-sugg/similarity.inc
A tests/relforge/en-wp-bm25-wp10-normal-sugg/templates.inc
A tests/relforge/en-wp-bm25-wp10/ftbuilder.inc
A tests/relforge/en-wp-bm25-wp10/misc.inc
A tests/relforge/en-wp-bm25-wp10/rescore.inc
A tests/relforge/en-wp-bm25-wp10/similarity.inc
A tests/relforge/en-wp-bm25-wp10/templates.inc
A tests/relforge/en-wp-sugg-defaultsort/misc.inc
12 files changed, 711 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/13/313813/1

diff --git a/tests/relforge/RelForgeSettings.php 
b/tests/relforge/RelForgeSettings.php
index 975e43e..1973498 100644
--- a/tests/relforge/RelForgeSettings.php
+++ b/tests/relforge/RelForgeSettings.php
@@ -24,6 +24,14 @@
 // We don't use DFS in prod
 $wgCirrusSearchMoreAccurateScoringMode = false;
 
+// subphrase is not enabled by default on prod
+$wgCirrusSearchCompletionSuggesterSubphrases = [
+       'use' => false,
+       'build' => false,
+       'type' => 'subpages',
+       'limit' => 3,
+];
+
 
 // Specific settings
 if ( file_exists( __DIR__ . "/$wgCirrusSearchRelforgeProfile/misc.inc" ) ) {
diff --git a/tests/relforge/en-wp-bm25-wp10-normal-sugg/ftbuilder.inc 
b/tests/relforge/en-wp-bm25-wp10-normal-sugg/ftbuilder.inc
new file mode 100644
index 0000000..6f5c159
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10-normal-sugg/ftbuilder.inc
@@ -0,0 +1,39 @@
+<?php
+
+$wgCirrusSearchFullTextQueryBuilderProfiles['relforge'] = array(
+       'builder_class' => 
\CirrusSearch\Query\FullTextSimpleMatchQueryBuilder::class,
+       'settings' => array(
+               'default_min_should_match' => '1',
+               'default_query_type' => 'most_fields',
+               'default_stem_weight' => 3.0,
+               'fields' => array(
+                       'title' => 0.3,
+                       'redirect.title' => array(
+                               'boost' => 0.27,
+                               'in_dismax' => 'redirects_or_shingles'
+                       ),
+                       'suggest' => array(
+                               'is_plain' => true,
+                               'boost' => 0.20,
+                               'in_dismax' => 'redirects_or_shingles',
+                       ),
+                       'category' => 0.05,
+                       'heading' => 0.05,
+                       'text' => array(
+                               'boost' => 0.6,
+                               'in_dismax' => 'text_and_opening_text',
+                       ),
+                       'opening_text' => array(
+                               'boost' => 0.5,
+                               'in_dismax' => 'text_and_opening_text',
+                       ),
+                       'auxiliary_text' => 0.05,
+                       'file_text' => 0.5,
+               ),
+               'phrase_rescore_fields' => array(
+                       // very low (don't forget it's multiplied by 10 by 
default)
+                       'all' => 0.03,
+                       'all.plain' => 0.05,
+               ),
+       )
+);
diff --git a/tests/relforge/en-wp-bm25-wp10-normal-sugg/misc.inc 
b/tests/relforge/en-wp-bm25-wp10-normal-sugg/misc.inc
new file mode 100644
index 0000000..d8d4bbb
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10-normal-sugg/misc.inc
@@ -0,0 +1,21 @@
+<?php
+// 7 shards for enwiki
+$wgCirrusSearchShardCount = array( 'content' => 7, 'general' => 4, 
'titlesuggest' => 4 );
+$wgLanguagecode = 'en';
+$wgCirrusSearchIndexBaseName = 'enwikibm25wp10normalsugg';
+$wgCirrusSearchPhraseSuggestReverseField['use'] = false;
+
+$wgCirrusSearchCompletionSuggesterUseDefaultSort = false;
+
+$wgCirrusSearchCompletionSuggesterSubphrases = [
+       'use' => false,
+       'build' => false,
+       'type' => 'subpages',
+       'limit' => 3,
+];
+
+$wgHooks['CirrusSearchMappingConfig'][] = function( array &$config, 
$mappingConfigBuilder ) {
+        $config['page']['properties']['wp10'] = [
+                'type' => 'double',
+        ];
+};
diff --git a/tests/relforge/en-wp-bm25-wp10-normal-sugg/rescore.inc 
b/tests/relforge/en-wp-bm25-wp10-normal-sugg/rescore.inc
new file mode 100644
index 0000000..821e3cf
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10-normal-sugg/rescore.inc
@@ -0,0 +1,156 @@
+<?php
+
+
+
+// w sum with pageviews and inc links
+$CirrusSearchWP10W = 3;
+$wgCirrusSearchPageViewsW = 3;//0.;//2.5;
+$wgCirrusSearchPageViewsK = 8E-6;
+$wgCirrusSearchPageViewsA = 0.8;
+
+$wgCirrusSearchIncLinksW = 5.0;//0.7;
+$wgCirrusSearchIncLinksK = 30;
+$wgCirrusSearchIncLinksA = 0.7;
+
+// w sum with inc links alone (fallback with non content ns)
+$wgCirrusSearchIncLinksAloneW = 7;
+$wgCirrusSearchIncLinksAloneK = 30;
+$wgCirrusSearchIncLinksAloneA = 0.7;
+
+$wgCirrusSearchRescoreProfiles['relforge'] = array(
+       'supported_namespaces' => 'all',
+       'fallback_profile' => 'relforge_inclinks',
+       'rescore' => array(
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'total',
+                       'type' => 'function_score',
+                       'function_chain' => 'wsum_pv_inclinks_wp10'
+               ),
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'multiply',
+                       'type' => 'function_score',
+                       'function_chain' => 'optional_chain'
+               ),
+       ),
+);
+
+
+$wgCirrusSearchRescoreProfiles['relforge_inclinks'] = array(
+       'supported_namespaces' => 'all',
+       'rescore' => array(
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'total',
+                       'type' => 'function_score',
+                       'function_chain' => 'wsum_inclinks'
+               ),
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'multiply',
+                       'type' => 'function_score',
+                       'function_chain' => 'optional_chain'
+               ),
+       ),
+);
+
+$wgCirrusSearchRescoreFunctionScoreChains['wsum_pv_inclinks_wp10'] = array(
+       'score_mode' => 'sum',
+       'boost_mode' => 'sum',
+       'functions' => array(
+               array(
+                       'type' => 'satu',
+                       'weight' => array(
+                               'value' => 1.8,
+                               'config_override' => 'CirrusSearchPageViewsW',
+                               'uri_param_override' => 'cirrusPageViewsW',
+                       ),
+                       'params' => array(
+                               'field' => 'popularity_score',
+                               'k' => array(
+                                       'value' => 0.0000007,
+                                       'config_override' => 
'CirrusSearchPageViewsK',
+                                       'uri_param_override' => 
'cirrusPageViewsK',
+                               ),
+                               'a' => array(
+                                       'value' => 1,
+                                       'config_override' => 
'CirrusSearchPageViewsA',
+                                       'uri_param_override' => 
'cirrusPageViewsA',
+                               ),
+                       ),
+               ),
+               array(
+                       'type' => 'satu',
+                       'weight' => array(
+                               'value' => 0.6,
+                               'config_override' => 'CirrusSearchIncLinksW',
+                               'uri_param_override' => 'cirrusIncLinksW',
+                       ),
+                       'params' => array(
+                               'field' => 'incoming_links',
+                               'k' => array(
+                                       'value' => 10,
+                                       'config_override' => 
'CirrusSearchIncLinksK',
+                                       'uri_param_override' => 
'cirrusIncLinksK',
+                               ),
+                               'a' => array(
+                                       'value' => 1,
+                                       'config_override' => 
'CirrusSearchIncLinksA',
+                                       'uri_param_override' => 
'cirrusIncLinksA',
+                               ),
+                       ),
+               ),
+               array(
+                       'type' => 'custom_field',
+                       'weight' => array(
+                               'value' => 0.6,
+                               'config_override' => 'CirrusSearchWP10W',
+                               'uri_param_override' => 'cirrusWP10W',
+                       ),
+                       'params' => array(
+                               'field' => 'wp10',
+                               'modifier' => 'none',
+                               'missing' => 0,
+                       ),
+               ),
+       ),
+);
+
+$wgCirrusSearchRescoreFunctionScoreChains['wsum_inclinks'] = array(
+       'functions' => array(
+               array(
+                       'type' => 'satu',
+                       'params' => array(
+                               'field' => 'incoming_links',
+                               'weight' => array(
+                                       'value' => 1.2,
+                                       'config_override' => 
'CirrusSearchIncLinksAloneW',
+                                       'uri_param_override' => 
'cirrusIncLinksAloneW',
+                               ),
+                               'k' => array(
+                                       'value' => 10,
+                                       'config_override' => 
'CirrusSearchIncLinksAloneK',
+                                       'uri_param_override' => 
'cirrusIncLinksAloneK',
+                               ),
+                               'a' => array(
+                                       'value' => 1,
+                                       'config_override' => 
'CirrusSearchIncLinksAloneA',
+                                       'uri_param_override' => 
'cirrusIncLinksAloneA',
+                               ),
+                       ),
+               ),
+       ),
+);
diff --git a/tests/relforge/en-wp-bm25-wp10-normal-sugg/similarity.inc 
b/tests/relforge/en-wp-bm25-wp10-normal-sugg/similarity.inc
new file mode 100644
index 0000000..e17d352
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10-normal-sugg/similarity.inc
@@ -0,0 +1,116 @@
+<?php
+
+$wgCirrusSearchSimilarityProfiles['relforge'] = array(
+       'similarity' => array(
+               'default' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'title' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'title_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'opening_text' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'opening_text_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'auxiliary_text' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'auxiliary_text_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'category' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'category_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'redirect' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'redirect_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'heading' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'heading_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'suggest' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'text' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'text_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'all' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'all_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+       ),
+       'fields' => array(
+               '__default__' => 'text',
+               // Field specific config
+               'opening_text' => 'opening_text',
+               'opening_text.plain' => 'opening_text_plain',
+               'category' => 'category',
+               'category.plain' => 'category_plain',
+               'title' => 'title',
+               'title.plain' => 'title_plain',
+               'redirect' => 'redirect',
+               'redirect.plain' => 'redirect_plain',
+               'text' => 'text',
+               'text.plain' => 'text_plain',
+               'all' => 'all',
+               'all.plain' => 'all_plain',
+               'heading' => 'heading',
+               'heading.plain' => 'heading_plain',
+               'suggest' => 'suggest',
+       ),
+);
+
diff --git a/tests/relforge/en-wp-bm25-wp10-normal-sugg/templates.inc 
b/tests/relforge/en-wp-bm25-wp10-normal-sugg/templates.inc
new file mode 100644
index 0000000..abeae11
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10-normal-sugg/templates.inc
@@ -0,0 +1,13 @@
+<?php
+
+$wgCirrusSearchBoostTemplates = [
+/*
+These templates does not seem to bring better scores with discernatron data...
+       'Template:Featured article' => 1,//1.25,
+       'Template:Featured picture' => 1,//1.25,
+       'Template:Featured_sound' => 1,//1.25,
+       'Template:Featured_list' => 1,//1.15,
+       'Template:Good_article' => 1,//1.1,
+*/
+];
+$wgCirrusSearchIgnoreOnWikiBoostTemplates = true;
diff --git a/tests/relforge/en-wp-bm25-wp10/ftbuilder.inc 
b/tests/relforge/en-wp-bm25-wp10/ftbuilder.inc
new file mode 100644
index 0000000..6f5c159
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10/ftbuilder.inc
@@ -0,0 +1,39 @@
+<?php
+
+$wgCirrusSearchFullTextQueryBuilderProfiles['relforge'] = array(
+       'builder_class' => 
\CirrusSearch\Query\FullTextSimpleMatchQueryBuilder::class,
+       'settings' => array(
+               'default_min_should_match' => '1',
+               'default_query_type' => 'most_fields',
+               'default_stem_weight' => 3.0,
+               'fields' => array(
+                       'title' => 0.3,
+                       'redirect.title' => array(
+                               'boost' => 0.27,
+                               'in_dismax' => 'redirects_or_shingles'
+                       ),
+                       'suggest' => array(
+                               'is_plain' => true,
+                               'boost' => 0.20,
+                               'in_dismax' => 'redirects_or_shingles',
+                       ),
+                       'category' => 0.05,
+                       'heading' => 0.05,
+                       'text' => array(
+                               'boost' => 0.6,
+                               'in_dismax' => 'text_and_opening_text',
+                       ),
+                       'opening_text' => array(
+                               'boost' => 0.5,
+                               'in_dismax' => 'text_and_opening_text',
+                       ),
+                       'auxiliary_text' => 0.05,
+                       'file_text' => 0.5,
+               ),
+               'phrase_rescore_fields' => array(
+                       // very low (don't forget it's multiplied by 10 by 
default)
+                       'all' => 0.03,
+                       'all.plain' => 0.05,
+               ),
+       )
+);
diff --git a/tests/relforge/en-wp-bm25-wp10/misc.inc 
b/tests/relforge/en-wp-bm25-wp10/misc.inc
new file mode 100644
index 0000000..9e19b1a
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10/misc.inc
@@ -0,0 +1,21 @@
+<?php
+// 7 shards for enwiki
+$wgCirrusSearchShardCount = array( 'content' => 7, 'general' => 4, 
'titlesuggest' => 4 );
+$wgLanguagecode = 'en';
+$wgCirrusSearchIndexBaseName = 'enwikibm25wp10';
+$wgCirrusSearchPhraseSuggestReverseField['use'] = false;
+
+$wgCirrusSearchCompletionSuggesterUseDefaultSort = true;
+
+$wgCirrusSearchCompletionSuggesterSubphrases = [
+       'use' => false,
+       'build' => false,
+       'type' => 'subpages',
+       'limit' => 3,
+];
+
+$wgHooks['CirrusSearchMappingConfig'][] = function( array &$config, 
$mappingConfigBuilder ) {
+        $config['page']['properties']['wp10'] = [
+                'type' => 'double',
+        ];
+};
diff --git a/tests/relforge/en-wp-bm25-wp10/rescore.inc 
b/tests/relforge/en-wp-bm25-wp10/rescore.inc
new file mode 100644
index 0000000..821e3cf
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10/rescore.inc
@@ -0,0 +1,156 @@
+<?php
+
+
+
+// w sum with pageviews and inc links
+$CirrusSearchWP10W = 3;
+$wgCirrusSearchPageViewsW = 3;//0.;//2.5;
+$wgCirrusSearchPageViewsK = 8E-6;
+$wgCirrusSearchPageViewsA = 0.8;
+
+$wgCirrusSearchIncLinksW = 5.0;//0.7;
+$wgCirrusSearchIncLinksK = 30;
+$wgCirrusSearchIncLinksA = 0.7;
+
+// w sum with inc links alone (fallback with non content ns)
+$wgCirrusSearchIncLinksAloneW = 7;
+$wgCirrusSearchIncLinksAloneK = 30;
+$wgCirrusSearchIncLinksAloneA = 0.7;
+
+$wgCirrusSearchRescoreProfiles['relforge'] = array(
+       'supported_namespaces' => 'all',
+       'fallback_profile' => 'relforge_inclinks',
+       'rescore' => array(
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'total',
+                       'type' => 'function_score',
+                       'function_chain' => 'wsum_pv_inclinks_wp10'
+               ),
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'multiply',
+                       'type' => 'function_score',
+                       'function_chain' => 'optional_chain'
+               ),
+       ),
+);
+
+
+$wgCirrusSearchRescoreProfiles['relforge_inclinks'] = array(
+       'supported_namespaces' => 'all',
+       'rescore' => array(
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'total',
+                       'type' => 'function_score',
+                       'function_chain' => 'wsum_inclinks'
+               ),
+               array(
+                       'window' => 8192,
+                       'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+                       'query_weight' => 1.0,
+                       'rescore_query_weight' => 1.0,
+                       'score_mode' => 'multiply',
+                       'type' => 'function_score',
+                       'function_chain' => 'optional_chain'
+               ),
+       ),
+);
+
+$wgCirrusSearchRescoreFunctionScoreChains['wsum_pv_inclinks_wp10'] = array(
+       'score_mode' => 'sum',
+       'boost_mode' => 'sum',
+       'functions' => array(
+               array(
+                       'type' => 'satu',
+                       'weight' => array(
+                               'value' => 1.8,
+                               'config_override' => 'CirrusSearchPageViewsW',
+                               'uri_param_override' => 'cirrusPageViewsW',
+                       ),
+                       'params' => array(
+                               'field' => 'popularity_score',
+                               'k' => array(
+                                       'value' => 0.0000007,
+                                       'config_override' => 
'CirrusSearchPageViewsK',
+                                       'uri_param_override' => 
'cirrusPageViewsK',
+                               ),
+                               'a' => array(
+                                       'value' => 1,
+                                       'config_override' => 
'CirrusSearchPageViewsA',
+                                       'uri_param_override' => 
'cirrusPageViewsA',
+                               ),
+                       ),
+               ),
+               array(
+                       'type' => 'satu',
+                       'weight' => array(
+                               'value' => 0.6,
+                               'config_override' => 'CirrusSearchIncLinksW',
+                               'uri_param_override' => 'cirrusIncLinksW',
+                       ),
+                       'params' => array(
+                               'field' => 'incoming_links',
+                               'k' => array(
+                                       'value' => 10,
+                                       'config_override' => 
'CirrusSearchIncLinksK',
+                                       'uri_param_override' => 
'cirrusIncLinksK',
+                               ),
+                               'a' => array(
+                                       'value' => 1,
+                                       'config_override' => 
'CirrusSearchIncLinksA',
+                                       'uri_param_override' => 
'cirrusIncLinksA',
+                               ),
+                       ),
+               ),
+               array(
+                       'type' => 'custom_field',
+                       'weight' => array(
+                               'value' => 0.6,
+                               'config_override' => 'CirrusSearchWP10W',
+                               'uri_param_override' => 'cirrusWP10W',
+                       ),
+                       'params' => array(
+                               'field' => 'wp10',
+                               'modifier' => 'none',
+                               'missing' => 0,
+                       ),
+               ),
+       ),
+);
+
+$wgCirrusSearchRescoreFunctionScoreChains['wsum_inclinks'] = array(
+       'functions' => array(
+               array(
+                       'type' => 'satu',
+                       'params' => array(
+                               'field' => 'incoming_links',
+                               'weight' => array(
+                                       'value' => 1.2,
+                                       'config_override' => 
'CirrusSearchIncLinksAloneW',
+                                       'uri_param_override' => 
'cirrusIncLinksAloneW',
+                               ),
+                               'k' => array(
+                                       'value' => 10,
+                                       'config_override' => 
'CirrusSearchIncLinksAloneK',
+                                       'uri_param_override' => 
'cirrusIncLinksAloneK',
+                               ),
+                               'a' => array(
+                                       'value' => 1,
+                                       'config_override' => 
'CirrusSearchIncLinksAloneA',
+                                       'uri_param_override' => 
'cirrusIncLinksAloneA',
+                               ),
+                       ),
+               ),
+       ),
+);
diff --git a/tests/relforge/en-wp-bm25-wp10/similarity.inc 
b/tests/relforge/en-wp-bm25-wp10/similarity.inc
new file mode 100644
index 0000000..e17d352
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10/similarity.inc
@@ -0,0 +1,116 @@
+<?php
+
+$wgCirrusSearchSimilarityProfiles['relforge'] = array(
+       'similarity' => array(
+               'default' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'title' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'title_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'opening_text' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'opening_text_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'auxiliary_text' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'auxiliary_text_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'category' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'category_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'redirect' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'redirect_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'heading' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'heading_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'suggest' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.3,
+               ),
+               'text' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'text_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'all' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+               'all_plain' => array(
+                       'type' => 'BM25',
+                       'k1' => 1.2,
+                       'b' => 0.75,
+               ),
+       ),
+       'fields' => array(
+               '__default__' => 'text',
+               // Field specific config
+               'opening_text' => 'opening_text',
+               'opening_text.plain' => 'opening_text_plain',
+               'category' => 'category',
+               'category.plain' => 'category_plain',
+               'title' => 'title',
+               'title.plain' => 'title_plain',
+               'redirect' => 'redirect',
+               'redirect.plain' => 'redirect_plain',
+               'text' => 'text',
+               'text.plain' => 'text_plain',
+               'all' => 'all',
+               'all.plain' => 'all_plain',
+               'heading' => 'heading',
+               'heading.plain' => 'heading_plain',
+               'suggest' => 'suggest',
+       ),
+);
+
diff --git a/tests/relforge/en-wp-bm25-wp10/templates.inc 
b/tests/relforge/en-wp-bm25-wp10/templates.inc
new file mode 100644
index 0000000..abeae11
--- /dev/null
+++ b/tests/relforge/en-wp-bm25-wp10/templates.inc
@@ -0,0 +1,13 @@
+<?php
+
+$wgCirrusSearchBoostTemplates = [
+/*
+These templates does not seem to bring better scores with discernatron data...
+       'Template:Featured article' => 1,//1.25,
+       'Template:Featured picture' => 1,//1.25,
+       'Template:Featured_sound' => 1,//1.25,
+       'Template:Featured_list' => 1,//1.15,
+       'Template:Good_article' => 1,//1.1,
+*/
+];
+$wgCirrusSearchIgnoreOnWikiBoostTemplates = true;
diff --git a/tests/relforge/en-wp-sugg-defaultsort/misc.inc 
b/tests/relforge/en-wp-sugg-defaultsort/misc.inc
new file mode 100644
index 0000000..63dcd64
--- /dev/null
+++ b/tests/relforge/en-wp-sugg-defaultsort/misc.inc
@@ -0,0 +1,13 @@
+<?php
+// 7 shards for enwiki
+$wgCirrusSearchShardCount = array( 'content' => 1, 'general' => 1, 
'titlesuggest' => 1 );
+$wgLanguagecode = 'en';
+$wgCirrusSearchIndexBaseName = 'mediawikiwikisugsubpages';
+$wgCirrusSearchCompletionSuggesterUseDefaultSort = true;
+
+$wgCirrusSearchCompletionSuggesterSubphrases = [
+       'use' => false,
+       'build' => false,
+       'type' => 'subpages',
+       'limit' => 3,
+];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2cf519752bc5cc3895b1cf4bd0b667db0851e71
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

Reply via email to