fix: move speed metrics to result sets

Author: astandrik

src/containers/Tenant/Query/QueryResult/QueryResultViewer.tsx

@@ -114,7 +114,7 @@ export function QueryResultViewer({
     });
     const [useShowPlanToSvg] = useSetting<boolean>(USE_SHOW_PLAN_SVG_KEY);
 
-    const {error, isLoading, data = {}, speedMetrics} = result;
+    const {error, isLoading, data = {}} = result;
     const {preparedPlan, simplifiedPlan, stats, resultSets, ast} = data;
 
     React.useEffect(() => {
@@ -227,7 +227,6 @@ export function QueryResultViewer({
         if (activeSection === RESULT_OPTIONS_IDS.result) {
             return (
                 <ResultSetsViewer
-                    rowsPerSecond={speedMetrics?.rowsPerSecond}
                     resultSets={resultSets}
                     selectedResultSet={selectedResultSet}
                     errorHeader={<QueryResultError error={error} />}

src/containers/Tenant/Query/QueryResult/components/ResultSetsViewer/ResultSetsViewer.tsx

@@ -11,7 +11,6 @@ import './ResultSetsViewer.scss';
 const b = cn('ydb-query-result-sets-viewer');
 
 interface ResultSetsViewerProps {
-    rowsPerSecond?: number;
     resultSets?: ParsedResultSet[];
     selectedResultSet: number;
     errorHeader?: React.ReactNode;
@@ -54,18 +53,13 @@ export function ResultSetsViewer(props: ResultSetsViewerProps) {
                     {currentResult?.truncated ? i18n('title.truncated') : i18n('title.result')}
                 </Text>
                 {currentResult?.result ? (
-                    <Text
-                        color="secondary"
-                        variant="body-2"
-                        className={b('row-count')}
-                    >{`(${currentResult?.result.length})`}</Text>
-                ) : null}
-                {props.rowsPerSecond ? (
-                    <Text
-                        color="secondary"
-                        variant="body-2"
-                        className={b('row-count')}
-                    >{`(${props.rowsPerSecond.toFixed(0)} rows/s)`}</Text>
+                    <Text color="secondary" variant="body-2" className={b('row-count')}>
+                        {`(${currentResult?.result.length}${
+                            currentResult.speedMetrics?.rowsPerSecond
+                                ? `, ${currentResult.speedMetrics.rowsPerSecond.toFixed(0)} rows/s`
+                                : ''
+                        })`}
+                    </Text>
                 ) : null}
             </div>
         );

src/services/api/streaming.ts

@@ -45,7 +45,10 @@ export class StreamingAPI extends BaseYdbAPI {
             true,
         );
 
-        const queryParams = qs.stringify({...params, base64}, {encoder: encodeURIComponent});
+        const queryParams = qs.stringify(
+            {...params, base64, schema: 'multipart'},
+            {encoder: encodeURIComponent},
+        );
 
         const headers = new Headers({
             Accept: 'multipart/x-mixed-replace',

src/store/reducers/query/streamingReducers.ts

@@ -1,5 +1,6 @@
 import type {PayloadAction} from '@reduxjs/toolkit';
 
+import type {SpeedMetrics} from '../../../types/store/query';
 import type {
     QueryResponseChunk,
     SessionChunk,
@@ -57,8 +58,6 @@ export const setStreamQueryResponse = (
     }
 };
 
-type SpeedMetrics = NonNullable<NonNullable<QueryState['result']>['speedMetrics']>;
-
 const updateSpeedMetrics = (metrics: SpeedMetrics, totalNewRows: number) => {
     const currentTime = Date.now();
     const WINDOW_SIZE = 5000; // 5 seconds in milliseconds
@@ -87,11 +86,6 @@ export const addStreamingChunks = (state: QueryState, action: PayloadAction<Stre
     }
 
     state.result.data = state.result.data || prepareQueryData(null);
-    state.result.speedMetrics = state.result.speedMetrics || {
-        rowsPerSecond: 0,
-        lastUpdateTime: Date.now(),
-        recentChunks: [],
-    };
     state.result.data.resultSets = state.result.data.resultSets || [];
 
     // Merge chunks by result index
@@ -115,10 +109,6 @@ export const addStreamingChunks = (state: QueryState, action: PayloadAction<Stre
         0,
     );
 
-    if (state.result.speedMetrics) {
-        updateSpeedMetrics(state.result.speedMetrics, totalNewRows);
-    }
-
     // Process merged chunks
     for (const [resultIndex, chunk] of mergedChunks.entries()) {
         const {columns, rows} = chunk.result;
@@ -127,6 +117,11 @@ export const addStreamingChunks = (state: QueryState, action: PayloadAction<Stre
         ] || {
             columns: [],
             result: [],
+            speedMetrics: {
+                rowsPerSecond: 0,
+                lastUpdateTime: Date.now(),
+                recentChunks: [],
+            },
         });
 
         if (columns && !resultSet.columns?.length) {
@@ -136,5 +131,9 @@ export const addStreamingChunks = (state: QueryState, action: PayloadAction<Stre
         const safeRows = rows || [];
         const formattedRows = parseResult(safeRows, resultSet.columns || []);
         resultSet.result?.push(...formattedRows);
+
+        if (resultSet.speedMetrics) {
+            updateSpeedMetrics(resultSet.speedMetrics, totalNewRows);
+        }
     }
 };

src/store/reducers/query/types.ts

@@ -48,22 +48,12 @@ export interface PreparedQueryData extends IQueryResult {
     simplifiedPlan?: SimplifiedPlan;
 }
 
-export interface SpeedMetrics {
-    rowsPerSecond: number;
-    lastUpdateTime: number;
-    recentChunks: Array<{
-        timestamp: number;
-        rowCount: number;
-    }>;
-}
-
 export interface QueryResult {
     type: QueryAction;
     data?: PreparedQueryData;
     error?: unknown;
     queryId: string;
     isLoading: boolean;
-    speedMetrics?: SpeedMetrics;
 }
 
 export interface QueryState {

src/types/store/query.ts

@@ -20,10 +20,20 @@ import type {
 } from '../api/query';
 import type {ValueOf} from '../common';
 
+export interface SpeedMetrics {
+    rowsPerSecond: number;
+    lastUpdateTime: number;
+    recentChunks: Array<{
+        timestamp: number;
+        rowCount: number;
+    }>;
+}
+
 export interface ParsedResultSet {
     columns?: ColumnType[];
     result?: KeyValueRow[];
     truncated?: boolean;
+    speedMetrics?: SpeedMetrics;
 }
 
 export interface IQueryResult {