fix: use relative paths, remove unused conditions

Author: artemmufazalov

src/store/reducers/cluster/cluster.ts

@@ -87,7 +87,7 @@ export const clusterApi = api.injectEndpoints({
                     }
 
                     try {
-                        const query = createSelectClusterGroupsQuery(clusterRoot);
+                        const query = createSelectClusterGroupsQuery();
 
                         // Normally query request should be fulfilled within 300-400ms even on very big clusters
                         // Table with stats is supposed to be very small (less than 10 rows)

src/store/reducers/cluster/utils.ts

@@ -5,7 +5,7 @@ import {parseQueryAPIResponse} from '../../../utils/query';
 
 import type {ClusterGroupsStats} from './types';
 
-export const createSelectClusterGroupsQuery = (clusterRoot: string) => {
+export const createSelectClusterGroupsQuery = () => {
     return `${QUERY_TECHNICAL_MARK}
 SELECT 
     PDiskFilter,
@@ -14,7 +14,7 @@ SELECT
     CurrentAllocatedSize,
     CurrentGroupsCreated,
     AvailableGroupsToCreate
-FROM \`${clusterRoot}/.sys/ds_storage_stats\`
+FROM \`.sys/ds_storage_stats\`
 ORDER BY CurrentGroupsCreated DESC;
 `;
 };

src/store/reducers/executeTopQueries/executeTopQueries.ts

@@ -26,8 +26,8 @@ const slice = createSlice({
 export const {setTopQueriesFilters} = slice.actions;
 export default slice.reducer;
 
-const getQueryText = (database: string, filters?: TopQueriesFilters, sortOrder?: SortOrder[]) => {
-    const filterConditions = getFiltersConditions(database, filters);
+const getQueryText = (filters?: TopQueriesFilters, sortOrder?: SortOrder[]) => {
+    const filterConditions = getFiltersConditions(filters);
 
     const orderBy = prepareOrderByFromTableSort(sortOrder);
 
@@ -41,18 +41,14 @@ SELECT
     ReadBytes,
     UserSID,
     Duration
-FROM \`${database}/.sys/top_queries_by_cpu_time_one_hour\`
+FROM \`.sys/top_queries_by_cpu_time_one_hour\`
 WHERE ${filterConditions || 'true'} AND QueryText NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
 ${orderBy}
 LIMIT 100
 `;
 };
 
-function getRunningQueriesText(
-    database: string,
-    filters?: TopQueriesFilters,
-    sortOrder?: SortOrder[],
-) {
+function getRunningQueriesText(filters?: TopQueriesFilters, sortOrder?: SortOrder[]) {
     const filterConditions = filters?.text
         ? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
         : '';
@@ -65,7 +61,7 @@ SELECT
     QueryStartAt, 
     Query as QueryText, 
     ApplicationName
-FROM \`${database}/.sys/query_sessions\`
+FROM \`.sys/query_sessions\`
 WHERE ${filterConditions || 'true'} AND Query NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
 ${orderBy}
 LIMIT 100`;
@@ -90,7 +86,7 @@ export const topQueriesApi = api.injectEndpoints({
                 try {
                     const response = await window.api.viewer.sendQuery(
                         {
-                            query: getQueryText(database, preparedFilters, sortOrder),
+                            query: getQueryText(preparedFilters, sortOrder),
                             database,
                             action: 'execute-scan',
                         },
@@ -126,7 +122,7 @@ export const topQueriesApi = api.injectEndpoints({
                 try {
                     const response = await window.api.viewer.sendQuery(
                         {
-                            query: getRunningQueriesText(database, filters, sortOrder),
+                            query: getRunningQueriesText(filters, sortOrder),
                             database,
                             action: 'execute-scan',
                         },

src/store/reducers/executeTopQueries/utils.ts

@@ -5,13 +5,13 @@ import type {TopQueriesFilters} from './types';
 const endTimeColumn = 'EndTime';
 const intervalEndColumn = 'IntervalEnd';
 
-const getMaxIntervalSubquery = (database: string) => `(
+const getMaxIntervalSubquery = () => `(
     SELECT
         MAX(${intervalEndColumn})
-    FROM \`${database}/.sys/top_queries_by_cpu_time_one_hour\`
+    FROM \`.sys/top_queries_by_cpu_time_one_hour\`
 )`;
 
-export function getFiltersConditions(database: string, filters?: TopQueriesFilters) {
+export function getFiltersConditions(filters?: TopQueriesFilters) {
     const conditions: string[] = [];
     const to = dateTimeParse(Number(filters?.to) || filters?.to)?.valueOf();
     const from = dateTimeParse(Number(filters?.from) || filters?.from)?.valueOf();
@@ -33,7 +33,7 @@ export function getFiltersConditions(database: string, filters?: TopQueriesFilte
 
     // If there is no filters, return queries, that were executed in the last hour
     if (!from && !to) {
-        conditions.push(`${intervalEndColumn} IN ${getMaxIntervalSubquery(database)}`);
+        conditions.push(`${intervalEndColumn} IN ${getMaxIntervalSubquery()}`);
     }
 
     if (filters?.text) {

src/store/reducers/shardsWorkload/shardsWorkload.ts

@@ -42,9 +42,7 @@ function createShardQueryHistorical(
     filters?: ShardsWorkloadFilters,
     sortOrder?: SortOrder[],
 ) {
-    const pathSelect = database
-        ? `CAST(SUBSTRING(CAST(Path AS String), ${database.length}) AS Utf8) AS Path`
-        : 'Path';
+    const pathSelect = `CAST(SUBSTRING(CAST(Path AS String), ${database.length}) AS Utf8) AS Path`;
 
     let where = `Path='${path}' OR Path LIKE '${path}/%'`;
 
@@ -65,16 +63,14 @@ SELECT
     PeakTime,
     InFlightTxCount,
     IntervalEnd
-FROM \`${database}/.sys/top_partitions_one_hour\`
+FROM \`.sys/top_partitions_one_hour\`
 WHERE ${where}
 ${orderBy}
 LIMIT 20`;
 }
 
 function createShardQueryImmediate(path: string, database: string, sortOrder?: SortOrder[]) {
-    const pathSelect = database
-        ? `CAST(SUBSTRING(CAST(Path AS String), ${database.length}) AS Utf8) AS Path`
-        : 'Path';
+    const pathSelect = `CAST(SUBSTRING(CAST(Path AS String), ${database.length}) AS Utf8) AS Path`;
 
     const orderBy = prepareOrderByFromTableSort(sortOrder);
 
@@ -86,7 +82,7 @@ SELECT
     DataSize,
     NodeId,
     InFlightTxCount
-FROM \`${database}/.sys/partition_stats\`
+FROM \`.sys/partition_stats\`
 WHERE
     Path='${path}'
     OR Path LIKE '${path}/%'

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

@@ -2,11 +2,11 @@ import {QUERY_TECHNICAL_MARK, TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../ut
 import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../../utils/query';
 import {api} from '../../api';
 
-const getQueryText = (database: string) => {
+const getQueryText = () => {
     return `${QUERY_TECHNICAL_MARK}
 SELECT
     Path, SUM(DataSize) as Size
-FROM \`${database}/.sys/partition_stats\`
+FROM \`.sys/partition_stats\`
 GROUP BY Path
 ORDER BY Size DESC
 LIMIT ${TENANT_OVERVIEW_TABLES_LIMIT}
@@ -20,7 +20,7 @@ export const topTablesApi = api.injectEndpoints({
                 try {
                     const response = await window.api.viewer.sendQuery(
                         {
-                            query: getQueryText(database),
+                            query: getQueryText(),
                             database,
                             action: 'execute-scan',
                         },

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

@@ -3,16 +3,13 @@ import {isQueryErrorResponse, parseQueryAPIResponse} from '../../../../utils/que
 import {api} from '../../api';
 
 function createShardQuery(path: string, database: string) {
-    const pathSelect = database
-        ? `CAST(SUBSTRING(CAST(Path AS String), ${database.length}) AS Utf8) AS Path`
-        : 'Path';
-
+    const pathSelect = `CAST(SUBSTRING(CAST(Path AS String), ${database.length}) AS Utf8) AS Path`;
     return `${QUERY_TECHNICAL_MARK}
 SELECT
     ${pathSelect},
     TabletId,
     CPUCores,
-FROM \`${database}/.sys/partition_stats\`
+FROM \`.sys/partition_stats\`
 WHERE
     Path='${path}'
     OR Path LIKE '${path}/%'