Skip to content

Commit fed455e

Browse files
committed
fix: fix overview limits
1 parent 539f653 commit fed455e

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import {
1515
TENANT_PAGES_IDS,
1616
TENANT_QUERY_TABS_ID,
1717
} from '../../../../../store/reducers/tenant/constants';
18-
import {TENANT_OVERVIEW_TABLES_SETTINGS} from '../../../../../utils/constants';
18+
import {
19+
TENANT_OVERVIEW_TABLES_LIMIT,
20+
TENANT_OVERVIEW_TABLES_SETTINGS,
21+
} from '../../../../../utils/constants';
1922
import {useAutoRefreshInterval, useTypedDispatch} from '../../../../../utils/hooks';
2023
import {useChangeInputWithConfirmation} from '../../../../../utils/hooks/withConfirmation/useChangeInputWithConfirmation';
2124
import {parseQueryErrorToString} from '../../../../../utils/query';
@@ -45,7 +48,7 @@ export function TopQueries({tenantName}: TopQueriesProps) {
4548
}, []);
4649

4750
const {currentData, isFetching, error} = topQueriesApi.useGetTopQueriesQuery(
48-
{database: tenantName, timeFrame: 'hour'},
51+
{database: tenantName, timeFrame: 'hour', limit: TENANT_OVERVIEW_TABLES_LIMIT},
4952
{pollingInterval: autoRefreshInterval},
5053
);
5154

src/store/reducers/executeTopQueries/executeTopQueries.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const getQueryText = (
3131
timeFrame: TimeFrame,
3232
filters?: TopQueriesFilters,
3333
sortOrder?: SortOrder[],
34+
limit?: number,
3435
) => {
3536
const orderBy = prepareOrderByFromTableSort(sortOrder);
3637

@@ -69,11 +70,15 @@ const getQueryText = (
6970
FROM \`${tableName}\`
7071
WHERE ${filterConditions || 'true'} AND QueryText NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
7172
${orderBy}
72-
LIMIT 100
73+
LIMIT ${limit || 100}
7374
`;
7475
};
7576

76-
function getRunningQueriesText(filters?: TopQueriesFilters, sortOrder?: SortOrder[]) {
77+
function getRunningQueriesText(
78+
filters?: TopQueriesFilters,
79+
sortOrder?: SortOrder[],
80+
limit?: number,
81+
) {
7782
const filterConditions = filters?.text
7883
? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
7984
: '';
@@ -89,13 +94,14 @@ SELECT
8994
FROM \`.sys/query_sessions\`
9095
WHERE ${filterConditions || 'true'} AND Query NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
9196
${orderBy}
92-
LIMIT 100`;
97+
LIMIT ${limit || 100}`;
9398
}
9499

95100
interface QueriesRequestParams {
96101
database: string;
97102
filters?: TopQueriesFilters;
98103
sortOrder?: SortOrder[];
104+
limit?: number;
99105
}
100106

101107
type TopQueriesRequestParams = QueriesRequestParams & {timeFrame: TimeFrame};
@@ -106,7 +112,7 @@ export const topQueriesApi = api.injectEndpoints({
106112
endpoints: (build) => ({
107113
getTopQueries: build.query({
108114
queryFn: async (
109-
{database, filters, sortOrder, timeFrame}: TopQueriesRequestParams,
115+
{database, filters, sortOrder, timeFrame, limit}: TopQueriesRequestParams,
110116
{signal},
111117
) => {
112118
const preparedFilters = {
@@ -118,7 +124,7 @@ export const topQueriesApi = api.injectEndpoints({
118124
try {
119125
const response = await window.api.viewer.sendQuery(
120126
{
121-
query: getQueryText(timeFrame, preparedFilters, sortOrder),
127+
query: getQueryText(timeFrame, preparedFilters, sortOrder, limit),
122128
database,
123129
action: 'execute-scan',
124130
},
@@ -151,13 +157,13 @@ export const topQueriesApi = api.injectEndpoints({
151157
}),
152158
getRunningQueries: build.query({
153159
queryFn: async (
154-
{database, filters, sortOrder}: RunningQueriesRequestParams,
160+
{database, filters, sortOrder, limit}: RunningQueriesRequestParams,
155161
{signal},
156162
) => {
157163
try {
158164
const response = await window.api.viewer.sendQuery(
159165
{
160-
query: getRunningQueriesText(filters, sortOrder),
166+
query: getRunningQueriesText(filters, sortOrder, limit),
161167
database,
162168
action: 'execute-scan',
163169
},

0 commit comments

Comments
 (0)