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

[KQL] Use term queries for keyword fields (#143599)

Browse source
This commit is contained in:
Lukas Olson 2022-10-24 12:21:35 -07:00 • committed by GitHub
parent 04075a1c51
commit 511f95a16a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
packages/kbn-es-query/src/kuery/functions/is.test.ts
View file

@ -361,6 +361,23 @@ describe('kuery functions', () => {
expect(result).toEqual(expected);
});
test('should use a term query for keyword fields', () => {
const node = nodeTypes.function.buildNode('is', 'machine.os.keyword', 'Win 7');
const result = is.toElasticsearchQuery(node, indexPattern);
expect(result).toEqual({
bool: {
should: [
{
term: {
'machine.os.keyword': 'Win 7',
},
},
],
minimum_should_match: 1,
},
});
});
});
});
});

5
packages/kbn-es-query/src/kuery/functions/is.ts
View file

@ -100,6 +100,7 @@ export function toElasticsearchQuery(
}
const queries = fields!.reduce((accumulator: any, field: DataViewFieldBase) => {
const isKeywordField = field.esTypes?.length === 1 && field.esTypes.includes('keyword');
const wrapWithNestedQuery = (query: any) => {
// Wildcards can easily include nested and non-nested fields. There isn't a good way to let
// users handle this themselves so we automatically add nested queries in this scenario.
@ -142,7 +143,7 @@ export function toElasticsearchQuery(
}),
];
} else if (wildcard.isNode(valueArg)) {
const query = field.esTypes?.includes('keyword')
const query = isKeywordField
? {
wildcard: {
[field.name]: value,
@ -177,7 +178,7 @@ export function toElasticsearchQuery(
}),
];
} else {
const queryType = type === 'phrase' ? 'match_phrase' : 'match';
const queryType = isKeywordField ? 'term' : type === 'phrase' ? 'match_phrase' : 'match';
return [
...accumulator,
wrapWithNestedQuery({