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

Jump to bottom

[ML] Fixes caching/memoizing Anomaly Explorer data calls #29579

Merged
merged 1 commit into from
Jan 30, 2019
Merged

[ML] Fixes caching/memoizing Anomaly Explorer data calls #29579

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
49 changes: 32 additions & 17 deletions x-pack/plugins/ml/public/explorer/explorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,11 @@ export const Explorer = injectI18n(
const showCharts = mlCheckboxShowChartsService.state.get('showCharts');
const { selectedCells, selectedJobs } = this.state;

const bounds = timefilter.getActiveBounds();
const timerange = getSelectionTimeRange(
selectedCells,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds()
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
bounds,
);

if (showCharts && selectedCells !== null) {
Expand All @@ -263,9 +265,11 @@ export const Explorer = injectI18n(
const showCharts = mlCheckboxShowChartsService.state.get('showCharts');
const { anomalyChartRecords, selectedCells, selectedJobs } = this.state;
if (showCharts && selectedCells !== null) {
const bounds = timefilter.getActiveBounds();
const timerange = getSelectionTimeRange(
selectedCells,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds()
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
bounds,
);
this.updateCharts(
anomalyChartRecords, timerange.earliestMs, timerange.latestMs
Expand All @@ -276,15 +280,16 @@ export const Explorer = injectI18n(
tableControlsListener = async () => {
const { dateFormatTz } = this.props;
const { selectedCells, swimlaneViewByFieldName, selectedJobs } = this.state;
this.setState({
tableData: await loadAnomaliesTableData(
selectedCells,
selectedJobs,
dateFormatTz,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
swimlaneViewByFieldName
)
});
const bounds = timefilter.getActiveBounds();
const tableData = await loadAnomaliesTableData(
selectedCells,
selectedJobs,
dateFormatTz,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
bounds,
swimlaneViewByFieldName
);
this.setState({ tableData });
};

swimlaneLimitListener = () => {
Expand Down Expand Up @@ -355,7 +360,7 @@ export const Explorer = injectI18n(

loadOverallDataPreviousArgs = null;
loadOverallDataPreviousData = null;
loadOverallData(selectedJobs, interval, showLoadingIndicator = true) {
loadOverallData(selectedJobs, interval, bounds, showLoadingIndicator = true) {
return new Promise((resolve) => {
// Loads the overall data components i.e. the overall swimlane and influencers list.
if (selectedJobs === null) {
Expand All @@ -369,7 +374,9 @@ export const Explorer = injectI18n(
// check if we can just return existing cached data
const compareArgs = {
selectedJobs,
intervalAsSeconds: interval.asSeconds()
intervalAsSeconds: interval.asSeconds(),
boundsMin: bounds.min.valueOf(),
boundsMax: bounds.max.valueOf(),
};

if (_.isEqual(compareArgs, this.loadOverallDataPreviousArgs)) {
Expand All @@ -391,7 +398,6 @@ export const Explorer = injectI18n(

// Ensure the search bounds align to the bucketing interval used in the swimlane so
// that the first and last buckets are complete.
const bounds = timefilter.getActiveBounds();
const searchBounds = getBoundsRoundedToInterval(
bounds,
interval,
Expand Down Expand Up @@ -636,9 +642,11 @@ export const Explorer = injectI18n(
? selectedCells.lanes
: selectedJobs.map(d => d.id);

const bounds = timefilter.getActiveBounds();
const timerange = getSelectionTimeRange(
selectedCells,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds()
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
bounds,
);

// Load the overall data - if the FieldFormats failed to populate
Expand All @@ -648,6 +656,7 @@ export const Explorer = injectI18n(
await this.loadOverallData(
selectedJobs,
this.getSwimlaneBucketInterval(selectedJobs),
bounds,
showOverallLoadingIndicator,
)
);
Expand All @@ -657,7 +666,9 @@ export const Explorer = injectI18n(
const annotationsTableCompareArgs = {
selectedCells,
selectedJobs,
interval: this.getSwimlaneBucketInterval(selectedJobs).asSeconds()
interval: this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
boundsMin: bounds.min.valueOf(),
boundsMax: bounds.max.valueOf(),
};

if (_.isEqual(annotationsTableCompareArgs, this.annotationsTablePreviousArgs)) {
Expand All @@ -667,7 +678,8 @@ export const Explorer = injectI18n(
stateUpdate.annotationsData = this.annotationsTablePreviousData = await loadAnnotationsTableData(
selectedCells,
selectedJobs,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds()
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
bounds,
);
}

Expand Down Expand Up @@ -770,6 +782,8 @@ export const Explorer = injectI18n(
selectedJobs,
dateFormatTz,
interval: this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
boundsMin: bounds.min.valueOf(),
boundsMax: bounds.max.valueOf(),
swimlaneViewByFieldName: viewBySwimlaneOptions.swimlaneViewByFieldName,
};

Expand All @@ -782,6 +796,7 @@ export const Explorer = injectI18n(
selectedJobs,
dateFormatTz,
this.getSwimlaneBucketInterval(selectedJobs).asSeconds(),
bounds,
viewBySwimlaneOptions.swimlaneViewByFieldName
);
this.setState({ tableData });
Expand Down
12 changes: 5 additions & 7 deletions x-pack/plugins/ml/public/explorer/explorer_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/

import { chain, each, get, union, uniq } from 'lodash';
import { timefilter } from 'ui/timefilter';
import { parseInterval } from 'ui/utils/parse_interval';

import { isTimeSeriesViewDetector } from '../../common/util/job_utils';
Expand Down Expand Up @@ -165,10 +164,9 @@ export function getFieldsByJob() {
}, { '*': [] });
}

export function getSelectionTimeRange(selectedCells, interval) {
export function getSelectionTimeRange(selectedCells, interval, bounds) {
// Returns the time range of the cell(s) currently selected in the swimlane.
// If no cell(s) are currently selected, returns the dashboard time range.
const bounds = timefilter.getActiveBounds();
let earliestMs = bounds.min.valueOf();
let latestMs = bounds.max.valueOf();

Expand Down Expand Up @@ -383,10 +381,10 @@ export function processViewByResults(
return dataset;
}

export async function loadAnnotationsTableData(selectedCells, selectedJobs, interval) {
export async function loadAnnotationsTableData(selectedCells, selectedJobs, interval, bounds) {
const jobIds = (selectedCells !== null && selectedCells.viewByFieldName === VIEW_BY_JOB_LABEL) ?
selectedCells.lanes : selectedJobs.map(d => d.id);
const timeRange = getSelectionTimeRange(selectedCells, interval);
const timeRange = getSelectionTimeRange(selectedCells, interval, bounds);

if (mlAnnotationsEnabled === false) {
return Promise.resolve([]);
Expand Down Expand Up @@ -419,11 +417,11 @@ export async function loadAnnotationsTableData(selectedCells, selectedJobs, inte
);
}

export async function loadAnomaliesTableData(selectedCells, selectedJobs, dateFormatTz, interval, fieldName) {
export async function loadAnomaliesTableData(selectedCells, selectedJobs, dateFormatTz, interval, bounds, fieldName) {
const jobIds = (selectedCells !== null && selectedCells.viewByFieldName === VIEW_BY_JOB_LABEL) ?
selectedCells.lanes : selectedJobs.map(d => d.id);
const influencers = getSelectionInfluencers(selectedCells, fieldName);
const timeRange = getSelectionTimeRange(selectedCells, interval);
const timeRange = getSelectionTimeRange(selectedCells, interval, bounds);

return new Promise((resolve, reject) => {
ml.results.getAnomaliesTableData(
Expand Down