Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Web console: fix result count (#14786) 

* fix result count

* fixes
This commit is contained in:
Vadim Ogievetsky 2023-08-09 08:03:01 -07:00 committed by GitHub
parent 8f102f9031
commit b1988b2f93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web-console/src/views/workbench-view/execution-summary-panel/execution-summary-panel.tsx
View File

@ -23,7 +23,12 @@ import type { JSX } from 'react';
import React, { useState } from 'react'; import React, { useState } from 'react';
import type { Execution } from '../../../druid-models'; import type { Execution } from '../../../druid-models';
import { downloadQueryResults, formatDurationHybrid, pluralIfNeeded } from '../../../utils'; import {
downloadQueryResults,
formatDurationHybrid,
formatInteger,
pluralIfNeeded,
} from '../../../utils';
import { DestinationPagesDialog } from '../destination-pages-dialog/destination-pages-dialog'; import { DestinationPagesDialog } from '../destination-pages-dialog/destination-pages-dialog';
import './execution-summary-panel.scss'; import './execution-summary-panel.scss';
@ -45,11 +50,17 @@ export const ExecutionSummaryPanel = React.memo(function ExecutionSummaryPanel(
if (queryResult) { if (queryResult) {
const wrapQueryLimit = queryResult.getSqlOuterLimit(); const wrapQueryLimit = queryResult.getSqlOuterLimit();
let resultCount: string;
const numTotalRows = execution?.destination?.numTotalRows;
if (typeof wrapQueryLimit === 'undefined' && typeof numTotalRows === 'number') {
resultCount = pluralIfNeeded(numTotalRows, 'result');
} else {
const hasMoreResults = queryResult.getNumResults() === wrapQueryLimit; const hasMoreResults = queryResult.getNumResults() === wrapQueryLimit;
const resultCount = hasMoreResults resultCount = hasMoreResults
? `${queryResult.getNumResults() - 1}+ results` ? `${formatInteger(queryResult.getNumResults() - 1)}+ results`
: pluralIfNeeded(queryResult.getNumResults(), 'result'); : pluralIfNeeded(queryResult.getNumResults(), 'result');
}
const warningCount = execution?.stages?.getWarningCount(); const warningCount = execution?.stages?.getWarningCount();

2
web-console/src/views/workbench-view/run-panel/run-panel.tsx
View File

@ -347,7 +347,7 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
))} ))}
<MenuDivider /> <MenuDivider />
<MenuCheckbox <MenuCheckbox
checked={selectDestination === 'taskReport' ? !query.unlimited : undefined} checked={selectDestination === 'taskReport' ? !query.unlimited : false}
intent={intent} intent={intent}
disabled={selectDestination !== 'taskReport'} disabled={selectDestination !== 'taskReport'}
text="Limit SELECT results in taskReport" text="Limit SELECT results in taskReport"