github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove simple_query_string hack now that multi_match supports * (#13285)

Browse source
This commit is contained in:
Matt Bargar 2017-08-04 14:45:21 -04:00 • committed by GitHub
parent 3e3b0cb8ba
commit 3dfcf5dc98
5 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ui/public/kuery/functions/__tests__/and.js
View file

@ -4,6 +4,7 @@ import { nodeTypes } from '../../node_types';
import * as ast from '../../ast'; import * as ast from '../../ast';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import ngMock from 'ng_mock'; import ngMock from 'ng_mock';
import { expectDeepEqual } from '../../../../../test_utils/expect_deep_equal';
let indexPattern; let indexPattern;
@ -54,11 +55,11 @@ describe('kuery functions', function () {
it('should wrap a literal argument with an "is" function targeting all fields', function () { it('should wrap a literal argument with an "is" function targeting all fields', function () {
const literalFoo = nodeTypes.literal.buildNode('foo'); const literalFoo = nodeTypes.literal.buildNode('foo');
const expectedChild = ast.toElasticsearchQuery(nodeTypes.function.buildNode('is', '*', 'foo'), indexPattern);
const node = nodeTypes.function.buildNode('and', [literalFoo]); const node = nodeTypes.function.buildNode('and', [literalFoo]);
const result = and.toElasticsearchQuery(node, indexPattern); const result = and.toElasticsearchQuery(node, indexPattern);
const resultChild = result.bool.filter[0]; const resultChild = result.bool.filter[0];
expect(resultChild).to.have.property('simple_query_string'); expectDeepEqual(resultChild, expectedChild);
expect(resultChild.simple_query_string.all_fields).to.be(true);
}); });
}); });

34
src/ui/public/kuery/functions/__tests__/is.js
View file

