Skip to content

Commit

Permalink
Revert "fix(sql lab): display the 'View Results' button consistently …
Browse files Browse the repository at this point in the history
…in the history tab on sync mode (#19362)" (#19906)

This reverts commit 6d5d03e.
  • Loading branch information
Gwitchr committed May 2, 2022
1 parent 6bd025d commit 1fa841e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
11 changes: 2 additions & 9 deletions superset-frontend/src/SqlLab/components/ResultSet/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,9 @@ export default class ResultSet extends React.PureComponent<
this.clearQueryResults(nextProps.query),
);
}

// Only fetch results if the result key change
// If we didn't have a result key before, then the results are loaded elsewhere
// so we can skip it, unless the query id changed, in that case we should
// refetch regardless.
if (
(this.props.query.resultsKey &&
nextProps.query.resultsKey &&
nextProps.query.resultsKey !== this.props.query.resultsKey) ||
(nextProps.query.id !== this.props.query.id && nextProps.query.resultsKey)
nextProps.query.resultsKey &&
nextProps.query.resultsKey !== this.props.query.resultsKey
) {
this.fetchResults(nextProps.query);
}
Expand Down
2 changes: 0 additions & 2 deletions superset-frontend/src/SqlLab/reducers/sqlLab.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,8 @@ export default function sqlLabReducer(state = {}, action) {
if (action.query.state === 'stopped') {
return state;
}

const alts = {
endDttm: now(),
resultsKey: action?.results?.query?.resultsKey,
progress: 100,
results: action.results,
rows: action?.results?.query?.rows || 0,
Expand Down
2 changes: 0 additions & 2 deletions superset/sql_lab.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,6 @@ def execute_sql_statements( # pylint: disable=too-many-arguments, too-many-loca

if store_results and results_backend:
key = str(uuid.uuid4())
payload["query"]["resultsKey"] = key

logger.info(
"Query %s: Storing results in results backend, key: %s", str(query_id), key
)
Expand Down

0 comments on commit 1fa841e

Please sign in to comment.