feat: Support multiple queries per request #11880
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,8 +52,8 @@ export function chartUpdateStarted(queryController, latestQueryFormData, key) { | |
| } | ||
|
|
||
| export const CHART_UPDATE_SUCCEEDED = 'CHART_UPDATE_SUCCEEDED'; | ||
| export function chartUpdateSucceeded(queriesResponse, key) { | ||
| return { type: CHART_UPDATE_SUCCEEDED, queriesResponse, key }; | ||
| } | ||
|
|
||
| export const CHART_UPDATE_STOPPED = 'CHART_UPDATE_STOPPED'; | ||
|
|
@@ -62,8 +62,8 @@ export function chartUpdateStopped(key) { | |
| } | ||
|
|
||
| export const CHART_UPDATE_FAILED = 'CHART_UPDATE_FAILED'; | ||
| export function chartUpdateFailed(queriesResponse, key) { | ||
| return { type: CHART_UPDATE_FAILED, queriesResponse, key }; | ||
| } | ||
|
|
||
| export const CHART_UPDATE_QUEUED = 'CHART_UPDATE_QUEUED'; | ||
|
|
@@ -361,38 +361,36 @@ export function exploreJSON( | |
|
|
||
| const chartDataRequestCaught = chartDataRequest | ||
| .then(response => { | ||
| const queriesResponse = response.result; | ||
|
|
||
| if (isFeatureEnabled(FeatureFlag.GLOBAL_ASYNC_QUERIES)) { | ||
| // deal with getChartDataRequest transforming the response data | ||
| const result = 'result' in response ? response.result[0] : response; | ||
| return dispatch(chartUpdateQueued(result, key)); | ||
|
There was a problem hiding this comment. @robdiciuccio should we continue sending a single result to chartUpdateQuered action? There was a problem hiding this comment. Yes, the return value here is a async job metadata payload. |
||
| } | ||
|
|
||
| queriesResponse.forEach(resultItem => | ||
| dispatch( | ||
| logEvent(LOG_ACTIONS_LOAD_CHART, { | ||
| slice_id: key, | ||
| applied_filters: resultItem.applied_filters, | ||
| is_cached: resultItem.is_cached, | ||
| force_refresh: force, | ||
| row_count: resultItem.rowcount, | ||
| datasource: formData.datasource, | ||
| start_offset: logStart, | ||
| ts: new Date().getTime(), | ||
| duration: Logger.getTimestamp() - logStart, | ||
| has_extra_filters: | ||
| formData.extra_filters && formData.extra_filters.length > 0, | ||
| viz_type: formData.viz_type, | ||
| data_age: resultItem.is_cached | ||
| ? moment(new Date()).diff(moment.utc(resultItem.cached_dttm)) | ||
| : null, | ||
| }), | ||
| ), | ||
| ); | ||
| return dispatch(chartUpdateSucceeded(queriesResponse, key)); | ||
| }) | ||
| .catch(response => { | ||
| const appendErrorLog = (errorDetails, isCached) => { | ||
|
|
@@ -419,7 +417,7 @@ export function exploreJSON( | |
| } else { | ||
| appendErrorLog(parsedResponse.error, parsedResponse.is_cached); | ||
| } | ||
| return dispatch(chartUpdateFailed([parsedResponse], key)); | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ export const chart = { | |
| chartUpdateStartTime: 0, | ||
| latestQueryFormData: {}, | ||
| queryController: null, | ||
| queriesResponse: null, | ||
| triggerQuery: true, | ||
| lastRendered: 0, | ||
| }; | ||
|
|
@@ -47,8 +47,8 @@ export default function chartReducer(charts = {}, action) { | |
| return { | ||
| ...state, | ||
| chartStatus: 'success', | ||
| chartAlert: null, | ||
| queriesResponse: action.queriesResponse, | ||
| chartUpdateEndTime: now(), | ||
| }; | ||
| }, | ||
|
|
@@ -97,13 +97,13 @@ export default function chartReducer(charts = {}, action) { | |
| return { | ||
| ...state, | ||
| chartStatus: 'failed', | ||
| chartAlert: action.queriesResponse | ||
| ? action.queriesResponse?.[0]?.error | ||
| : t('Network error.'), | ||
| chartUpdateEndTime: now(), | ||
| queriesResponse: action.queriesResponse, | ||
| chartStackTrace: action.queriesResponse | ||
|
There was a problem hiding this comment. @etr2460 and also this one please |
||
| ? action.queriesResponse?.[0]?.stacktrace | ||
| : null, | ||
| }; | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -132,12 +132,12 @@ export const selectIndicatorsForChart = ( | |
| // for now we only need to know which columns are compatible/incompatible, | ||
| // so grab the columns from the applied/rejected filters | ||
| const appliedColumns: Set<string> = new Set( | ||
| (chart?.queriesResponse?.[0]?.applied_filters || []).map( | ||
|
There was a problem hiding this comment. @etr2460 Hi I see you implemented this part of code, I refactored it to use multi queries, can you please look that my changes not break some functionality. Thanks There was a problem hiding this comment. I implemented this logic. The goal of these two lines is to get a set of all the filters that were applied on a chart, and the filters that were rejected (due to the column not existing in the dataset), in order to display them in the filter badge. If a chart makes multiple queries, it would probably be more correct to add the There was a problem hiding this comment.
I think we should probably be applying the same filters to all |
||
| (filter: any) => filter.column, | ||
| ), | ||
| ); | ||
| const rejectedColumns: Set<string> = new Set( | ||
| (chart?.queriesResponse?.[0]?.rejected_filters || []).map( | ||
| (filter: any) => filter.column, | ||
| ), | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have a screenshot of multiple errors rendered in a chart?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@robdiciuccio Hi good catch, I didn't check it properly for all kinds of charts (new/old). I pushed now some small fix for it. Basically for now for new api there is no case that it returns more than 1 error per request even for multi queries, but if it will return we can support it, but for now it will be only one error.
P.S. If you have some more places where I can check this functionality, update me please, because I'm new in Superset so I don't know all places and cases of its usages :)
Attaching screenshots after my fix for charts:
Old charts:
New charts:
New charts with multiqueries (looks the same):
