Skip to content

fix: cancel previous multipart request if the new one starts #2559

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 3 commits into from
Jul 10, 2025
Merged

fix: cancel previous multipart request if the new one starts #2559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a573f40
fix: cancel previous multipart request if the new one starts
astandrik Jul 10, 2025
bb64328
fix: DRY
astandrik Jul 10, 2025
02d9463
fix: add comment
astandrik Jul 10, 2025
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
3 changes: 3 additions & 0 deletions src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ export default function QueryEditor(props: QueryEditorProps) {
}
const queryId = uuidv4();

// Abort previous query if there was any
queryManagerInstance.abortQuery();

if (isStreamingEnabled) {
const query = streamQuery({
actionType: 'execute',
Expand Down
11 changes: 10 additions & 1 deletion src/store/reducers/query/query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ export const queryApi = api.injectEndpoints({
return {data: null};
} catch (error) {
const state = getState() as RootState;
if (state.query.result?.startTime !== startTime) {
// This query is no longer current, don't update state
return {error};
}
dispatch(
setQueryResult({
...state.query.result,
Expand All @@ -321,7 +325,7 @@ export const queryApi = api.injectEndpoints({
enableTracingLevel,
queryId,
},
{signal, dispatch},
{signal, dispatch, getState},
) => {
const startTime = Date.now();
dispatch(
Expand Down Expand Up @@ -410,6 +414,11 @@ export const queryApi = api.injectEndpoints({
);
return {data: null};
} catch (error) {
const state = getState() as RootState;
if (state.query.result?.startTime !== startTime) {
// This query is no longer current, don't update state
return {error};
}
dispatch(
setQueryResult({
type: actionType,
Expand Down
Loading