mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Explore: Memory leak fix due to dedup selector (#20107)
Change custom hashing and lodash.memoize based selector for standard reselect.
This commit is contained in:
@@ -9,10 +9,11 @@ import {
|
||||
LogLevel,
|
||||
TimeZone,
|
||||
AbsoluteTimeRange,
|
||||
LogsModel,
|
||||
LogRowModel,
|
||||
LogsDedupStrategy,
|
||||
TimeRange,
|
||||
LogsMetaItem,
|
||||
GraphSeriesXY,
|
||||
} from '@grafana/data';
|
||||
|
||||
import { ExploreId, ExploreItemState } from 'app/types/explore';
|
||||
@@ -20,7 +21,7 @@ import { StoreState } from 'app/types';
|
||||
|
||||
import { changeDedupStrategy, updateTimeRange } from './state/actions';
|
||||
import { toggleLogLevelAction } from 'app/features/explore/state/actionTypes';
|
||||
import { deduplicatedLogsSelector, exploreItemUIStateSelector } from 'app/features/explore/state/selectors';
|
||||
import { deduplicatedRowsSelector } from 'app/features/explore/state/selectors';
|
||||
import { getTimeZone } from '../profile/state/selectors';
|
||||
import { LiveLogsWithTheme } from './LiveLogs';
|
||||
import { Logs } from './Logs';
|
||||
@@ -33,8 +34,11 @@ interface LogsContainerProps {
|
||||
loading: boolean;
|
||||
|
||||
logsHighlighterExpressions?: string[];
|
||||
logsResult?: LogsModel;
|
||||
dedupedResult?: LogsModel;
|
||||
logRows?: LogRowModel[];
|
||||
logsMeta?: LogsMetaItem[];
|
||||
logsSeries?: GraphSeriesXY[];
|
||||
dedupedRows?: LogRowModel[];
|
||||
|
||||
onClickFilterLabel?: (key: string, value: string) => void;
|
||||
onClickFilterOutLabel?: (key: string, value: string) => void;
|
||||
onStartScanning: () => void;
|
||||
@@ -86,8 +90,10 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
|
||||
const {
|
||||
loading,
|
||||
logsHighlighterExpressions,
|
||||
logsResult,
|
||||
dedupedResult,
|
||||
logRows,
|
||||
logsMeta,
|
||||
logsSeries,
|
||||
dedupedRows,
|
||||
onClickFilterLabel,
|
||||
onClickFilterOutLabel,
|
||||
onStartScanning,
|
||||
@@ -108,7 +114,7 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
|
||||
<LiveTailControls exploreId={exploreId}>
|
||||
{controls => (
|
||||
<LiveLogsWithTheme
|
||||
logsResult={logsResult}
|
||||
logRows={logRows}
|
||||
timeZone={timeZone}
|
||||
stopLive={controls.stop}
|
||||
isPaused={this.props.isPaused}
|
||||
@@ -123,8 +129,10 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
|
||||
<Collapse label="Logs" loading={loading} isOpen>
|
||||
<Logs
|
||||
dedupStrategy={this.props.dedupStrategy || LogsDedupStrategy.none}
|
||||
data={logsResult}
|
||||
dedupedData={dedupedResult}
|
||||
logRows={logRows}
|
||||
logsMeta={logsMeta}
|
||||
logsSeries={logsSeries}
|
||||
dedupedRows={dedupedRows}
|
||||
highlighterExpressions={logsHighlighterExpressions}
|
||||
loading={loading}
|
||||
onChangeTime={this.onChangeTime}
|
||||
@@ -162,19 +170,21 @@ function mapStateToProps(state: StoreState, { exploreId }: { exploreId: string }
|
||||
isPaused,
|
||||
range,
|
||||
absoluteRange,
|
||||
dedupStrategy,
|
||||
} = item;
|
||||
const { dedupStrategy } = exploreItemUIStateSelector(item);
|
||||
const dedupedResult = deduplicatedLogsSelector(item);
|
||||
const dedupedRows = deduplicatedRowsSelector(item);
|
||||
const timeZone = getTimeZone(state.user);
|
||||
|
||||
return {
|
||||
loading,
|
||||
logsHighlighterExpressions,
|
||||
logsResult,
|
||||
logRows: logsResult && logsResult.rows,
|
||||
logsMeta: logsResult && logsResult.meta,
|
||||
logsSeries: logsResult && logsResult.series,
|
||||
scanning,
|
||||
timeZone,
|
||||
dedupStrategy,
|
||||
dedupedResult,
|
||||
dedupedRows,
|
||||
datasourceInstance,
|
||||
isLive,
|
||||
isPaused,
|
||||
|
||||
Reference in New Issue
Block a user