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.

Sign up for GitHub

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

[Discover] Experimental usage of ES fields API - wildcard fields #77722

Closed
wants to merge 15 commits into from
Closed

[Discover] Experimental usage of ES fields API - wildcard fields #77722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4662f35
Convert ES body of discover doc request to use fields API
kertal Aug 19, 2020
379fd8c
Adapt search_source.ts and discover to display alias fields
kertal Aug 19, 2020
008bdc1
Add source to field
kertal Aug 19, 2020
0c7bf3a
Submit request once columns changed
kertal Aug 19, 2020
4650db8
Request all fields in doc view
kertal Aug 19, 2020
2d4b73a
Merge remote-tracking branch 'upstream/master' into kertal-pr-2020-08…
kertal Aug 21, 2020
3d5e8b7
Force rerendering of table row
kertal Aug 21, 2020
d19e7ee
Merge remote-tracking branch 'upstream/master' into kertal-pr-2020-08…
kertal Aug 24, 2020
17d9bce
Merge remote-tracking branch 'upstream/master' into kertal-pr-2020-08…
kertal Sep 9, 2020
f84b36d
Undo use_es_doc_search.ts changes
kertal Sep 9, 2020
32c0184
Merge selected fields with doc_value fields
kertal Sep 9, 2020
9ed5a95
Fix scripted fields tests
kertal Sep 9, 2020
9c5160f
Extend SearchSource with fieldsApi handling
kertal Sep 10, 2020
29f6740
Merge master / fix conflicts
kertal Sep 17, 2020
61b7fb0
Fetch all fields, not _source
kertal Sep 17, 2020
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
2 changes: 2 additions & 0 deletions src/plugins/data/public/public.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2039,6 +2039,8 @@ export interface SearchSourceFields {
// (undocumented)
fields?: NameList;
// (undocumented)
fieldsApi?: NameList;
// (undocumented)
filter?: Filter[] | Filter | (() => Filter[] | Filter | undefined);
// (undocumented)
from?: number;
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/data/public/search/search_source/search_source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ export class SearchSource {
case 'fields':
const fields = uniq((data[key] || []).concat(val));
return addToRoot(key, fields);
case 'fieldsApi':
return key && data[key] == null && addToBody('fields', val);
case 'index':
case 'type':
case 'highlightAll':
Expand Down
8 changes: 6 additions & 2 deletions src/plugins/discover/public/application/angular/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
$scope.state = { ...newState };

// detect changes that should trigger fetching of new data
const changes = ['interval', 'sort'].filter(
const changes = ['interval', 'sort', 'columns'].filter(
(prop) => !_.isEqual(newStatePartial[prop], oldStatePartial[prop])
);

Expand Down Expand Up @@ -863,7 +863,9 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
}

$scope.hits = resp.hits.total;
$scope.rows = resp.hits.hits;
$scope.rows = resp.hits.hits.map((hit) => {
return { ...hit, ...{ _source: hit.fields } };
});

// if we haven't counted yet, reset the counts
const counts = ($scope.fieldCounts = $scope.fieldCounts || {});
Expand Down Expand Up @@ -940,6 +942,8 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
const { indexPattern, searchSource } = $scope;
searchSource
.setField('index', $scope.indexPattern)
.setField('fieldsApi', ['*'])
.setField('source', false)
Comment on lines +945 to +946
Copy link
Member Author

Choose a reason for hiding this comment

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

@majagrubic all fields are requested instead of source

Copy link
Member Author

Choose a reason for hiding this comment

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

so it's the opposite of #75407 where _source is requested and selected fields are added to the requests, here no additional request is needed when columns are added to the table

.setField('size', $scope.opts.sampleSize)
.setField(
'sort',
Expand Down
10 changes: 7 additions & 3 deletions src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,12 @@ export function createTableRowDirective($compile: ng.ICompileService, $httpParam
$compile($detailsTr)($detailsScope);
};

$scope.$watchMulti(['indexPattern.timeFieldName', 'row.highlight', '[]columns'], () => {
createSummaryRow($scope.row);
});
$scope.$watchMulti(
['indexPattern.timeFieldName', 'row.highlight', '[]columns', 'row'],
() => {
createSummaryRow($scope.row);
}
);

$scope.inlineFilter = function inlineFilter($event: any, type: string) {
const column = $($event.target).data().column;
Expand Down Expand Up @@ -174,6 +177,7 @@ export function createTableRowDirective($compile: ng.ICompileService, $httpParam
let $cells = $el.children();
newHtmls.forEach(function (html, i) {
const $cell = $cells.eq(i);

if ($cell.data('discover:html') === html) return;

const reuse = find($cells.slice(i + 1), function (cell: any) {
Expand Down