Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use existing queryId if it exists (#11834)

This commit is contained in:
Vadim Ogievetsky 2021-10-23 19:02:39 -07:00 committed by GitHub
parent d4cace385f
commit 4354e43983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web-console/src/views/query-view/query-view.tsx
View File

@ -48,7 +48,7 @@ import {
RowColumn, RowColumn,
stringifyValue, stringifyValue,
} from '../../utils'; } from '../../utils';
import { isEmptyContext, QueryContext } from '../../utils/query-context'; import { QueryContext } from '../../utils/query-context';
import { QueryRecord, QueryRecordUtil } from '../../utils/query-history'; import { QueryRecord, QueryRecordUtil } from '../../utils/query-history';
import { ColumnTree } from './column-tree/column-tree'; import { ColumnTree } from './column-tree/column-tree';
@ -203,31 +203,27 @@ export class QueryView extends React.PureComponent<QueryViewProps, QueryViewStat
cancelToken, cancelToken,
): Promise<QueryResult> => { ): Promise<QueryResult> => {
const { queryString, queryContext, wrapQueryLimit } = queryWithContext; const { queryString, queryContext, wrapQueryLimit } = queryWithContext;
const isSql = !QueryView.isJsonLike(queryString); const isSql = !QueryView.isJsonLike(queryString);
const query = isSql ? queryString : Hjson.parse(queryString); const query = isSql ? queryString : Hjson.parse(queryString);
const context = { ...queryContext, ...(mandatoryQueryContext || {}) };
const queryId = uuidv4();
let context: Record<string, any> | undefined;
if (!isEmptyContext(queryContext) || wrapQueryLimit || mandatoryQueryContext) {
context = { ...queryContext, ...(mandatoryQueryContext || {}) };
if (isSql) {
context.sqlQueryId = queryId;
} else {
context.queryId = queryId;
}
if (typeof wrapQueryLimit !== 'undefined') { if (typeof wrapQueryLimit !== 'undefined') {
context.sqlOuterLimit = wrapQueryLimit + 1; context.sqlOuterLimit = wrapQueryLimit + 1;
} }
const queryIdKey = isSql ? 'sqlQueryId' : 'queryId';
// Look for the queryId in the JSON itself (if native) or in the context object.
let cancelQueryId = (isSql ? undefined : query.context?.queryId) || context[queryIdKey];
if (!cancelQueryId) {
// If the queryId (sqlQueryId) is not explicitly set on the context generate one so it is possible to cancel the query.
cancelQueryId = context[queryIdKey] = uuidv4();
} }
void cancelToken.promise void cancelToken.promise
.then(() => { .then(() => {
return Api.instance.delete(`/druid/v2${isSql ? '/sql' : ''}/${queryId}`); return Api.instance.delete(
`/druid/v2${isSql ? '/sql' : ''}/${Api.encodePath(cancelQueryId)}`,
);
}) })
.catch(() => {}); .catch(() => {});