[druid] branch master updated: Web console: fix result count (#14786)

[karan]

This is an automated email from the ASF dual-hosted git repository.

karan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new b1988b2f93 Web console: fix result count (#14786)
b1988b2f93 is described below

commit b1988b2f93d243e2685718a7d910fda2495a9bbd
Author: Vadim Ogievetsky <va...@ogievetsky.com>
AuthorDate: Wed Aug 9 08:03:01 2023 -0700

    Web console: fix result count (#14786)
    
    * fix result count
    
    * fixes
---
 .../execution-summary-panel.tsx                     | 21 ++++++++++++++++-----
 .../views/workbench-view/run-panel/run-panel.tsx    |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git 
a/web-console/src/views/workbench-view/execution-summary-panel/execution-summary-panel.tsx
 
b/web-console/src/views/workbench-view/execution-summary-panel/execution-summary-panel.tsx
index bdeb738196..9d1030133b 100644
--- 
a/web-console/src/views/workbench-view/execution-summary-panel/execution-summary-panel.tsx
+++ 
b/web-console/src/views/workbench-view/execution-summary-panel/execution-summary-panel.tsx
@@ -23,7 +23,12 @@ import type { JSX } from 'react';
 import React, { useState } from 'react';
 
 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 './execution-summary-panel.scss';
@@ -45,11 +50,17 @@ export const ExecutionSummaryPanel = React.memo(function 
ExecutionSummaryPanel(
 
   if (queryResult) {
     const wrapQueryLimit = queryResult.getSqlOuterLimit();
-    const hasMoreResults = queryResult.getNumResults() === wrapQueryLimit;
+    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 resultCount = hasMoreResults
-      ? `${queryResult.getNumResults() - 1}+ results`
-      : pluralIfNeeded(queryResult.getNumResults(), 'result');
+      resultCount = hasMoreResults
+        ? `${formatInteger(queryResult.getNumResults() - 1)}+ results`
+        : pluralIfNeeded(queryResult.getNumResults(), 'result');
+    }
 
     const warningCount = execution?.stages?.getWarningCount();
 
diff --git a/web-console/src/views/workbench-view/run-panel/run-panel.tsx 
b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
index 07b915332d..c196cfc21e 100644
--- a/web-console/src/views/workbench-view/run-panel/run-panel.tsx
+++ b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
@@ -347,7 +347,7 @@ export const RunPanel = React.memo(function RunPanel(props: 
RunPanelProps) {
                       ))}
                       <MenuDivider />
                       <MenuCheckbox
-                        checked={selectDestination === 'taskReport' ? 
!query.unlimited : undefined}
+                        checked={selectDestination === 'taskReport' ? 
!query.unlimited : false}
                         intent={intent}
                         disabled={selectDestination !== 'taskReport'}
                         text="Limit SELECT results in taskReport"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org