database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[enhancement](timeout) fix set timeout failure and simplify timeout logic (#17837)

Browse Source
This commit is contained in:
奕冷
2023-03-25 21:56:06 +08:00
committed by GitHub
parent 193ae352e4
commit 855852d582
17 changed files with 162 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
be/src/runtime/fragment_mgr.cpp
View File

@ -821,7 +821,7 @@ Status FragmentMgr::exec_plan_fragment(const TPipelineFragmentParams& params,
}
fragments_ctx->get_shared_hash_table_controller()->set_pipeline_engine_enabled(true);
fragments_ctx->timeout_second = params.query_options.query_timeout;
fragments_ctx->timeout_second = params.query_options.execution_timeout;
_set_scan_concurrency(params, fragments_ctx.get());
bool has_query_mem_tracker =
@ -1211,7 +1211,7 @@ Status FragmentMgr::exec_external_plan_fragment(const TScanOpenParams& params,
exec_fragment_params.__set_params(fragment_exec_params);
TQueryOptions query_options;
query_options.batch_size = params.batch_size;
query_options.query_timeout = params.query_timeout;
query_options.execution_timeout = params.execution_timeout;
query_options.mem_limit = params.mem_limit;
query_options.query_type = TQueryType::EXTERNAL;
exec_fragment_params.__set_query_options(query_options);

2
be/src/runtime/runtime_state.h
View File

@ -90,8 +90,6 @@ public:
}
int query_parallel_instance_num() const { return _query_options.parallel_instance; }
int max_errors() const { return _query_options.max_errors; }
int query_timeout() const { return _query_options.query_timeout; }
int insert_timeout() const { return _query_options.insert_timeout; }
int execution_timeout() const { return _query_options.execution_timeout; }
int max_io_buffers() const { return _query_options.max_io_buffers; }
int num_scanner_threads() const { return _query_options.num_scanner_threads; }