DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334355 )
Change subject: Remove the namespace filter when running on all content
namespaces
......................................................................
Remove the namespace filter when running on all content namespaces
We removed this optimization some time ago for simplicity reasons. I
think we should re-add it to allow some interesting results from non
NS_MAIN in sister searches. E.g. Author on wikisource namespace might
provide interesting
A quick look shows that non NS_MAIN content namespaces are only used
on wikibooks and wikisource (at least en). But the generated query is
still not correct, it uses the host wiki config for all other config
(profiles, namespace boosts, ...). It makes me wonder how we should
handle the situation, it seems hard to re-customize the SearchContext
state after the parse step. On the other hand re-parsing would make
sense only if we fully load the sister wiki config. This may cause
some perf issue that would be hard to address...
Change-Id: I7d1e3e5348b1a4b7c1f954fae23e21e58ee4933b
---
M includes/Search/SearchContext.php
M includes/Searcher.php
M tests/unit/fixtures/searchText/browsertest_216.default.expected
M
tests/unit/fixtures/searchText/browsertest_216.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_216.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_252.default.expected
M
tests/unit/fixtures/searchText/browsertest_252.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_252.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_253.default.expected
M
tests/unit/fixtures/searchText/browsertest_253.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_253.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_254.default.expected
M
tests/unit/fixtures/searchText/browsertest_254.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_254.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_255.default.expected
M
tests/unit/fixtures/searchText/browsertest_255.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_255.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_256.default.expected
M
tests/unit/fixtures/searchText/browsertest_256.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_256.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_258.default.expected
M
tests/unit/fixtures/searchText/browsertest_258.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_258.fullyfeatured.expected
M tests/unit/fixtures/searchText/browsertest_259.default.expected
M
tests/unit/fixtures/searchText/browsertest_259.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/browsertest_259.fullyfeatured.expected
M tests/unit/fixtures/searchText/prefix_001.default.expected
M tests/unit/fixtures/searchText/prefix_001.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/prefix_001.fullyfeatured.expected
M tests/unit/fixtures/searchText/prefix_002.default.expected
M tests/unit/fixtures/searchText/prefix_002.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/prefix_002.fullyfeatured.expected
M tests/unit/fixtures/searchText/prefix_003.default.expected
M tests/unit/fixtures/searchText/prefix_003.fullyfeatured-interwiki.expected
M tests/unit/fixtures/searchText/prefix_003.fullyfeatured.expected
35 files changed, 159 insertions(+), 562 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/55/334355/1
diff --git a/includes/Search/SearchContext.php
b/includes/Search/SearchContext.php
index 380edc4..717de67 100644
--- a/includes/Search/SearchContext.php
+++ b/includes/Search/SearchContext.php
@@ -720,4 +720,18 @@
$this->extraScoreBuilders[] = $rescore;
}
+ /**
+ * Check if the requested namespaces is equivalent to the exact list
+ * of namespaces in the content namespaces.
+ * @return boolean true if the query applies to all content namespaces
+ */
+ public function isContentNamespaces() {
+ if ( !$this->namespaces ) {
+ // if namespaces is null or empty all namespaces
+ // are requested. We assume that not all namespaces
+ // are content namesapces.
+ return false;
+ }
+ return array_diff ( $this->namespaces, $this->config->get(
'ContentNamespaces' ) ) === [];
+ }
}
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 95906c4..8414738 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -512,7 +512,19 @@
$this->overrideConnectionIfNeeded();
if ( $namespaces ) {
$extraIndexes = $this->getAndFilterExtraIndexes();
- $this->searchContext->addFilter( new
\Elastica\Query\Terms( 'namespace', $namespaces ) );
+ // We can avoid adding the namespace filter if:
+ // - 1: no extraIndices is added (no commons)
+ // - 2: we work on the full list of content namespaces
+ // Beware that this is not only meant as an optimization
+ // but an important feature regarding sister wiki
searches
+ // Removing the namespace filter allows to query content
+ // namespaces on sister wikis that are maybe different.
+ // We assume that if the query runs on all content
namespaces
+ // on the host wiki, it's better to run it on all
+ // content namespaces on the target namespace wiki.
+ if ( $extraIndexes ||
!$this->searchContext->isContentNamespaces() ) {
+ $this->searchContext->addFilter( new
\Elastica\Query\Terms( 'namespace', $namespaces ) );
+ }
}
$this->installBoosts();
diff --git a/tests/unit/fixtures/searchText/browsertest_216.default.expected
b/tests/unit/fixtures/searchText/browsertest_216.default.expected
index 10e1dbb..82807bc 100644
--- a/tests/unit/fixtures/searchText/browsertest_216.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_216.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "n"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "n"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured-interwiki.expected
index bfd3dc9..83bfadb 100644
---
a/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "n"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "n"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured.expected
index bfd3dc9..83bfadb 100644
--- a/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_216.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "n"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "n"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_252.default.expected
b/tests/unit/fixtures/searchText/browsertest_252.default.expected
index 112ee7f..e300c61 100644
--- a/tests/unit/fixtures/searchText/browsertest_252.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_252.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured-interwiki.expected
index 3fd43c2..4901252 100644
---
a/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured.expected
index 3fd43c2..4901252 100644
--- a/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_252.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_253.default.expected
b/tests/unit/fixtures/searchText/browsertest_253.default.expected
index 882313e..769e806 100644
--- a/tests/unit/fixtures/searchText/browsertest_253.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_253.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured-interwiki.expected
index 3251363..2124f88 100644
---
a/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured.expected
index 3251363..2124f88 100644
--- a/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_253.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_254.default.expected
b/tests/unit/fixtures/searchText/browsertest_254.default.expected
index 5b1e85b..de1916f 100644
--- a/tests/unit/fixtures/searchText/browsertest_254.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_254.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured-interwiki.expected
index a3c885b..6b2c599 100644
---
a/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured.expected
index a3c885b..6b2c599 100644
--- a/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_254.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_255.default.expected
b/tests/unit/fixtures/searchText/browsertest_255.default.expected
index 72a11ee..6971bba 100644
--- a/tests/unit/fixtures/searchText/browsertest_255.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_255.default.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured-interwiki.expected
index 72a11ee..6971bba 100644
---
a/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured-interwiki.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured.expected
index 72a11ee..6971bba 100644
--- a/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_255.fullyfeatured.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "prefix tes"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "prefix tes"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_256.default.expected
b/tests/unit/fixtures/searchText/browsertest_256.default.expected
index 147b243..c590325 100644
--- a/tests/unit/fixtures/searchText/browsertest_256.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_256.default.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test Redirec"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test Redirec"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured-interwiki.expected
index 147b243..c590325 100644
---
a/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured-interwiki.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test Redirec"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test Redirec"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured.expected
index 147b243..c590325 100644
--- a/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_256.fullyfeatured.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test Redirec"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test Redirec"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_258.default.expected
b/tests/unit/fixtures/searchText/browsertest_258.default.expected
index d315d35..83a5717 100644
--- a/tests/unit/fixtures/searchText/browsertest_258.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_258.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test\/"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test\/"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured-interwiki.expected
index e6d36eb..6486a95 100644
---
a/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test\/"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test\/"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured.expected
index e6d36eb..6486a95 100644
--- a/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_258.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test\/"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test\/"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/browsertest_259.default.expected
b/tests/unit/fixtures/searchText/browsertest_259.default.expected
index 04d2ff4..8505713 100644
--- a/tests/unit/fixtures/searchText/browsertest_259.default.expected
+++ b/tests/unit/fixtures/searchText/browsertest_259.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test\/aa"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test\/aa"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured-interwiki.expected
index be5a1d9..28d0b6e 100644
---
a/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured-interwiki.expected
+++
b/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test\/aa"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test\/aa"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured.expected
b/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured.expected
index be5a1d9..28d0b6e 100644
--- a/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/browsertest_259.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "Prefix Test\/aa"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "Prefix Test\/aa"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/prefix_001.default.expected
b/tests/unit/fixtures/searchText/prefix_001.default.expected
index 10ad835..c4b0e21 100644
--- a/tests/unit/fixtures/searchText/prefix_001.default.expected
+++ b/tests/unit/fixtures/searchText/prefix_001.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/prefix_001.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/prefix_001.fullyfeatured-interwiki.expected
index 58f6ffd..27e3249 100644
--- a/tests/unit/fixtures/searchText/prefix_001.fullyfeatured-interwiki.expected
+++ b/tests/unit/fixtures/searchText/prefix_001.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/prefix_001.fullyfeatured.expected
b/tests/unit/fixtures/searchText/prefix_001.fullyfeatured.expected
index 58f6ffd..27e3249 100644
--- a/tests/unit/fixtures/searchText/prefix_001.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/prefix_001.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/prefix_002.default.expected
b/tests/unit/fixtures/searchText/prefix_002.default.expected
index 6c011e4..7bed6f0 100644
--- a/tests/unit/fixtures/searchText/prefix_002.default.expected
+++ b/tests/unit/fixtures/searchText/prefix_002.default.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/prefix_002.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/prefix_002.fullyfeatured-interwiki.expected
index 84c29b1..15336cb 100644
--- a/tests/unit/fixtures/searchText/prefix_002.fullyfeatured-interwiki.expected
+++ b/tests/unit/fixtures/searchText/prefix_002.fullyfeatured-interwiki.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/prefix_002.fullyfeatured.expected
b/tests/unit/fixtures/searchText/prefix_002.fullyfeatured.expected
index 84c29b1..15336cb 100644
--- a/tests/unit/fixtures/searchText/prefix_002.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/prefix_002.fullyfeatured.expected
@@ -151,23 +151,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/prefix_003.default.expected
b/tests/unit/fixtures/searchText/prefix_003.default.expected
index 8342c9c..556f8ec 100644
--- a/tests/unit/fixtures/searchText/prefix_003.default.expected
+++ b/tests/unit/fixtures/searchText/prefix_003.default.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other thing"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other thing"
+ }
}
}
],
diff --git
a/tests/unit/fixtures/searchText/prefix_003.fullyfeatured-interwiki.expected
b/tests/unit/fixtures/searchText/prefix_003.fullyfeatured-interwiki.expected
index 8342c9c..556f8ec 100644
--- a/tests/unit/fixtures/searchText/prefix_003.fullyfeatured-interwiki.expected
+++ b/tests/unit/fixtures/searchText/prefix_003.fullyfeatured-interwiki.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other thing"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other thing"
+ }
}
}
],
diff --git a/tests/unit/fixtures/searchText/prefix_003.fullyfeatured.expected
b/tests/unit/fixtures/searchText/prefix_003.fullyfeatured.expected
index 8342c9c..556f8ec 100644
--- a/tests/unit/fixtures/searchText/prefix_003.fullyfeatured.expected
+++ b/tests/unit/fixtures/searchText/prefix_003.fullyfeatured.expected
@@ -123,23 +123,10 @@
"bool": {
"filter": [
{
- "bool": {
- "must": [
- {
- "match": {
- "title.prefix": {
- "query": "other thing"
- }
- }
- },
- {
- "terms": {
- "namespace": [
- 0
- ]
- }
- }
- ]
+ "match": {
+ "title.prefix": {
+ "query": "other thing"
+ }
}
}
],
--
To view, visit https://gerrit.wikimedia.org/r/334355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d1e3e5348b1a4b7c1f954fae23e21e58ee4933b
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
