Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/348115 )

Change subject: Revert "Workaround OOM issue on ngrams field"
......................................................................

Revert "Workaround OOM issue on ngrams field"

We're moving to 5.3 which is supposed to have the problem fixed,
and skipping 5.2.

This reverts commit 7e98ebd8822c9f241ed19c83db391101ce7a812b.

Change-Id: Ief52b0420fe3ee00f6112828351af3bf281b24df
---
M includes/Maintenance/AnalysisConfigBuilder.php
M includes/Maintenance/MappingConfigBuilder.php
M tests/unit/fixtures/languageAnalysis/ar.expected
M tests/unit/fixtures/languageAnalysis/bg.expected
M tests/unit/fixtures/languageAnalysis/bo.expected
M tests/unit/fixtures/languageAnalysis/bug.expected
M tests/unit/fixtures/languageAnalysis/ca.expected
M tests/unit/fixtures/languageAnalysis/cdo.expected
M tests/unit/fixtures/languageAnalysis/ckb.expected
M tests/unit/fixtures/languageAnalysis/cr.expected
M tests/unit/fixtures/languageAnalysis/cs.expected
M tests/unit/fixtures/languageAnalysis/da.expected
M tests/unit/fixtures/languageAnalysis/de.expected
M tests/unit/fixtures/languageAnalysis/dz.expected
M tests/unit/fixtures/languageAnalysis/el.expected
M tests/unit/fixtures/languageAnalysis/en-ca.expected
M tests/unit/fixtures/languageAnalysis/en-gb.expected
M tests/unit/fixtures/languageAnalysis/en.expected
M tests/unit/fixtures/languageAnalysis/es.expected
M tests/unit/fixtures/languageAnalysis/eu.expected
M tests/unit/fixtures/languageAnalysis/fa.expected
M tests/unit/fixtures/languageAnalysis/fi.expected
M tests/unit/fixtures/languageAnalysis/fr.expected
M tests/unit/fixtures/languageAnalysis/ga.expected
M tests/unit/fixtures/languageAnalysis/gan.expected
M tests/unit/fixtures/languageAnalysis/gl.expected
M tests/unit/fixtures/languageAnalysis/hak.expected
M tests/unit/fixtures/languageAnalysis/he.expected
M tests/unit/fixtures/languageAnalysis/hi.expected
M tests/unit/fixtures/languageAnalysis/hu.expected
M tests/unit/fixtures/languageAnalysis/hy.expected
M tests/unit/fixtures/languageAnalysis/id.expected
M tests/unit/fixtures/languageAnalysis/it.expected
M tests/unit/fixtures/languageAnalysis/ja.expected
M tests/unit/fixtures/languageAnalysis/jv.expected
M tests/unit/fixtures/languageAnalysis/km.expected
M tests/unit/fixtures/languageAnalysis/ko.expected
M tests/unit/fixtures/languageAnalysis/lo.expected
M tests/unit/fixtures/languageAnalysis/lt.expected
M tests/unit/fixtures/languageAnalysis/lv.expected
M tests/unit/fixtures/languageAnalysis/lzh.expected
M tests/unit/fixtures/languageAnalysis/my.expected
M tests/unit/fixtures/languageAnalysis/nan.expected
M tests/unit/fixtures/languageAnalysis/nb.expected
M tests/unit/fixtures/languageAnalysis/nl.expected
M tests/unit/fixtures/languageAnalysis/nn.expected
M tests/unit/fixtures/languageAnalysis/pt-br.expected
M tests/unit/fixtures/languageAnalysis/pt.expected
M tests/unit/fixtures/languageAnalysis/ro.expected
M tests/unit/fixtures/languageAnalysis/ru.expected
M tests/unit/fixtures/languageAnalysis/simple.expected
M tests/unit/fixtures/languageAnalysis/sv.expected
M tests/unit/fixtures/languageAnalysis/th.expected
M tests/unit/fixtures/languageAnalysis/tr.expected
M tests/unit/fixtures/languageAnalysis/uk.expected
M tests/unit/fixtures/languageAnalysis/wuu.expected
M tests/unit/fixtures/languageAnalysis/yue.expected
M tests/unit/fixtures/languageAnalysis/zh-classical.expected
M tests/unit/fixtures/languageAnalysis/zh-min-nan.expected
M tests/unit/fixtures/languageAnalysis/zh-yue.expected
M tests/unit/fixtures/languageAnalysis/zh.expected
61 files changed, 0 insertions(+), 780 deletions(-)


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

