Put filters back in the filter context where they belong (elastic#42095)

Filters were never really meant to take part in scoring in the first place. This PR puts filters back in the filter context where they were in 4.x so they can benefit from the filter cache.
Bargs · Aug 1, 2019 · 346a891 · 346a891
1 parent 42597aa
commit 346a891
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/packages/kbn-es-query/src/es_query/__tests__/build_es_query.js b/packages/kbn-es-query/src/es_query/__tests__/build_es_query.js
@@ -60,10 +60,10 @@ describe('build query', function () {
         bool: {
           must: [
             decorateQuery(luceneStringToDsl('bar:baz'), config.queryStringOptions),
-            { match_all: {} },
           ],
           filter: [
             toElasticsearchQuery(fromKueryExpression('extension:jpg'), indexPattern),
+            { match_all: {} },
           ],
           should: [],
           must_not: [],
@@ -90,9 +90,8 @@ describe('build query', function () {
         bool: {
           must: [
             decorateQuery(luceneStringToDsl('extension:jpg'), config.queryStringOptions),
-            { match_all: {} },
           ],
-          filter: [],
+          filter: [{ match_all: {} }],
           should: [],
           must_not: [],
         }
@@ -122,9 +121,11 @@ describe('build query', function () {
         bool: {
           must: [
             decorateQuery(luceneStringToDsl('@timestamp:"2019-03-23T13:18:00"'), config.queryStringOptions, config.dateFormatTZ),
+          ],
+          filter: [
+            toElasticsearchQuery(fromKueryExpression('@timestamp:"2019-03-23T13:18:00"'), indexPattern, config),
             { match_all: {} }
           ],
-          filter: [toElasticsearchQuery(fromKueryExpression('@timestamp:"2019-03-23T13:18:00"'), indexPattern, config)],
           should: [],
           must_not: [],
         }

diff --git a/packages/kbn-es-query/src/es_query/__tests__/from_filters.js b/packages/kbn-es-query/src/es_query/__tests__/from_filters.js
@@ -52,7 +52,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should place negated filters in the must_not clause', function () {
@@ -86,7 +86,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should migrate deprecated match syntax', function () {
@@ -105,7 +105,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should not add query:queryString:options to query_string filters', function () {
@@ -119,7 +119,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expect(result.must).to.eql(expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
   });
 });
diff --git a/packages/kbn-es-query/src/es_query/from_filters.js b/packages/kbn-es-query/src/es_query/from_filters.js
@@ -61,15 +61,15 @@ const cleanFilter = function (filter) {
 
 export function buildQueryFromFilters(filters = [], indexPattern, ignoreFilterIfFieldNotInIndex) {
   return {
-    must: filters
+    must: [],
+    filter: filters
       .filter(filterNegate(false))
       .filter(filter => !ignoreFilterIfFieldNotInIndex || filterMatchesIndex(filter, indexPattern))
       .map(translateToQuery)
       .map(cleanFilter)
       .map(filter => {
         return migrateFilter(filter, indexPattern);
       }),
-    filter: [],
     should: [],
     must_not: filters
       .filter(filterNegate(true))

diff --git a/...acy/core_plugins/metrics/server/lib/vis_data/request_processors/series/__tests__/query.js b/...acy/core_plugins/metrics/server/lib/vis_data/request_processors/series/__tests__/query.js
@@ -126,8 +126,7 @@ describe('query(req, panel, series)', () => {
       size: 0,
       query: {
         bool: {
-          filter: [],
-          must: [
+          filter: [
             {
               bool: {
                 must: [
@@ -139,6 +138,8 @@ describe('query(req, panel, series)', () => {
                 ],
               },
             },
+          ],
+          must: [
             {
               range: {
                 timestamp: {
@@ -218,8 +219,7 @@ describe('query(req, panel, series)', () => {
       size: 0,
       query: {
         bool: {
-          filter: [],
-          must: [
+          filter: [
             {
               bool: {
                 must: [
@@ -231,6 +231,8 @@ describe('query(req, panel, series)', () => {
                 ],
               },
             },
+          ],
+          must: [
             {
               range: {
                 timestamp: {

diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/series/__tests__/build_request_body.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/series/__tests__/build_request_body.js
@@ -106,8 +106,7 @@ describe('buildRequestBody(req)', () => {
       size: 0,
       query: {
         bool: {
-          filter: [],
-          must: [
+          filter: [
             {
               bool: {
                 must: [
@@ -121,6 +120,8 @@ describe('buildRequestBody(req)', () => {
                 must_not: [],
               },
             },
+          ],
+          must: [
             {
               range: {
                 '@timestamp': {

diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js
@@ -182,8 +182,8 @@ describe('Terms Agg Other bucket helper', () => {
           filters: {
             '': {
               bool: {
-                must: [{ exists: { field: 'machine.os.raw' } }],
-                filter: [],
+                must: [],
+                filter: [{ exists: { field: 'machine.os.raw' } }],
                 should: [],
                 must_not: [
                   { match_phrase: { 'machine.os.raw': { query: 'ios' } } },
@@ -208,11 +208,11 @@ describe('Terms Agg Other bucket helper', () => {
             filters: {
               '-IN': {
                 bool: {
-                  must: [
+                  must: [],
+                  filter: [
                     { match_phrase: { 'geo.src': { query: 'IN' } } },
                     { exists: { field: 'machine.os.raw' } }
                   ],
-                  filter: [],
                   should: [],
                   must_not: [
                     { match_phrase: { 'machine.os.raw': { query: 'ios' } } },
@@ -222,11 +222,11 @@ describe('Terms Agg Other bucket helper', () => {
               },
               '-US': {
                 bool: {
-                  must: [
+                  must: [],
+                  filter: [
                     { match_phrase: { 'geo.src': { query: 'US' } } },
                     { exists: { field: 'machine.os.raw' } }
                   ],
-                  filter: [],
                   should: [],
                   must_not: [
                     { match_phrase: { 'machine.os.raw': { query: 'ios' } } },