perf: Optimize performance of Results and Samples tables on Explore (#12257)

This commit is contained in:
Kamil Gabryjelski 2021-01-08 21:07:51 +01:00 committed by GitHub
parent 76b06b215f
commit fd15dff60e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 51 deletions

View File

@ -23,7 +23,6 @@ import {
buildV1ChartDataPayload,
getExploreUrl,
getExploreLongUrl,
getDataTablePageSize,
shouldUseLegacyApi,
getSimpleSQLExpression,
} from 'src/explore/exploreUtils';
@ -202,20 +201,6 @@ describe('exploreUtils', () => {
});
});
describe('getDataTablePageSize', () => {
it('divides samples data into pages dynamically', () => {
let pageSize;
pageSize = getDataTablePageSize(500);
expect(pageSize).toEqual(20);
pageSize = getDataTablePageSize(0);
expect(pageSize).toEqual(50);
pageSize = getDataTablePageSize(1);
expect(pageSize).toEqual(10000);
pageSize = getDataTablePageSize(1000000);
expect(pageSize).toEqual(5);
});
});
describe('buildV1ChartDataPayload', () => {
it('generate valid request payload despite no registered buildQuery', () => {
const v1RequestPayload = buildV1ChartDataPayload({

View File

@ -56,6 +56,7 @@ const TableViewStyles = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.row-count-container {
@ -165,4 +166,4 @@ const TableView = ({
);
};
export default TableView;
export default React.memo(TableView);

View File

@ -52,9 +52,6 @@ export const Table = styled.table`
background: ${({ theme }) => theme.colors.grayscale.light5};
position: sticky;
top: 0;
white-space: nowrap;
&:first-of-type {
padding-left: ${({ theme }) => theme.gridUnit * 4}px;
}
@ -205,17 +202,17 @@ export const Table = styled.table`
Table.displayName = 'table';
export default function TableCollection({
getTableProps,
getTableBodyProps,
prepareRow,
headerGroups,
columns,
rows,
loading,
highlightRowId,
}: TableCollectionProps) {
return (
export default React.memo(
({
getTableProps,
getTableBodyProps,
prepareRow,
headerGroups,
columns,
rows,
loading,
highlightRowId,
}: TableCollectionProps) => (
<Table
{...getTableProps()}
className="table table-hover"
@ -314,5 +311,5 @@ export default function TableCollection({
})}
</tbody>
</Table>
);
}
),
);

View File

@ -44,6 +44,12 @@ export const CopyButton = styled(Button)`
}
`;
const CopyNode = (
<CopyButton buttonSize="xs">
<i className="fa fa-clipboard" />
</CopyButton>
);
export const CopyToClipboardButton = ({
data,
}: {
@ -52,11 +58,7 @@ export const CopyToClipboardButton = ({
<CopyToClipboard
text={data ? prepareCopyToClipboardTabularData(data) : ''}
wrapped={false}
copyNode={
<CopyButton buttonSize="xs">
<i className="fa fa-clipboard" />
</CopyButton>
}
copyNode={CopyNode}
/>
);

View File

@ -24,7 +24,6 @@ import Loading from 'src/components/Loading';
import TableView, { EmptyWrapperType } from 'src/components/TableView';
import { getChartDataRequest } from 'src/chart/chartAction';
import { getClientErrorObject } from 'src/utils/getClientErrorObject';
import { getDataTablePageSize } from 'src/explore/exploreUtils';
import {
CopyToClipboardButton,
FilterInput,
@ -43,6 +42,8 @@ const NULLISH_RESULTS_STATE = {
[RESULT_TYPES.samples]: undefined,
};
const DATA_TABLE_PAGE_SIZE = 50;
const TableControlsWrapper = styled.div`
display: flex;
align-items: center;
@ -189,9 +190,6 @@ export const DataTablesPane = ({
};
const renderDataTable = (type: string) => {
// restrict cell count to 10000 or min 5 rows to avoid crashing browser
const columnsLength = columns[type].length;
const pageSize = getDataTablePageSize(columnsLength);
if (isLoading[type]) {
return <Loading />;
}
@ -206,8 +204,7 @@ export const DataTablesPane = ({
<TableView
columns={columns[type]}
data={filteredData[type]}
withPagination
pageSize={pageSize}
pageSize={DATA_TABLE_PAGE_SIZE}
noDataText={t('No data')}
emptyWrapperType={EmptyWrapperType.Small}
className="table-condensed"

View File

@ -251,14 +251,6 @@ export function postForm(url, payload, target = '_blank') {
document.body.removeChild(hiddenForm);
}
export function getDataTablePageSize(columnsLength) {
let pageSize;
if (columnsLength) {
pageSize = Math.ceil(Math.max(5, 10000 / columnsLength));
}
return pageSize || 50;
}
export const exportChart = ({
formData,
resultFormat = 'json',