diff --git a/includes/Maintenance/AnalysisConfigBuilder.php 
b/includes/Maintenance/AnalysisConfigBuilder.php
index a3e9859..4293550 100644
--- a/includes/Maintenance/AnalysisConfigBuilder.php
+++ b/includes/Maintenance/AnalysisConfigBuilder.php
@@ -396,14 +396,6 @@
                                        'tokenizer' => 'standard',
                                        'filter' => [ 'lowercase', 
'suggest_shingle' ],
                                ],
-                               'suggest_search' => [
-                                       'type' => 'custom',
-                                       'tokenizer' => 'standard',
-                                       // Limit to 30 max tokens, still allow 
queries with 10 words
-                                       // but prevents the match_query to 
explode
-                                       // workaround: 
https://github.com/elastic/elasticsearch/issues/23509
-                                       'filter' => [ 'lowercase', 
'suggest_shingle', 'limit_30' ],
-                               ],
                                'suggest_reverse' => [
                                        'type' => 'custom',
                                        'tokenizer' => 'standard',
@@ -465,10 +457,6 @@
                                        'min_shingle_size' => 2,
                                        'max_shingle_size' => 3,
                                        'output_unigrams' => true,
-                               ],
-                               'limit_30' => [
-                                       'type' => 'limit',
-                                       'max_token_count' => 30,
                                ],
                                'lowercase' => [
                                        'type' => 'lowercase',
diff --git a/includes/Maintenance/MappingConfigBuilder.php 
b/includes/Maintenance/MappingConfigBuilder.php
index 60acaa8..548448d 100644
--- a/includes/Maintenance/MappingConfigBuilder.php
+++ b/includes/Maintenance/MappingConfigBuilder.php
@@ -111,7 +111,6 @@
                        'similarity' => TextIndexField::getSimilarity( 
$this->config, 'suggest' ),
                        'index_options' => 'freqs',
                        'analyzer' => 'suggest',
-                       'search_analyzer' => 'suggest_search',
                ];
 
                if ( $this->config->getElement( 
'CirrusSearchPhraseSuggestReverseField', 'build' ) ) {
diff --git a/tests/unit/fixtures/languageAnalysis/ar.expected 
b/tests/unit/fixtures/languageAnalysis/ar.expected
index 8881a9c..c902e23 100644
--- a/tests/unit/fixtures/languageAnalysis/ar.expected
+++ b/tests/unit/fixtures/languageAnalysis/ar.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/bg.expected 
b/tests/unit/fixtures/languageAnalysis/bg.expected
index 4c42085..ecfcf6e 100644
--- a/tests/unit/fixtures/languageAnalysis/bg.expected
+++ b/tests/unit/fixtures/languageAnalysis/bg.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/bo.expected 
b/tests/unit/fixtures/languageAnalysis/bo.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/bo.expected
+++ b/tests/unit/fixtures/languageAnalysis/bo.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/bug.expected 
b/tests/unit/fixtures/languageAnalysis/bug.expected
index e040b23..930a62e 100644
--- a/tests/unit/fixtures/languageAnalysis/bug.expected
+++ b/tests/unit/fixtures/languageAnalysis/bug.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ca.expected 
b/tests/unit/fixtures/languageAnalysis/ca.expected
index 3299459..12419a4 100644
--- a/tests/unit/fixtures/languageAnalysis/ca.expected
+++ b/tests/unit/fixtures/languageAnalysis/ca.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/cdo.expected 
b/tests/unit/fixtures/languageAnalysis/cdo.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/cdo.expected
+++ b/tests/unit/fixtures/languageAnalysis/cdo.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ckb.expected 
b/tests/unit/fixtures/languageAnalysis/ckb.expected
index 77e393c..df39447 100644
--- a/tests/unit/fixtures/languageAnalysis/ckb.expected
+++ b/tests/unit/fixtures/languageAnalysis/ckb.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/cr.expected 
b/tests/unit/fixtures/languageAnalysis/cr.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/cr.expected
+++ b/tests/unit/fixtures/languageAnalysis/cr.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/cs.expected 
b/tests/unit/fixtures/languageAnalysis/cs.expected
index 36365dd..9e7d92c 100644
--- a/tests/unit/fixtures/languageAnalysis/cs.expected
+++ b/tests/unit/fixtures/languageAnalysis/cs.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/da.expected 
b/tests/unit/fixtures/languageAnalysis/da.expected
index c264489..ef96412 100644
--- a/tests/unit/fixtures/languageAnalysis/da.expected
+++ b/tests/unit/fixtures/languageAnalysis/da.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/de.expected 
b/tests/unit/fixtures/languageAnalysis/de.expected
index 59115e6..7f59740 100644
--- a/tests/unit/fixtures/languageAnalysis/de.expected
+++ b/tests/unit/fixtures/languageAnalysis/de.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/dz.expected 
b/tests/unit/fixtures/languageAnalysis/dz.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/dz.expected
+++ b/tests/unit/fixtures/languageAnalysis/dz.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/el.expected 
b/tests/unit/fixtures/languageAnalysis/el.expected
index 227467d..7ce6462 100644
--- a/tests/unit/fixtures/languageAnalysis/el.expected
+++ b/tests/unit/fixtures/languageAnalysis/el.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase",
diff --git a/tests/unit/fixtures/languageAnalysis/en-ca.expected 
b/tests/unit/fixtures/languageAnalysis/en-ca.expected
index 5fd638b..61883e9 100644
--- a/tests/unit/fixtures/languageAnalysis/en-ca.expected
+++ b/tests/unit/fixtures/languageAnalysis/en-ca.expected
@@ -100,15 +100,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -207,10 +198,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/en-gb.expected 
b/tests/unit/fixtures/languageAnalysis/en-gb.expected
index 5fd638b..61883e9 100644
--- a/tests/unit/fixtures/languageAnalysis/en-gb.expected
+++ b/tests/unit/fixtures/languageAnalysis/en-gb.expected
@@ -100,15 +100,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -207,10 +198,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/en.expected 
b/tests/unit/fixtures/languageAnalysis/en.expected
index 5fd638b..61883e9 100644
--- a/tests/unit/fixtures/languageAnalysis/en.expected
+++ b/tests/unit/fixtures/languageAnalysis/en.expected
@@ -100,15 +100,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -207,10 +198,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/es.expected 
b/tests/unit/fixtures/languageAnalysis/es.expected
index d12c1db..099c1ab 100644
--- a/tests/unit/fixtures/languageAnalysis/es.expected
+++ b/tests/unit/fixtures/languageAnalysis/es.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/eu.expected 
b/tests/unit/fixtures/languageAnalysis/eu.expected
index ce91fa9..866c37c 100644
--- a/tests/unit/fixtures/languageAnalysis/eu.expected
+++ b/tests/unit/fixtures/languageAnalysis/eu.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/fa.expected 
b/tests/unit/fixtures/languageAnalysis/fa.expected
index 593cfd0..122e053 100644
--- a/tests/unit/fixtures/languageAnalysis/fa.expected
+++ b/tests/unit/fixtures/languageAnalysis/fa.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/fi.expected 
b/tests/unit/fixtures/languageAnalysis/fi.expected
index b1a6561..ebcaf4b 100644
--- a/tests/unit/fixtures/languageAnalysis/fi.expected
+++ b/tests/unit/fixtures/languageAnalysis/fi.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/fr.expected 
b/tests/unit/fixtures/languageAnalysis/fr.expected
index c559362..22bdf55 100644
--- a/tests/unit/fixtures/languageAnalysis/fr.expected
+++ b/tests/unit/fixtures/languageAnalysis/fr.expected
@@ -96,15 +96,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -203,10 +194,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ga.expected 
b/tests/unit/fixtures/languageAnalysis/ga.expected
index 4acd944..2c1ffc5 100644
--- a/tests/unit/fixtures/languageAnalysis/ga.expected
+++ b/tests/unit/fixtures/languageAnalysis/ga.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/gan.expected 
b/tests/unit/fixtures/languageAnalysis/gan.expected
index 3b997e5..b912454 100644
--- a/tests/unit/fixtures/languageAnalysis/gan.expected
+++ b/tests/unit/fixtures/languageAnalysis/gan.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/gl.expected 
b/tests/unit/fixtures/languageAnalysis/gl.expected
index c20428f..396de4d 100644
--- a/tests/unit/fixtures/languageAnalysis/gl.expected
+++ b/tests/unit/fixtures/languageAnalysis/gl.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/hak.expected 
b/tests/unit/fixtures/languageAnalysis/hak.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/hak.expected
+++ b/tests/unit/fixtures/languageAnalysis/hak.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/he.expected 
b/tests/unit/fixtures/languageAnalysis/he.expected
index edd498f..745240c 100644
--- a/tests/unit/fixtures/languageAnalysis/he.expected
+++ b/tests/unit/fixtures/languageAnalysis/he.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/hi.expected 
b/tests/unit/fixtures/languageAnalysis/hi.expected
index c922145..2d0d547 100644
--- a/tests/unit/fixtures/languageAnalysis/hi.expected
+++ b/tests/unit/fixtures/languageAnalysis/hi.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/hu.expected 
b/tests/unit/fixtures/languageAnalysis/hu.expected
index c868656..3456566 100644
--- a/tests/unit/fixtures/languageAnalysis/hu.expected
+++ b/tests/unit/fixtures/languageAnalysis/hu.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/hy.expected 
b/tests/unit/fixtures/languageAnalysis/hy.expected
index bc06d88..6048cf7 100644
--- a/tests/unit/fixtures/languageAnalysis/hy.expected
+++ b/tests/unit/fixtures/languageAnalysis/hy.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/id.expected 
b/tests/unit/fixtures/languageAnalysis/id.expected
index e040b23..930a62e 100644
--- a/tests/unit/fixtures/languageAnalysis/id.expected
+++ b/tests/unit/fixtures/languageAnalysis/id.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/it.expected 
b/tests/unit/fixtures/languageAnalysis/it.expected
index cf70ee7..b4bd91e 100644
--- a/tests/unit/fixtures/languageAnalysis/it.expected
+++ b/tests/unit/fixtures/languageAnalysis/it.expected
@@ -98,15 +98,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -205,10 +196,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ja.expected 
b/tests/unit/fixtures/languageAnalysis/ja.expected
index 4cb2814..9c2d409 100644
--- a/tests/unit/fixtures/languageAnalysis/ja.expected
+++ b/tests/unit/fixtures/languageAnalysis/ja.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/jv.expected 
b/tests/unit/fixtures/languageAnalysis/jv.expected
index e040b23..930a62e 100644
--- a/tests/unit/fixtures/languageAnalysis/jv.expected
+++ b/tests/unit/fixtures/languageAnalysis/jv.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/km.expected 
b/tests/unit/fixtures/languageAnalysis/km.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/km.expected
+++ b/tests/unit/fixtures/languageAnalysis/km.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ko.expected 
b/tests/unit/fixtures/languageAnalysis/ko.expected
index c3a479f..00288e7 100644
--- a/tests/unit/fixtures/languageAnalysis/ko.expected
+++ b/tests/unit/fixtures/languageAnalysis/ko.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/lo.expected 
b/tests/unit/fixtures/languageAnalysis/lo.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/lo.expected
+++ b/tests/unit/fixtures/languageAnalysis/lo.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/lt.expected 
b/tests/unit/fixtures/languageAnalysis/lt.expected
index 653e6a1..f5d58ac 100644
--- a/tests/unit/fixtures/languageAnalysis/lt.expected
+++ b/tests/unit/fixtures/languageAnalysis/lt.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/lv.expected 
b/tests/unit/fixtures/languageAnalysis/lv.expected
index b63fe1a..c176170 100644
--- a/tests/unit/fixtures/languageAnalysis/lv.expected
+++ b/tests/unit/fixtures/languageAnalysis/lv.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/lzh.expected 
b/tests/unit/fixtures/languageAnalysis/lzh.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/lzh.expected
+++ b/tests/unit/fixtures/languageAnalysis/lzh.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/my.expected 
b/tests/unit/fixtures/languageAnalysis/my.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/my.expected
+++ b/tests/unit/fixtures/languageAnalysis/my.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/nan.expected 
b/tests/unit/fixtures/languageAnalysis/nan.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/nan.expected
+++ b/tests/unit/fixtures/languageAnalysis/nan.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/nb.expected 
b/tests/unit/fixtures/languageAnalysis/nb.expected
index 5a7dd7f..642e63c 100644
--- a/tests/unit/fixtures/languageAnalysis/nb.expected
+++ b/tests/unit/fixtures/languageAnalysis/nb.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/nl.expected 
b/tests/unit/fixtures/languageAnalysis/nl.expected
index 2fb3f88..3140b12 100644
--- a/tests/unit/fixtures/languageAnalysis/nl.expected
+++ b/tests/unit/fixtures/languageAnalysis/nl.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/nn.expected 
b/tests/unit/fixtures/languageAnalysis/nn.expected
index 5a7dd7f..642e63c 100644
--- a/tests/unit/fixtures/languageAnalysis/nn.expected
+++ b/tests/unit/fixtures/languageAnalysis/nn.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/pt-br.expected 
b/tests/unit/fixtures/languageAnalysis/pt-br.expected
index 5f248f3..9e9f82c 100644
--- a/tests/unit/fixtures/languageAnalysis/pt-br.expected
+++ b/tests/unit/fixtures/languageAnalysis/pt-br.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/pt.expected 
b/tests/unit/fixtures/languageAnalysis/pt.expected
index 38e5758..482bd18 100644
--- a/tests/unit/fixtures/languageAnalysis/pt.expected
+++ b/tests/unit/fixtures/languageAnalysis/pt.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ro.expected 
b/tests/unit/fixtures/languageAnalysis/ro.expected
index 8e912ff..f77c123 100644
--- a/tests/unit/fixtures/languageAnalysis/ro.expected
+++ b/tests/unit/fixtures/languageAnalysis/ro.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/ru.expected 
b/tests/unit/fixtures/languageAnalysis/ru.expected
index 3e9d0ac..b79ed7b 100644
--- a/tests/unit/fixtures/languageAnalysis/ru.expected
+++ b/tests/unit/fixtures/languageAnalysis/ru.expected
@@ -95,15 +95,6 @@
                 "russian_charfilter"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -203,10 +194,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/simple.expected 
b/tests/unit/fixtures/languageAnalysis/simple.expected
index 5fd638b..61883e9 100644
--- a/tests/unit/fixtures/languageAnalysis/simple.expected
+++ b/tests/unit/fixtures/languageAnalysis/simple.expected
@@ -100,15 +100,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -207,10 +198,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/sv.expected 
b/tests/unit/fixtures/languageAnalysis/sv.expected
index df7cab3..6aa141b 100644
--- a/tests/unit/fixtures/languageAnalysis/sv.expected
+++ b/tests/unit/fixtures/languageAnalysis/sv.expected
@@ -88,15 +88,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -195,10 +186,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/th.expected 
b/tests/unit/fixtures/languageAnalysis/th.expected
index 1f41998..9b4b4d4 100644
--- a/tests/unit/fixtures/languageAnalysis/th.expected
+++ b/tests/unit/fixtures/languageAnalysis/th.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/tr.expected 
b/tests/unit/fixtures/languageAnalysis/tr.expected
index 78fa7f2..8759ab7 100644
--- a/tests/unit/fixtures/languageAnalysis/tr.expected
+++ b/tests/unit/fixtures/languageAnalysis/tr.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase",
diff --git a/tests/unit/fixtures/languageAnalysis/uk.expected 
b/tests/unit/fixtures/languageAnalysis/uk.expected
index 4e8f843..8abadf4 100644
--- a/tests/unit/fixtures/languageAnalysis/uk.expected
+++ b/tests/unit/fixtures/languageAnalysis/uk.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/wuu.expected 
b/tests/unit/fixtures/languageAnalysis/wuu.expected
index 3b997e5..b912454 100644
--- a/tests/unit/fixtures/languageAnalysis/wuu.expected
+++ b/tests/unit/fixtures/languageAnalysis/wuu.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/yue.expected 
b/tests/unit/fixtures/languageAnalysis/yue.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/yue.expected
+++ b/tests/unit/fixtures/languageAnalysis/yue.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/zh-classical.expected 
b/tests/unit/fixtures/languageAnalysis/zh-classical.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/zh-classical.expected
+++ b/tests/unit/fixtures/languageAnalysis/zh-classical.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/zh-min-nan.expected 
b/tests/unit/fixtures/languageAnalysis/zh-min-nan.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/zh-min-nan.expected
+++ b/tests/unit/fixtures/languageAnalysis/zh-min-nan.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/zh-yue.expected 
b/tests/unit/fixtures/languageAnalysis/zh-yue.expected
index 0b3d30f..3e3fbd1 100644
--- a/tests/unit/fixtures/languageAnalysis/zh-yue.expected
+++ b/tests/unit/fixtures/languageAnalysis/zh-yue.expected
@@ -80,15 +80,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -185,10 +176,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"
diff --git a/tests/unit/fixtures/languageAnalysis/zh.expected 
b/tests/unit/fixtures/languageAnalysis/zh.expected
index 3b997e5..b912454 100644
--- a/tests/unit/fixtures/languageAnalysis/zh.expected
+++ b/tests/unit/fixtures/languageAnalysis/zh.expected
@@ -78,15 +78,6 @@
                 "suggest_shingle"
             ]
         },
-        "suggest_search": {
-            "type": "custom",
-            "tokenizer": "standard",
-            "filter": [
-                "lowercase",
-                "suggest_shingle",
-                "limit_30"
-            ]
-        },
         "suggest_reverse": {
             "type": "custom",
             "tokenizer": "standard",
@@ -183,10 +174,6 @@
             "min_shingle_size": 2,
             "max_shingle_size": 3,
             "output_unigrams": true
-        },
-        "limit_30": {
-            "type": "limit",
-            "max_token_count": 30
         },
         "lowercase": {
             "type": "lowercase"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief52b0420fe3ee00f6112828351af3bf281b24df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.29.0-wmf.20
Gerrit-Owner: Smalyshev <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to