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

[Lens] Performance refactoring for indexpattern fast lookup and Operation support matrix computation #82829

Merged
merged 14 commits into from
Nov 10, 2020
Merged

[Lens] Performance refactoring for indexpattern fast lookup and Operation support matrix computation #82829

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1e2b3d0
:zap: Use a lookup for indexPattern fields
dej611 Nov 5, 2020
03dd62c
:white_check_mark: Update all tests to handle new lookup format
dej611 Nov 5, 2020
7b0ac89
:sparkles: Migrate from map to method
dej611 Nov 6, 2020
f586105
:sparkles: Expand the use of the getFieldByName method
dej611 Nov 6, 2020
c2bd377
:zap: Improve getOperationSupportMatrix performance
dej611 Nov 6, 2020
52cd945
:label: Fix type issue
dej611 Nov 6, 2020
f5a26a5
Merge remote-tracking branch 'upstream/master' into feature/lens/inde…
dej611 Nov 6, 2020
e4709eb
Merge branch 'master' into feature/lens/indexpattern-fields-lookup
kibanamachine Nov 9, 2020
39fc23d
:ok_hand: Implement feedbacks
dej611 Nov 9, 2020
7815ba0
Merge branch 'feature/lens/indexpattern-fields-lookup' of github.com:…
dej611 Nov 9, 2020
f9b7bec
:recycle: Restore old branching
dej611 Nov 9, 2020
881e95e
:pencil2: Forgotten to remove one return
dej611 Nov 9, 2020
3f4fde5
:zap: Migrate to Set from array to speed up dnd lookups
dej611 Nov 9, 2020
c5c623b
Merge branch 'master' into feature/lens/indexpattern-fields-lookup
kibanamachine Nov 10, 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
254 changes: 133 additions & 121 deletions x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,131 @@ import { ChangeIndexPattern } from './change_indexpattern';
import { EuiProgress, EuiLoadingSpinner } from '@elastic/eui';
import { documentField } from './document_field';
import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks';
import { getFieldByNameFactory } from './pure_helpers';

const fieldsOne = [
{
name: 'timestamp',
displayName: 'timestampLabel',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
displayName: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'memory',
displayName: 'amemory',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'unsupported',
displayName: 'unsupported',
type: 'geo',
aggregatable: true,
searchable: true,
},
{
name: 'source',
displayName: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
{
name: 'client',
displayName: 'client',
type: 'ip',
aggregatable: true,
searchable: true,
},
documentField,
];

const fieldsTwo = [
{
name: 'timestamp',
displayName: 'timestampLabel',
type: 'date',
aggregatable: true,
searchable: true,
aggregationRestrictions: {
date_histogram: {
agg: 'date_histogram',
fixed_interval: '1d',
delay: '7d',
time_zone: 'UTC',
},
},
},
{
name: 'bytes',
displayName: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
aggregationRestrictions: {
histogram: {
agg: 'histogram',
interval: 1000,
},
max: {
agg: 'max',
},
min: {
agg: 'min',
},
sum: {
agg: 'sum',
},
},
},
{
name: 'source',
displayName: 'source',
type: 'string',
aggregatable: true,
searchable: true,
aggregationRestrictions: {
terms: {
agg: 'terms',
},
},
},
documentField,
];

const fieldsThree = [
{
name: 'timestamp',
displayName: 'timestampLabel',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
displayName: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'source',
displayName: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
documentField,
];

const initialState: IndexPatternPrivateState = {
indexPatternRefs: [],
Expand Down Expand Up @@ -85,139 +210,24 @@ const initialState: IndexPatternPrivateState = {
title: 'idx1',
timeFieldName: 'timestamp',
hasRestrictions: false,
fields: [
{
name: 'timestamp',
displayName: 'timestampLabel',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
displayName: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'memory',
displayName: 'amemory',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'unsupported',
displayName: 'unsupported',
type: 'geo',
aggregatable: true,
searchable: true,
},
{
name: 'source',
displayName: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
{
name: 'client',
displayName: 'client',
type: 'ip',
aggregatable: true,
searchable: true,
},
documentField,
],
fields: fieldsOne,
getFieldByName: getFieldByNameFactory(fieldsOne),
},
'2': {
id: '2',
title: 'idx2',
timeFieldName: 'timestamp',
hasRestrictions: true,
fields: [
{
name: 'timestamp',
displayName: 'timestampLabel',
type: 'date',
aggregatable: true,
searchable: true,
aggregationRestrictions: {
date_histogram: {
agg: 'date_histogram',
fixed_interval: '1d',
delay: '7d',
time_zone: 'UTC',
},
},
},
{
name: 'bytes',
displayName: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
aggregationRestrictions: {
histogram: {
agg: 'histogram',
interval: 1000,
},
max: {
agg: 'max',
},
min: {
agg: 'min',
},
sum: {
agg: 'sum',
},
},
},
{
name: 'source',
displayName: 'source',
type: 'string',
aggregatable: true,
searchable: true,
aggregationRestrictions: {
terms: {
agg: 'terms',
},
},
},
documentField,
],
fields: fieldsTwo,
getFieldByName: getFieldByNameFactory(fieldsTwo),
},
'3': {
id: '3',
title: 'idx3',
timeFieldName: 'timestamp',
hasRestrictions: false,
fields: [
{
name: 'timestamp',
displayName: 'timestampLabel',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
displayName: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'source',
displayName: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
documentField,
],
fields: fieldsThree,
getFieldByName: getFieldByNameFactory(fieldsThree),
},
},
isFirstExistenceFetch: false,
Expand Down Expand Up @@ -330,13 +340,15 @@ describe('IndexPattern Data Panel', () => {
title: 'aaa',
timeFieldName: 'atime',
fields: [],
getFieldByName: getFieldByNameFactory([]),
hasRestrictions: false,
},
b: {
id: 'b',
title: 'bbb',
timeFieldName: 'btime',
fields: [],
getFieldByName: getFieldByNameFactory([]),
hasRestrictions: false,
},
},
Expand Down
5 changes: 2 additions & 3 deletions x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import './datapanel.scss';
import { uniq, keyBy, groupBy } from 'lodash';
import { uniq, groupBy } from 'lodash';
import React, { useState, memo, useCallback, useMemo } from 'react';
import {
EuiFlexGroup,
Expand Down Expand Up @@ -266,9 +266,8 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
const fieldInfoUnavailable = existenceFetchFailed || currentIndexPattern.hasRestrictions;

const unfilteredFieldGroups: FieldGroups = useMemo(() => {
const fieldByName = keyBy(allFields, 'name');
const containsData = (field: IndexPatternField) => {
const overallField = fieldByName[field.name];
const overallField = currentIndexPattern.getFieldByName(field.name);

return (
overallField && fieldExists(existingFields, currentIndexPattern.title, overallField.name)
Expand Down
Loading