Skip to content

fix: exclude top and running queries itself #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2024
Merged

fix: exclude top and running queries itself #1487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a555d32
fix: exclude top and running queries itself
sareyu Oct 17, 2024
f74471f
fix: typo
sareyu Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/store/reducers/executeTopQueries/executeTopQueries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {getFiltersConditions} from './utils';

const initialState: TopQueriesFilters = {};

const QUERY_TECHNICAL_MARK = '/*UI-QUERY-EXCLUDE*/';

const slice = createSlice({
name: 'executeTopQueries',
initialState,
Expand All @@ -26,7 +28,7 @@ export default slice.reducer;
const getQueryText = (path: string, filters?: TopQueriesFilters) => {
const filterConditions = getFiltersConditions(path, filters);
return `
SELECT
SELECT ${QUERY_TECHNICAL_MARK}
CPUTime as CPUTimeUs,
QueryText,
IntervalEnd,
Expand All @@ -36,7 +38,7 @@ SELECT
UserSID,
Duration
FROM \`${path}/.sys/top_queries_by_cpu_time_one_hour\`
WHERE ${filterConditions || 'true'}
WHERE ${filterConditions || 'true'} AND QueryText NOT LIKE '%${QUERY_TECHNICAL_MARK}%'
ORDER BY CPUTimeUs DESC
`;
};
Expand Down Expand Up @@ -98,7 +100,15 @@ export const topQueriesApi = api.injectEndpoints({
? `Query ILIKE '%${filters.text}%' OR UserSID ILIKE '%${filters.text}%'`
: '';

const queryText = `SELECT UserSID, QueryStartAt, Query as QueryText, ApplicationName from \`.sys/query_sessions\` WHERE ${filterConditions || 'true'} ORDER BY SessionStartAt limit 100`;
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}%'
ORDER BY
SessionStartAt
LIMIT 100`;

const response = await window.api.sendQuery(
{
Expand All @@ -115,13 +125,6 @@ export const topQueriesApi = api.injectEndpoints({

const data = parseQueryAPIExecuteResponse(response);

/* filter running queries query itself */
if (data?.resultSets?.[0]?.result) {
data.resultSets[0].result = data.resultSets[0].result.filter(
(item) => item.QueryText !== queryText,
);
}

return {data};
} catch (error) {
return {error};
Expand Down
Loading