From e088403d2d9873257f4358f94b05e2a6cec0799f Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 20 Apr 2020 16:04:00 -0600
Subject: [PATCH] Set readFromDocValues to false for geo_shape fields

---
 .../should_read_field_from_doc_values.test.ts | 42 +++++++++++++++++++
 .../should_read_field_from_doc_values.ts      |  2 +-
 .../es_search_source/es_search_source.js      |  2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts

diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts
new file mode 100644
index 0000000000000..784b0b4d4f3d7
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.test.ts
@@ -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);
+  });
+});
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
index 6d58f7a02c134..56a1cf3ccd161 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
@@ -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('_');
 }
diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
index aaa56b30c735a..34fed37933e13 100644
--- a/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
@@ -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'
           ? {