IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ES: Change bool queries to use 'filter' clause (#7313)

Browse Source 
Change all bool queries to use 'filter' clause instead of 'must' for
better performance
This commit is contained in:
lpic 2017-01-21 08:31:29 +01:00 committed by Torkel Ödegaard
parent 9151b4034a
commit a0c8380baf
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@ -87,7 +87,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
var queryInterpolated = templateSrv.replace(queryString, {}, 'lucene'); var queryInterpolated = templateSrv.replace(queryString, {}, 'lucene');
var query = { var query = {
"bool": { "bool": {
"must": [ "filter": [
{ "range": range }, { "range": range },
{ {
"query_string": { "query_string": {

8
public/app/plugins/datasource/elasticsearch/query_builder.js
View File

@ -117,7 +117,7 @@ function (queryDef) {
filter = adhocFilters[i]; filter = adhocFilters[i];
condition = {}; condition = {};
condition[filter.key] = filter.value; condition[filter.key] = filter.value;
query.query.bool.must.push({"term": condition}); query.query.bool.filter.push({"term": condition});
} }
}; };
@ -133,7 +133,7 @@ function (queryDef) {
"size": 0, "size": 0,
"query": { "query": {
"bool": { "bool": {
"must": [ "filter": [
{"range": this.getRangeFilter()}, {"range": this.getRangeFilter()},
{ {
"query_string": { "query_string": {
@ -226,13 +226,13 @@ function (queryDef) {
"size": 0, "size": 0,
"query": { "query": {
"bool": { "bool": {
"must": [{"range": this.getRangeFilter()}] "filter": [{"range": this.getRangeFilter()}]
} }
} }
}; };
if (queryDef.query) { if (queryDef.query) {
query.query.bool.must.push({ query.query.bool.filter.push({
"query_string": { "query_string": {
"analyze_wildcard": true, "analyze_wildcard": true,
"query": queryDef.query, "query": queryDef.query,

2
public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
View File

@ -77,7 +77,7 @@ describe('ElasticDatasource', function() {
it('should json escape lucene query', function() { it('should json escape lucene query', function() {
var body = angular.fromJson(parts[1]); var body = angular.fromJson(parts[1]);
expect(body.query.bool.must[1].query_string.query).to.be('escape\\:test'); expect(body.query.bool.filter[1].query_string.query).to.be('escape\\:test');
}); });
}); });

6
public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
View File

@ -16,7 +16,7 @@ describe('ElasticQueryBuilder', function() {
bucketAggs: [{type: 'date_histogram', field: '@timestamp', id: '1'}], bucketAggs: [{type: 'date_histogram', field: '@timestamp', id: '1'}],
}); });
expect(query.query.bool.must[0].range["@timestamp"].gte).to.be("$timeFrom"); expect(query.query.bool.filter[0].range["@timestamp"].gte).to.be("$timeFrom");
expect(query.aggs["1"].date_histogram.extended_bounds.min).to.be("$timeFrom"); expect(query.aggs["1"].date_histogram.extended_bounds.min).to.be("$timeFrom");
}); });
@ -32,7 +32,7 @@ describe('ElasticQueryBuilder', function() {
bucketAggs: [{type: 'date_histogram', field: '@timestamp', id: '1'}], bucketAggs: [{type: 'date_histogram', field: '@timestamp', id: '1'}],
}); });
expect(query.query.bool.must[0].range["@timestamp"].gte).to.be("$timeFrom"); expect(query.query.bool.filter[0].range["@timestamp"].gte).to.be("$timeFrom");
expect(query.aggs["1"].date_histogram.extended_bounds.min).to.be("$timeFrom"); expect(query.aggs["1"].date_histogram.extended_bounds.min).to.be("$timeFrom");
}); });
@ -258,6 +258,6 @@ describe('ElasticQueryBuilder', function() {
{key: 'key1', operator: '=', value: 'value1'} {key: 'key1', operator: '=', value: 'value1'}
]); ]);
expect(query.query.bool.must[2].term["key1"]).to.be("value1"); expect(query.query.bool.filter[2].term["key1"]).to.be("value1");
}); });
}); });