make sure execution mode is set (#14606)

This commit is contained in:
Vadim Ogievetsky 2023-07-18 11:54:30 -07:00 committed by GitHub
parent cab93fb817
commit 0a8262edc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 22 deletions

View File

@ -195,19 +195,14 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
test1 test1
</option> </option>
<option <option
value="test" value="test2"
> >
test test2
</option> </option>
<option <option
value="test" value="test3"
> >
test test3
</option>
<option
value="test"
>
test
</option> </option>
</select> </select>
<span <span

View File

@ -26,7 +26,7 @@ describe('RuleEditor', () => {
const ruleEditor = ( const ruleEditor = (
<RuleEditor <RuleEditor
rule={{ type: 'loadForever', tieredReplicants: { test1: 1 } }} rule={{ type: 'loadForever', tieredReplicants: { test1: 1 } }}
tiers={['test', 'test', 'test']} tiers={['test1', 'test2', 'test3']}
onChange={() => {}} onChange={() => {}}
onDelete={() => {}} onDelete={() => {}}
moveUp={undefined} moveUp={undefined}

View File

@ -36,6 +36,15 @@ const USE_TASK_REPORTS = true;
const WAIT_FOR_SEGMENT_METADATA_TIMEOUT = 180000; // 3 minutes to wait until segments appear in the metadata const WAIT_FOR_SEGMENT_METADATA_TIMEOUT = 180000; // 3 minutes to wait until segments appear in the metadata
const WAIT_FOR_SEGMENT_LOAD_TIMEOUT = 540000; // 9 minutes to wait for segments to load at all const WAIT_FOR_SEGMENT_LOAD_TIMEOUT = 540000; // 9 minutes to wait for segments to load at all
// some executionMode has to be set on the /druid/v2/sql/statements API
function ensureExecutionModeIsSet(context: QueryContext | undefined): QueryContext {
if (typeof context?.executionMode === 'string') return context;
return {
...context,
executionMode: 'async',
};
}
export interface SubmitTaskQueryOptions { export interface SubmitTaskQueryOptions {
query: string | Record<string, any>; query: string | Record<string, any>;
context?: QueryContext; context?: QueryContext;
@ -65,26 +74,22 @@ export async function submitTaskQuery(
sqlQuery = query; sqlQuery = query;
jsonQuery = { jsonQuery = {
query: sqlQuery, query: sqlQuery,
context: ensureExecutionModeIsSet(context),
resultFormat: 'array', resultFormat: 'array',
header: true, header: true,
typesHeader: true, typesHeader: true,
sqlTypesHeader: true, sqlTypesHeader: true,
context: context,
}; };
} else { } else {
sqlQuery = query.query; sqlQuery = query.query;
if (context) { jsonQuery = {
jsonQuery = { ...query,
...query, context: ensureExecutionModeIsSet({
context: { ...query.context,
...(query.context || {}), ...context,
...context, }),
}, };
};
} else {
jsonQuery = query;
}
} }
let sqlAsyncResp: AxiosResponse<AsyncStatusResponse>; let sqlAsyncResp: AxiosResponse<AsyncStatusResponse>;