feat: add QUERY_TECHNICAL_MARK to all UI queries

Author: artemmufazalov

src/store/reducers/cluster/utils.ts

@@ -1,20 +1,21 @@
 import type {TClusterInfoV2, TStorageStats} from '../../../types/api/cluster';
 import type {ExecuteQueryResponse, KeyValueRow} from '../../../types/api/query';
+import {QUERY_TECHNICAL_MARK} from '../../../utils/constants';
 import {parseQueryAPIResponse} from '../../../utils/query';
 
 import type {ClusterGroupsStats} from './types';
 
 export const createSelectClusterGroupsQuery = (clusterRoot: string) => {
-    return `
+    return `${QUERY_TECHNICAL_MARK}
 SELECT 
     PDiskFilter,
     ErasureSpecies,
     CurrentAvailableSize,
     CurrentAllocatedSize,
     CurrentGroupsCreated,
     AvailableGroupsToCreate
-    FROM \`${clusterRoot}/.sys/ds_storage_stats\`
-    ORDER BY CurrentGroupsCreated DESC;
+FROM \`${clusterRoot}/.sys/ds_storage_stats\`
+ORDER BY CurrentGroupsCreated DESC;
 `;
 };
 

src/store/reducers/executeTopQueries/executeTopQueries.ts

@@ -3,6 +3,7 @@ import type {SortOrder} from '@gravity-ui/react-data-table';
 import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
+import {QUERY_TECHNICAL_MARK} from '../../../utils/constants';
 import {prepareOrderByFromTableSort} from '../../../utils/hooks/useTableSort';
 import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../utils/query';
 import {api} from '../api';
@@ -12,8 +13,6 @@ import {getFiltersConditions} from './utils';
 
 const initialState: TopQueriesFilters = {};
 
-const QUERY_TECHNICAL_MARK = '/*UI-QUERY-EXCLUDE*/';
-
 const slice = createSlice({
     name: 'executeTopQueries',
     initialState,
@@ -32,8 +31,8 @@ const getQueryText = (path: string, filters?: TopQueriesFilters, sortOrder?: Sor
 
     const orderBy = prepareOrderByFromTableSort(sortOrder);
 
-    return `
-SELECT ${QUERY_TECHNICAL_MARK}
+    return `${QUERY_TECHNICAL_MARK}
+SELECT
     CPUTime as CPUTimeUs,
     QueryText,
     IntervalEnd,
@@ -49,6 +48,25 @@ LIMIT 100
 `;
 };
 
+function getRunningQueriesText(path: string, filters?: TopQueriesFilters, sortOrder?: SortOrder[]) {
+    const filterConditions = filters?.text
+        ? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
+        : '';
+
+    const orderBy = prepareOrderByFromTableSort(sortOrder);
+
+    return `${QUERY_TECHNICAL_MARK}
+SELECT
+    UserSID, 
+    QueryStartAt, 
+    Query as QueryText, 
+    ApplicationName
+FROM \`${path}/.sys/query_sessions\`
+WHERE ${filterConditions || 'true'} AND Query NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
+${orderBy}
+LIMIT 100`;
+}
+
 interface TopQueriesRequestParams {
     database: string;
     filters?: TopQueriesFilters;
@@ -102,24 +120,9 @@ export const topQueriesApi = api.injectEndpoints({
         getRunningQueries: build.query({
             queryFn: async ({database, filters, sortOrder}: TopQueriesRequestParams, {signal}) => {
                 try {
-                    const filterConditions = filters?.text
-                        ? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
-                        : '';
-
-                    const orderBy = prepareOrderByFromTableSort(sortOrder);
-
-                    const queryText = `SELECT ${QUERY_TECHNICAL_MARK}
-                        UserSID, QueryStartAt, Query as QueryText, ApplicationName
-                    FROM
-                        \`.sys/query_sessions\`
-                    WHERE
-                        ${filterConditions || 'true'} AND Query NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
-                    ${orderBy}
-                    LIMIT 100`;
-
                     const response = await window.api.viewer.sendQuery(
                         {
-                            query: queryText,
+                            query: getRunningQueriesText(database, filters, sortOrder),
                             database,
                             action: 'execute-scan',
                         },

src/store/reducers/shardsWorkload/shardsWorkload.ts

@@ -3,6 +3,7 @@ import type {SortOrder} from '@gravity-ui/react-data-table';
 import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
+import {QUERY_TECHNICAL_MARK} from '../../../utils/constants';
 import {prepareOrderByFromTableSort} from '../../../utils/hooks/useTableSort';
 import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../utils/query';
 import {api} from '../api';
@@ -54,7 +55,8 @@ function createShardQueryHistorical(
 
     const orderBy = prepareOrderByFromTableSort(sortOrder);
 
-    return `SELECT
+    return `${QUERY_TECHNICAL_MARK}    
+SELECT
     ${pathSelect},
     TabletId,
     CPUCores,
@@ -76,7 +78,8 @@ function createShardQueryImmediate(path: string, sortOrder?: SortOrder[], tenant
 
     const orderBy = prepareOrderByFromTableSort(sortOrder);
 
-    return `SELECT
+    return `${QUERY_TECHNICAL_MARK}    
+SELECT
     ${pathSelect},
     TabletId,
     CPUCores,

src/store/reducers/tenantOverview/executeTopTables/executeTopTables.ts

@@ -1,15 +1,15 @@
-import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../utils/constants';
+import {QUERY_TECHNICAL_MARK, TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../utils/constants';
 import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../../utils/query';
 import {api} from '../../api';
 
 const getQueryText = (path: string) => {
-    return `
+    return `${QUERY_TECHNICAL_MARK}
 SELECT
     Path, SUM(DataSize) as Size
 FROM \`${path}/.sys/partition_stats\`
 GROUP BY Path
-    ORDER BY Size DESC
-    LIMIT ${TENANT_OVERVIEW_TABLES_LIMIT}
+ORDER BY Size DESC
+LIMIT ${TENANT_OVERVIEW_TABLES_LIMIT}
 `;
 };
 

src/store/reducers/tenantOverview/topShards/tenantOverviewTopShards.ts

@@ -1,4 +1,4 @@
-import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../utils/constants';
+import {QUERY_TECHNICAL_MARK, TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../utils/constants';
 import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../../utils/query';
 import {api} from '../../api';
 
@@ -7,7 +7,8 @@ function createShardQuery(path: string, tenantName?: string) {
         ? `CAST(SUBSTRING(CAST(Path AS String), ${tenantName.length}) AS Utf8) AS Path`
         : 'Path';
 
-    return `SELECT
+    return `${QUERY_TECHNICAL_MARK}
+SELECT
     ${pathSelect},
     TabletId,
     CPUCores,

src/utils/constants.ts

@@ -52,6 +52,8 @@ export const TENANT_OVERVIEW_TABLES_LIMIT = 5;
 
 export const EMPTY_DATA_PLACEHOLDER = '—';
 
+export const QUERY_TECHNICAL_MARK = '/*UI-QUERY-EXCLUDE*/';
+
 // ==== Titles ====
 export const DEVELOPER_UI_TITLE = 'Developer UI';
 export const CLUSTER_DEFAULT_TITLE = 'Cluster';