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

[7.6] [Maps] only request field in docvalue_fields when the field supports doc values (#57372) #57873

Merged
merged 1 commit into from
Feb 18, 2020
Merged

[7.6] [Maps] only request field in docvalue_fields when the field supports doc values (#57372) #57873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 52 additions & 72 deletions x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,36 @@ function addFieldToDSL(dsl, field) {
};
}

function getDocValueAndSourceFields(indexPattern, fieldNames) {
const docValueFields = [];
const sourceOnlyFields = [];
const scriptFields = {};
fieldNames.forEach(fieldName => {
const field = getField(indexPattern, fieldName);
if (field.scripted) {
scriptFields[field.name] = {
script: {
source: field.script,
lang: field.lang,
},
};
} else if (field.readFromDocValues) {
const docValueField =
field.type === 'date'
? {
field: fieldName,
format: 'epoch_millis',
}
: fieldName;
docValueFields.push(docValueField);
} else {
sourceOnlyFields.push(fieldName);
}
});

return { docValueFields, sourceOnlyFields, scriptFields };
}

export class ESSearchSource extends AbstractESSource {
static type = ES_SEARCH;
static title = i18n.translate('xpack.maps.source.esSearchTitle', {
Expand Down Expand Up @@ -244,63 +274,29 @@ export class ESSearchSource extends AbstractESSource {
];
}

async _excludeDateFields(fieldNames) {
const dateFieldNames = (await this.getDateFields()).map(field => field.getName());
return fieldNames.filter(field => {
return !dateFieldNames.includes(field);
});
}

// Returns docvalue_fields array for the union of indexPattern's dateFields and request's field names.
async _getDateDocvalueFields(searchFields) {
const dateFieldNames = (await this.getDateFields()).map(field => field.getName());
return searchFields
.filter(fieldName => {
return dateFieldNames.includes(fieldName);
})
.map(fieldName => {
return {
field: fieldName,
format: 'epoch_millis',
};
});
}

async _getTopHits(layerName, searchFilters, registerCancelCallback) {
const { topHitsSplitField: topHitsSplitFieldName, topHitsSize } = this._descriptor;

const indexPattern = await this.getIndexPattern();
const geoField = await this._getGeoField();

const scriptFields = {};
searchFilters.fieldNames.forEach(fieldName => {
const field = indexPattern.fields.getByName(fieldName);
if (field && field.scripted) {
scriptFields[field.name] = {
script: {
source: field.script,
lang: field.lang,
},
};
}
});

const { docValueFields, sourceOnlyFields, scriptFields } = getDocValueAndSourceFields(
indexPattern,
searchFilters.fieldNames
);
const topHits = {
size: topHitsSize,
script_fields: scriptFields,
docvalue_fields: await this._getDateDocvalueFields(searchFilters.fieldNames),
docvalue_fields: docValueFields,
};
const nonDateFieldNames = await this._excludeDateFields(searchFilters.fieldNames);

if (this._hasSort()) {
topHits.sort = this._buildEsSort();
}
if (geoField.type === ES_GEO_FIELD_TYPE.GEO_POINT) {
if (sourceOnlyFields.length === 0) {
topHits._source = false;
topHits.docvalue_fields.push(...nonDateFieldNames);
} else {
topHits._source = {
includes: nonDateFieldNames,
includes: sourceOnlyFields,
};
}

Expand Down Expand Up @@ -364,41 +360,25 @@ export class ESSearchSource extends AbstractESSource {
// searchFilters.fieldNames contains geo field and any fields needed for styling features
// Performs Elasticsearch search request being careful to pull back only required fields to minimize response size
async _getSearchHits(layerName, searchFilters, maxResultWindow, registerCancelCallback) {
const initialSearchContext = {
docvalue_fields: await this._getDateDocvalueFields(searchFilters.fieldNames),
};
const geoField = await this._getGeoField();
const indexPattern = await this.getIndexPattern();

let searchSource;
if (geoField.type === ES_GEO_FIELD_TYPE.GEO_POINT) {
// Request geo_point and style fields in docvalue_fields insted of _source
// 1) Returns geo_point in a consistent format regardless of how geo_point is stored in source
// 2) Setting _source to false so we avoid pulling back unneeded fields.
initialSearchContext.docvalue_fields.push(
...(await this._excludeDateFields(searchFilters.fieldNames))
);
searchSource = await this._makeSearchSource(
searchFilters,
maxResultWindow,
initialSearchContext
);
const { docValueFields, sourceOnlyFields } = getDocValueAndSourceFields(
indexPattern,
searchFilters.fieldNames
);

const initialSearchContext = { docvalue_fields: docValueFields }; // Request fields in docvalue_fields insted of _source
const searchSource = await this._makeSearchSource(
searchFilters,
maxResultWindow,
initialSearchContext
);
searchSource.setField('fields', searchFilters.fieldNames); // Setting "fields" filters out unused scripted fields
if (sourceOnlyFields.length === 0) {
searchSource.setField('source', false); // do not need anything from _source
searchSource.setField('fields', searchFilters.fieldNames); // Setting "fields" filters out unused scripted fields
} else {
// geo_shape fields do not support docvalue_fields yet, so still have to be pulled from _source
searchSource = await this._makeSearchSource(
searchFilters,
maxResultWindow,
initialSearchContext
);
// Setting "fields" instead of "source: { includes: []}"
// because SearchSource automatically adds the following by default
// 1) all scripted fields
// 2) docvalue_fields value is added for each date field in an index - see getComputedFields
// By setting "fields", SearchSource removes all of defaults
searchSource.setField('fields', searchFilters.fieldNames);
searchSource.setField('source', sourceOnlyFields);
}

if (this._hasSort()) {
searchSource.setField('sort', this._buildEsSort());
}
Expand Down
2 changes: 0 additions & 2 deletions x-pack/test/functional/apps/maps/documents_source/docvalue_fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export default function({ getPageObjects, getService }) {
const PageObjects = getPageObjects(['maps']);
const inspector = getService('inspector');
const testSubjects = getService('testSubjects');
const log = getService('log');

describe('docvalue_fields', () => {
before(async () => {
Expand All @@ -22,7 +21,6 @@ export default function({ getPageObjects, getService }) {
await inspector.openInspectorRequestsView();
await testSubjects.click('inspectorRequestDetailResponse');
const responseBody = await testSubjects.getVisibleText('inspectorResponseBody');
log.info(responseBody);
await inspector.close();
return JSON.parse(responseBody);
}
Expand Down