Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set readFromDocValues to false for geo_shape fields #64014

Merged
merged 2 commits into from
Apr 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay so the two cases here are:

  • Old index pattern, readFromDocValues is false on geo_shape fields because it wasn't previously supported
  • New index pattern, readFromDocValues is false because of the logic change in the index pattern service

Is that right?

Copy link
Contributor Author

@nreese nreese Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is correct.

For old index pattern readFromDocValues was false because geo_shape did not support docvalues and aggregations.

For new index patterns readFromDocValues should be false even though geo_shape has docvalues support and can support aggregations. This is do to changed in Elasticsearch 7.8 adding docvalue support to geo_shape fields

Copy link
Contributor Author

@nreese nreese Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is removing a quick fix just merged (into master and 7.8) a few days ago. We decided a better fix is at the index pattern level.

const docValueField =
field.type === 'date'
? {
Expand Down