Merge branch 'master' into ilm/fix-which-fields-are-showing-with-ss

elastic · Feb 25, 2021 · 296704e · 296704e
2 parents 0b48847 + f0838e6
commit 296704e
Show file tree

Hide file tree

Showing 15 changed files with 286 additions and 512 deletions.
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] : []),
  ],
  };
 }
diff --git a/src/plugins/embeddable/README.asciidoc b/src/plugins/embeddable/README.asciidoc
@@ -22,18 +22,17 @@ There is also an example of rendering dashboard container outside of dashboard a
 
 === Docs
 
-link:./docs/README.md[Embeddable docs, guides & caveats]
+link:https://github.com/elastic/kibana/blob/master/src/plugins/embeddable/docs/README.md[Embeddable docs, guides & caveats]
 
 === API docs
 
-==== Server API
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md[Server Setup contract]
-https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablestart.md[Server Start contract]
-
 ===== Browser API
 https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablesetup.md[Browser Setup contract]
 https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestart.md[Browser Start contract]
 
+==== Server API
+https://github.com/elastic/kibana/blob/master/docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md[Server Setup contract]
+
 === Testing
 
 Run unit tests