[core.savedObjects] Remove _shard_doc tiebreaker since ES now adds it automatically. (#92295)

lukeelmers · kibanamachine · commit abf2f38d340e · 2021-02-25T14:17:44.000Z
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.test.ts
@@ -96,8 +96,7 @@ describe('getSearchDsl', () => {
         mappings,
         opts.type,
         opts.sortField,
-        opts.sortOrder,
-        opts.pit
+        opts.sortOrder
       );
     });
 
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
@@ -78,7 +78,7 @@ export function getSearchDsl(
       hasReferenceOperator,
       kueryNode,
     }),
-    ...getSortingParams(mappings, type, sortField, sortOrder, pit),
+    ...getSortingParams(mappings, type, sortField, sortOrder),
     ...(pit ? getPitParams(pit) : {}),
     ...(searchAfter ? { search_after: searchAfter } : {}),
   };
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
@@ -79,11 +79,6 @@ describe('searchDsl/getSortParams', () => {
           ],
         });
       });
-      it('appends tiebreaker when PIT is provided', () => {
-        expect(getSortingParams(MAPPINGS, 'saved', 'title', undefined, { id: 'abc' }).sort).toEqual(
-          expect.arrayContaining([{ _shard_doc: 'asc' }])
-        );
-      });
     });
     describe('sortField is simple root property with multiple types', () => {
       it('returns correct params', () => {
@@ -98,11 +93,6 @@ describe('searchDsl/getSortParams', () => {
           ],
         });
       });
-      it('appends tiebreaker when PIT is provided', () => {
-        expect(
-          getSortingParams(MAPPINGS, ['saved', 'pending'], 'type', undefined, { id: 'abc' }).sort
-        ).toEqual(expect.arrayContaining([{ _shard_doc: 'asc' }]));
-      });
     });
     describe('sortField is simple non-root property with multiple types', () => {
       it('returns correct params', () => {
@@ -124,11 +114,6 @@ describe('searchDsl/getSortParams', () => {
           ],
         });
       });
-      it('appends tiebreaker when PIT is provided', () => {
-        expect(
-          getSortingParams(MAPPINGS, 'saved', 'title.raw', undefined, { id: 'abc' }).sort
-        ).toEqual(expect.arrayContaining([{ _shard_doc: 'asc' }]));
-      });
     });
     describe('sortField is multi-field with single type as array', () => {
       it('returns correct params', () => {
@@ -143,11 +128,6 @@ describe('searchDsl/getSortParams', () => {
           ],
         });
       });
-      it('appends tiebreaker when PIT is provided', () => {
-        expect(
-          getSortingParams(MAPPINGS, ['saved'], 'title.raw', undefined, { id: 'abc' }).sort
-        ).toEqual(expect.arrayContaining([{ _shard_doc: 'asc' }]));
-      });
     });
     describe('sortField is root multi-field with multiple types', () => {
       it('returns correct params', () => {
@@ -162,12 +142,6 @@ describe('searchDsl/getSortParams', () => {
           ],
         });
       });
-      it('appends tiebreaker when PIT is provided', () => {
-        expect(
-          getSortingParams(MAPPINGS, ['saved', 'pending'], 'type.raw', undefined, { id: 'abc' })
-            .sort
-        ).toEqual(expect.arrayContaining([{ _shard_doc: 'asc' }]));
-      });
     });
     describe('sortField is not-root multi-field with multiple types', () => {
       it('returns correct params', () => {
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
@@ -8,21 +8,14 @@
 
 import Boom from '@hapi/boom';
 import { getProperty, IndexMapping } from '../../../mappings';
-import { SavedObjectsPitParams } from '../../../types';
-
-// TODO: The plan is for ES to automatically add this tiebreaker when
-// using PIT. We should remove this logic once that is resolved.
-// https://github.com/elastic/elasticsearch/issues/56828
-const ES_PROVIDED_TIEBREAKER = { _shard_doc: 'asc' };
 
 const TOP_LEVEL_FIELDS = ['_id', '_score'];
 
 export function getSortingParams(
   mappings: IndexMapping,
   type: string | string[],
   sortField?: string,
-  sortOrder?: string,
-  pit?: SavedObjectsPitParams
+  sortOrder?: string
 ) {
   if (!sortField) {
     return {};
@@ -38,7 +31,6 @@ export function getSortingParams(
             order: sortOrder,
           },
         },
-        ...(pit ? [ES_PROVIDED_TIEBREAKER] : []),
       ],
     };
   }
@@ -59,7 +51,6 @@ export function getSortingParams(
             unmapped_type: rootField.type,
           },
         },
-        ...(pit ? [ES_PROVIDED_TIEBREAKER] : []),
       ],
     };
   }
@@ -84,7 +75,6 @@ export function getSortingParams(
           unmapped_type: field.type,
         },
       },
-      ...(pit ? [ES_PROVIDED_TIEBREAKER] : []),
     ],
   };
 }
