[data views] Stored fields are always requested, we don't need logic …

…around it (#171815) ## Summary Stored field handling is basically a dead code path. `['*']` is always sent so lets push this closer to the query. --------- Co-authored-by: Kibana Machine <[email protected]>
elastic · Nov 30, 2023 · 2403bc8 · 2403bc8
1 parent f98f282
commit 2403bc8
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 25 deletions.
diff --git a/packages/kbn-discover-utils/src/__mocks__/data_view.ts b/packages/kbn-discover-utils/src/__mocks__/data_view.ts
@@ -108,7 +108,7 @@ export const buildDataViewMock = ({
     fields: dataViewFields,
     type: 'default',
     getName: () => name,
-    getComputedFields: () => ({ docvalueFields: [], scriptFields: {}, storedFields: ['*'] }),
+    getComputedFields: () => ({ docvalueFields: [], scriptFields: {} }),
     getSourceFiltering: () => ({}),
     getIndexPattern: () => `${name}-title`,
     getFieldByName: jest.fn((fieldName: string) => dataViewFields.getByName(fieldName)),

diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -281,15 +281,14 @@ describe('SearchSource', () => {
         searchSource.setField('index', {
           ...indexPattern,
           getComputedFields: () => ({
-            storedFields: ['hello'],
             scriptFields: { world: {} },
             docvalueFields: ['@timestamp'],
             runtimeFields,
           }),
         } as unknown as DataView);
 
         const request = searchSource.getSearchRequestBody();
-        expect(request.stored_fields).toEqual(['hello']);
+        expect(request.stored_fields).toEqual(['*']);
         expect(request.script_fields).toEqual({ world: {} });
         expect(request.fields).toEqual(['@timestamp']);
         expect(request.runtime_mappings).toEqual(runtimeFields);

diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
@@ -779,12 +779,11 @@ export class SearchSource {
     const metaFields = getConfig(UI_SETTINGS.META_FIELDS) ?? [];
 
     // get some special field types from the index pattern
-    const { docvalueFields, scriptFields, storedFields, runtimeFields } = index
+    const { docvalueFields, scriptFields, runtimeFields } = index
       ? index.getComputedFields()
       : {
           docvalueFields: [],
           scriptFields: {},
-          storedFields: ['*'],
           runtimeFields: {},
         };
     const fieldListProvided = !!body.fields;
@@ -798,7 +797,7 @@ export class SearchSource {
           ...scriptFields,
         }
       : {};
-    body.stored_fields = storedFields;
+    body.stored_fields = ['*'];
     body.runtime_mappings = runtimeFields || {};
 
     // apply source filters from index pattern if specified by the user

diff --git a/src/plugins/data_views/common/data_views/data_view.test.ts b/src/plugins/data_views/common/data_views/data_view.test.ts
@@ -136,10 +136,6 @@ describe('IndexPattern', () => {
       expect(indexPattern.getComputedFields).toBeInstanceOf(Function);
     });
 
-    test('should request all stored fields', () => {
-      expect(indexPattern.getComputedFields().storedFields).toContain('*');
-    });
-
     test('should request date fields as docvalue_fields', () => {
       const { docvalueFields } = indexPattern.getComputedFields();
       const docValueFieldNames = docvalueFields.map((field) => field.field);

diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts
@@ -85,7 +85,6 @@ export class DataView extends AbstractDataView implements DataViewBase {
     const scriptFields: Record<string, estypes.ScriptField> = {};
     if (!this.fields) {
       return {
-        storedFields: ['*'],
         scriptFields,
         docvalueFields: [] as Array<{ field: string; format: string }>,
         runtimeFields: {},
@@ -117,7 +116,6 @@ export class DataView extends AbstractDataView implements DataViewBase {
     const runtimeFields = this.getRuntimeMappings();
 
     return {
-      storedFields: ['*'],
       scriptFields,
       docvalueFields,
       runtimeFields,

diff --git a/src/plugins/unified_doc_viewer/public/hooks/use_es_doc_search.test.tsx b/src/plugins/unified_doc_viewer/public/hooks/use_es_doc_search.test.tsx
@@ -40,7 +40,7 @@ const services = {
 describe('Test of <Doc /> helper / hook', () => {
   test('buildSearchBody given useNewFieldsApi is false', () => {
     const dataView = {
-      getComputedFields: () => ({ storedFields: [], scriptFields: [], docvalueFields: [] }),
+      getComputedFields: () => ({ scriptFields: [], docvalueFields: [] }),
     } as unknown as DataView;
     const actual = buildSearchBody('1', index, dataView, false);
     expect(actual).toMatchInlineSnapshot(`
@@ -67,7 +67,9 @@ describe('Test of <Doc /> helper / hook', () => {
             },
           },
           "script_fields": Array [],
-          "stored_fields": Array [],
+          "stored_fields": Array [
+            "*",
+          ],
           "version": true,
         },
       }
@@ -76,7 +78,7 @@ describe('Test of <Doc /> helper / hook', () => {
 
   test('buildSearchBody useNewFieldsApi is true', () => {
     const dataView = {
-      getComputedFields: () => ({ storedFields: [], scriptFields: [], docvalueFields: [] }),
+      getComputedFields: () => ({ scriptFields: [], docvalueFields: [] }),
     } as unknown as DataView;
     const actual = buildSearchBody('1', index, dataView, true);
     expect(actual).toMatchInlineSnapshot(`
@@ -108,7 +110,9 @@ describe('Test of <Doc /> helper / hook', () => {
           },
           "runtime_mappings": Object {},
           "script_fields": Array [],
-          "stored_fields": Array [],
+          "stored_fields": Array [
+            "*",
+          ],
           "version": true,
         },
       }
@@ -117,7 +121,7 @@ describe('Test of <Doc /> helper / hook', () => {
 
   test('buildSearchBody with requestSource', () => {
     const dataView = {
-      getComputedFields: () => ({ storedFields: [], scriptFields: [], docvalueFields: [] }),
+      getComputedFields: () => ({ scriptFields: [], docvalueFields: [] }),
     } as unknown as DataView;
     const actual = buildSearchBody('1', index, dataView, true, true);
     expect(actual).toMatchInlineSnapshot(`
@@ -150,7 +154,9 @@ describe('Test of <Doc /> helper / hook', () => {
           },
           "runtime_mappings": Object {},
           "script_fields": Array [],
-          "stored_fields": Array [],
+          "stored_fields": Array [
+            "*",
+          ],
           "version": true,
         },
       }
@@ -160,7 +166,6 @@ describe('Test of <Doc /> helper / hook', () => {
   test('buildSearchBody with runtime fields', () => {
     const dataView = {
       getComputedFields: () => ({
-        storedFields: [],
         scriptFields: [],
         docvalueFields: [],
         runtimeFields: {
@@ -210,7 +215,9 @@ describe('Test of <Doc /> helper / hook', () => {
             },
           },
           "script_fields": Array [],
-          "stored_fields": Array [],
+          "stored_fields": Array [
+            "*",
+          ],
           "version": true,
         },
       }

diff --git a/src/plugins/unified_doc_viewer/public/hooks/use_es_doc_search.ts b/src/plugins/unified_doc_viewer/public/hooks/use_es_doc_search.ts
@@ -131,7 +131,7 @@ export function buildSearchBody(
           filter: [{ ids: { values: [id] } }, { term: { _index: index } }],
         },
       },
-      stored_fields: computedFields.storedFields,
+      stored_fields: ['*'],
       script_fields: computedFields.scriptFields,
       version: true,
     },

diff --git a/src/plugins/unified_histogram/public/__mocks__/data_view.ts b/src/plugins/unified_histogram/public/__mocks__/data_view.ts
@@ -91,7 +91,7 @@ export const buildDataViewMock = ({
     metaFields: ['_index', '_score'],
     fields: dataViewFields,
     getName: () => name,
-    getComputedFields: () => ({ docvalueFields: [], scriptFields: {}, storedFields: ['*'] }),
+    getComputedFields: () => ({ docvalueFields: [], scriptFields: {} }),
     getSourceFiltering: () => ({}),
     getFieldByName: jest.fn((fieldName: string) => dataViewFields.getByName(fieldName)),
     timeFieldName: timeFieldName || '',

diff --git a/src/plugins/unified_search/public/dataview_picker/mocks/dataview.ts b/src/plugins/unified_search/public/dataview_picker/mocks/dataview.ts
@@ -100,7 +100,7 @@ export const buildDataViewMock = ({
     fields: dataViewFields,
     type: 'default',
     getName: () => name,
-    getComputedFields: () => ({ docvalueFields: [], scriptFields: {}, storedFields: ['*'] }),
+    getComputedFields: () => ({ docvalueFields: [], scriptFields: {} }),
     getSourceFiltering: () => ({}),
     getIndexPattern: () => `${name}-title`,
     getFieldByName: jest.fn((fieldName: string) => dataViewFields.getByName(fieldName)),

diff --git a/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts b/x-pack/plugins/infra/common/dependency_mocks/index_patterns.ts
@@ -49,7 +49,6 @@ export const createIndexPatternMock = ({
     getComputedFields: () => ({
       runtimeFields: runtimeFields ?? {},
       scriptFields: {},
-      storedFields: [],
       docvalueFields: [],
     }),
     getRuntimeMappings: () => runtimeFields ?? {},

diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_index_patterns.mock.tsx
@@ -99,7 +99,6 @@ export const createIndexPatternMock = ({
         return accumulatedRuntimeFields;
       }, {}),
       scriptFields: {},
-      storedFields: [],
     }),
   };
 };