Skip to content

Commit 65264aa

Browse files
Set readFromDocValues to false for geo_shape fields (#64014)
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 7eab5d2 commit 65264aa

File tree

3 files changed

+44
-2
lines changed

3 files changed

+44
-2
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
21+
22+
describe('shouldReadFieldFromDocValues', () => {
23+
test('should read field from doc values for aggregatable "number" field', async () => {
24+
expect(shouldReadFieldFromDocValues(true, 'number')).toBe(true);
25+
});
26+
27+
test('should not read field from doc values for non-aggregatable "number "field', async () => {
28+
expect(shouldReadFieldFromDocValues(false, 'number')).toBe(false);
29+
});
30+
31+
test('should not read field from doc values for "text" field', async () => {
32+
expect(shouldReadFieldFromDocValues(true, 'text')).toBe(false);
33+
});
34+
35+
test('should not read field from doc values for "geo_shape" field', async () => {
36+
expect(shouldReadFieldFromDocValues(true, 'geo_shape')).toBe(false);
37+
});
38+
39+
test('should not read field from doc values for underscore field', async () => {
40+
expect(shouldReadFieldFromDocValues(true, '_source')).toBe(false);
41+
});
42+
});

src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
*/
1919

2020
export function shouldReadFieldFromDocValues(aggregatable: boolean, esType: string) {
21-
return aggregatable && esType !== 'text' && !esType.startsWith('_');
21+
return aggregatable && !['text', 'geo_shape'].includes(esType) && !esType.startsWith('_');
2222
}

x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function getDocValueAndSourceFields(indexPattern, fieldNames) {
5151
lang: field.lang,
5252
},
5353
};
54-
} else if (field.type !== ES_GEO_FIELD_TYPE.GEO_SHAPE && field.readFromDocValues) {
54+
} else if (field.readFromDocValues) {
5555
const docValueField =
5656
field.type === 'date'
5757
? {

0 commit comments

Comments
 (0)