Skip to content

Commit

Permalink
Set readFromDocValues to false for geo_shape fields (#64014) (#64246)
Browse files Browse the repository at this point in the history
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
  • Loading branch information
nreese and elasticmachine authored Apr 23, 2020
1 parent 1a662d0 commit fc6c0b9
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';

describe('shouldReadFieldFromDocValues', () => {
test('should read field from doc values for aggregatable "number" field', async () => {
expect(shouldReadFieldFromDocValues(true, 'number')).toBe(true);
});

test('should not read field from doc values for non-aggregatable "number "field', async () => {
expect(shouldReadFieldFromDocValues(false, 'number')).toBe(false);
});

test('should not read field from doc values for "text" field', async () => {
expect(shouldReadFieldFromDocValues(true, 'text')).toBe(false);
});

test('should not read field from doc values for "geo_shape" field', async () => {
expect(shouldReadFieldFromDocValues(true, 'geo_shape')).toBe(false);
});

test('should not read field from doc values for underscore field', async () => {
expect(shouldReadFieldFromDocValues(true, '_source')).toBe(false);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
*/

export function shouldReadFieldFromDocValues(aggregatable: boolean, esType: string) {
return aggregatable && esType !== 'text' && !esType.startsWith('_');
return aggregatable && !['text', 'geo_shape'].includes(esType) && !esType.startsWith('_');
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function getDocValueAndSourceFields(indexPattern, fieldNames) {
lang: field.lang,
},
};
} else if (field.type !== ES_GEO_FIELD_TYPE.GEO_SHAPE && field.readFromDocValues) {
} else if (field.readFromDocValues) {
const docValueField =
field.type === 'date'
? {
Expand Down

0 comments on commit fc6c0b9

Please sign in to comment.