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

Fix multi terms performance bottleneck #126575

Merged
merged 3 commits into from
Mar 3, 2022
Merged

Fix multi terms performance bottleneck #126575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
697308a
fix performance bottleneck
flash1293 Mar 1, 2022
030f912
fix tests
flash1293 Mar 1, 2022
c1e502f
Update x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
flash1293 Mar 1, 2022
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
4 changes: 2 additions & 2 deletions src/plugins/data/common/search/aggs/utils/get_aggs_formats.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe('getAggsFormats', () => {
const mapping = {
id: 'multi_terms',
params: {
paramsPerField: Array(terms.length).fill({ id: 'terms' }),
paramsPerField: [{ id: 'terms' }, { id: 'terms' }, { id: 'terms' }],
},
};

Expand All @@ -141,7 +141,7 @@ describe('getAggsFormats', () => {
const mapping = {
id: 'multi_terms',
params: {
paramsPerField: Array(terms.length).fill({ id: 'terms' }),
paramsPerField: [{ id: 'terms' }, { id: 'terms' }, { id: 'terms' }],
separator: ' - ',
},
};
Expand Down
16 changes: 13 additions & 3 deletions src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { i18n } from '@kbn/i18n';
import {
FieldFormat,
FieldFormatInstanceType,
FieldFormatParams,
FieldFormatsContentType,
IFieldFormat,
SerializedFieldFormat,
Expand Down Expand Up @@ -133,11 +134,20 @@ export function getAggsFormats(getFieldFormat: GetFieldFormat): FieldFormatInsta
static id = 'multi_terms';
static hidden = true;

private formatCache: Map<SerializedFieldFormat<FieldFormatParams>, FieldFormat> = new Map();

convert = (val: unknown, type: FieldFormatsContentType) => {
const params = this._params;
const formats = (params.paramsPerField as SerializedFieldFormat[]).map((fieldParams) =>
getFieldFormat({ id: fieldParams.id, params: fieldParams })
);
const formats = (params.paramsPerField as SerializedFieldFormat[]).map((fieldParams) => {
const isCached = this.formatCache.has(fieldParams);
const cachedFormat =
this.formatCache.get(fieldParams) ||
getFieldFormat({ id: fieldParams.id, params: fieldParams });
if (!isCached) {
this.formatCache.set(fieldParams, cachedFormat);
}
Comment on lines +142 to +148
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: inverting the order will remove few lines

Suggested change
const isCached = this.formatCache.has(fieldParams);
const cachedFormat =
this.formatCache.get(fieldParams) ||
getFieldFormat({ id: fieldParams.id, params: fieldParams });
if (!isCached) {
this.formatCache.set(fieldParams, cachedFormat);
}
if (!this.formatCache.has(fieldParams);) {
this.formatCache.set(
fieldParams,
getFieldFormat({ id: fieldParams.id, params: fieldParams })
);
}
return this.formatCache.get(fieldParams);

return cachedFormat;
});

if (String(val) === '__other__') {
return params.otherBucketLabel;
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/lens/public/xy_visualization/color_assignment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ export function getColorAssignments(
}
const splitAccessor = layer.splitAccessor;
const column = data.tables[layer.layerId]?.columns.find(({ id }) => id === splitAccessor);
const columnFormatter = column && formatFactory(column.meta.params);
const splits =
!column || !data.tables[layer.layerId]
? []
: uniq(
data.tables[layer.layerId].rows.map((row) => {
let value = row[splitAccessor];
if (value && !isPrimitive(value)) {
value = formatFactory(column.meta.params).convert(value);
value = columnFormatter?.convert(value) ?? value;
} else {
value = String(value);
}
Expand Down
18 changes: 13 additions & 5 deletions x-pack/plugins/lens/public/xy_visualization/expression.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@ import type {
ExpressionRenderDefinition,
Datatable,
DatatableRow,
DatatableColumn,
} from 'src/plugins/expressions/public';
import { IconType } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { RenderMode } from 'src/plugins/expressions';
import { ThemeServiceStart } from 'kibana/public';
import { FieldFormat } from 'src/plugins/field_formats/common';
import { EmptyPlaceholder } from '../../../../../src/plugins/charts/public';
import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/public';
import type { ILensInterpreterRenderHandlers, LensFilterEvent, LensBrushEvent } from '../types';
Expand Down Expand Up @@ -599,6 +601,7 @@ export function XYChart({
: undefined,
},
};

return (
<Chart ref={chartRef}>
<Settings
Expand Down Expand Up @@ -730,6 +733,11 @@ export function XYChart({

const table = data.tables[layerId];

const formatterPerColumn = new Map<DatatableColumn, FieldFormat>();
for (const column of table.columns) {
formatterPerColumn.set(column, formatFactory(column.meta.params));
}

// what if row values are not primitive? That is the case of, for instance, Ranges
// remaps them to their serialized version with the formatHint metadata
// In order to do it we need to make a copy of the table as the raw one is required for more features (filters, etc...) later on
Expand All @@ -744,7 +752,7 @@ export function XYChart({
// pre-format values for ordinal x axes because there can only be a single x axis formatter on chart level
(!isPrimitive(record) || (column.id === xAccessor && xScaleType === 'ordinal'))
) {
newRow[column.id] = formatFactory(column.meta.params).convert(record);
newRow[column.id] = formatterPerColumn.get(column)!.convert(record);
}
}
return newRow;
Expand Down Expand Up @@ -798,6 +806,8 @@ export function XYChart({
);

const formatter = table?.columns.find((column) => column.id === accessor)?.meta?.params;
const splitHint = table.columns.find((col) => col.id === splitAccessor)?.meta?.params;
const splitFormatter = formatFactory(splitHint);

const seriesProps: SeriesSpec = {
splitSeriesAccessors: splitAccessor ? [splitAccessor] : [],
Expand Down Expand Up @@ -857,8 +867,6 @@ export function XYChart({
},
},
name(d) {
const splitHint = table.columns.find((col) => col.id === splitAccessor)?.meta?.params;

// For multiple y series, the name of the operation is used on each, either:
// * Key - Y name
// * Formatted value - Y name
Expand All @@ -871,7 +879,7 @@ export function XYChart({
splitAccessor &&
!layersAlreadyFormatted[splitAccessor]
) {
return formatFactory(splitHint).convert(key);
return splitFormatter.convert(key);
}
return splitAccessor && i === 0 ? key : columnToLabelMap[key] ?? '';
})
Expand All @@ -885,7 +893,7 @@ export function XYChart({
if (splitAccessor && layersAlreadyFormatted[splitAccessor]) {
return d.seriesKeys[0];
}
return formatFactory(splitHint).convert(d.seriesKeys[0]);
return splitFormatter.convert(d.seriesKeys[0]);
}
// This handles both split and single-y cases:
// * If split series without formatting, show the value literally
Expand Down