@ -1,9 +1,9 @@
import expect from 'expect.js'; import expect from 'expect.js';
import * as is from '../is'; import * as is from '../is';
import { nodeTypes } from '../../node_types'; import { nodeTypes } from '../../node_types';
import _ from 'lodash';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import ngMock from 'ng_mock'; import ngMock from 'ng_mock';
import { expectDeepEqual } from '../../../../../test_utils/expect_deep_equal';
let indexPattern; let indexPattern;
@ -54,34 +54,22 @@ describe('kuery functions', function () {
const node = nodeTypes.function.buildNode('is', '*', '*'); const node = nodeTypes.function.buildNode('is', '*', '*');
const result = is.toElasticsearchQuery(node, indexPattern); const result = is.toElasticsearchQuery(node, indexPattern);
expect(_.isEqual(expected, result)).to.be(true); expectDeepEqual(result, expected);
}); });
it('should return an ES simple_query_string query in all fields mode when fieldName is "*"', function () { it('should return an ES multi_match query when fieldName is "*"', function () {
const expected = { const expected = {
simple_query_string: { multi_match: {
query: '"200"', query: 200,
all_fields: true, fields: ['*'],
type: 'phrase',
lenient: true,
} }
}; };
const node = nodeTypes.function.buildNode('is', '*', 200); const node = nodeTypes.function.buildNode('is', '*', 200);
const result = is.toElasticsearchQuery(node, indexPattern); const result = is.toElasticsearchQuery(node, indexPattern);
expect(_.isEqual(expected, result)).to.be(true); expectDeepEqual(result, expected);
});
// See discussion about kuery escaping for background:
// https://github.com/elastic/kibana/pull/12624#issuecomment-312650307
it('should ensure the simple_query_string query is wrapped in double quotes to force a phrase search', function () {
const node = nodeTypes.function.buildNode('is', '*', '+response');
const result = is.toElasticsearchQuery(node, indexPattern);
expect(result.simple_query_string.query).to.be('"+response"');
});
it('already double quoted phrases should not get wrapped a second time', function () {
const node = nodeTypes.function.buildNode('is', '*', '"+response"');
const result = is.toElasticsearchQuery(node, indexPattern);
expect(result.simple_query_string.query).to.be('"+response"');
}); });
it('should return an ES exists query when value is "*"', function () { it('should return an ES exists query when value is "*"', function () {
@ -91,7 +79,7 @@ describe('kuery functions', function () {
const node = nodeTypes.function.buildNode('is', 'response', '*'); const node = nodeTypes.function.buildNode('is', 'response', '*');
const result = is.toElasticsearchQuery(node, indexPattern); const result = is.toElasticsearchQuery(node, indexPattern);
expect(_.isEqual(expected, result)).to.be(true); expectDeepEqual(result, expected);
}); });
it('should return an ES match_phrase query when a concrete fieldName and value are provided', function () { it('should return an ES match_phrase query when a concrete fieldName and value are provided', function () {
@ -103,7 +91,7 @@ describe('kuery functions', function () {
const node = nodeTypes.function.buildNode('is', 'response', 200); const node = nodeTypes.function.buildNode('is', 'response', 200);
const result = is.toElasticsearchQuery(node, indexPattern); const result = is.toElasticsearchQuery(node, indexPattern);
expect(_.isEqual(expected, result)).to.be(true); expectDeepEqual(result, expected);
}); });
it('should support scripted fields', function () { it('should support scripted fields', function () {

5
src/ui/public/kuery/functions/__tests__/not.js
View file

@ -4,6 +4,7 @@ import { nodeTypes } from '../../node_types';
import * as ast from '../../ast'; import * as ast from '../../ast';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import ngMock from 'ng_mock'; import ngMock from 'ng_mock';
import { expectDeepEqual } from '../../../../../test_utils/expect_deep_equal';
let indexPattern; let indexPattern;
@ -49,11 +50,11 @@ describe('kuery functions', function () {
it('should wrap a literal argument with an "is" function targeting all fields', function () { it('should wrap a literal argument with an "is" function targeting all fields', function () {
const literalFoo = nodeTypes.literal.buildNode('foo'); const literalFoo = nodeTypes.literal.buildNode('foo');
const expectedChild = ast.toElasticsearchQuery(nodeTypes.function.buildNode('is', '*', 'foo'), indexPattern);
const node = nodeTypes.function.buildNode('not', literalFoo); const node = nodeTypes.function.buildNode('not', literalFoo);
const result = not.toElasticsearchQuery(node, indexPattern); const result = not.toElasticsearchQuery(node, indexPattern);
const resultChild = result.bool.must_not; const resultChild = result.bool.must_not;
expect(resultChild).to.have.property('simple_query_string'); expectDeepEqual(resultChild, expectedChild);
expect(resultChild.simple_query_string.all_fields).to.be(true);
}); });
}); });

5
src/ui/public/kuery/functions/__tests__/or.js
View file

@ -4,6 +4,7 @@ import { nodeTypes } from '../../node_types';
import * as ast from '../../ast'; import * as ast from '../../ast';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import ngMock from 'ng_mock'; import ngMock from 'ng_mock';
import { expectDeepEqual } from '../../../../../test_utils/expect_deep_equal';
let indexPattern; let indexPattern;
@ -54,11 +55,11 @@ describe('kuery functions', function () {
it('should wrap a literal argument with an "is" function targeting all fields', function () { it('should wrap a literal argument with an "is" function targeting all fields', function () {
const literalFoo = nodeTypes.literal.buildNode('foo'); const literalFoo = nodeTypes.literal.buildNode('foo');
const expectedChild = ast.toElasticsearchQuery(nodeTypes.function.buildNode('is', '*', 'foo'), indexPattern);
const node = nodeTypes.function.buildNode('or', [literalFoo]); const node = nodeTypes.function.buildNode('or', [literalFoo]);
const result = or.toElasticsearchQuery(node, indexPattern); const result = or.toElasticsearchQuery(node, indexPattern);
const resultChild = result.bool.should[0]; const resultChild = result.bool.should[0];
expect(resultChild).to.have.property('simple_query_string'); expectDeepEqual(resultChild, expectedChild);
expect(resultChild.simple_query_string.all_fields).to.be(true);
}); });
it('should require one of the clauses to match', function () { it('should require one of the clauses to match', function () {

16
src/ui/public/kuery/functions/is.js
View file

@ -33,13 +33,12 @@ export function toElasticsearchQuery(node, indexPattern) {
return { match_all: {} }; return { match_all: {} };
} }
else if (fieldName === '*' && value !== '*') { else if (fieldName === '*' && value !== '*') {
const userQuery = String(value);
const query = isDoubleQuoted(userQuery) ? userQuery : `"${userQuery}"`;
return { return {
simple_query_string: { multi_match: {
query, query: value,
all_fields: true fields: ['*'],
type: 'phrase',
lenient: true,
} }
}; };
} }
@ -68,8 +67,3 @@ export function toKueryExpression(node) {
return `${fieldName}:${value}`; return `${fieldName}:${value}`;
} }
function isDoubleQuoted(str) {
return str.startsWith('"') && str.endsWith('"');
}