Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add statement_timeout for query. #13933

Merged
merged 2 commits into from
Dec 13, 2023
Merged

feat: Add statement_timeout for query. #13933

merged 2 commits into from
Dec 13, 2023

Conversation

liurenjie1024
Copy link
Contributor

@liurenjie1024 liurenjie1024 commented Dec 12, 2023

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Close #7409 .

Releated #9732.

In this pr we add statement_timeout for dql statement, other ddl, dml statements are not affected. The default value is 1 hour.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

User can run set statement_timeout = 10 to set the value for session. And the default value is in config batch.statement_timeout_in_sec, default value is 1 hour.

@liurenjie1024 liurenjie1024 requested a review from hzxa21 December 12, 2023 07:54
Copy link

codecov bot commented Dec 12, 2023

Codecov Report

Attention: 47 lines in your changes are missing coverage. Please review.

Comparison is base (fd3b763) 68.05% compared to head (cdee192) 68.04%.
Report is 5 commits behind head on main.

Files Patch % Lines
src/frontend/src/scheduler/local.rs 40.00% 18 Missing ⚠️
src/frontend/src/scheduler/distributed/query.rs 42.30% 15 Missing ⚠️
src/frontend/src/handler/query.rs 50.00% 12 Missing ⚠️
...rontend/src/scheduler/distributed/query_manager.rs 0.00% 1 Missing ⚠️
src/frontend/src/session.rs 80.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #13933      +/-   ##
==========================================
- Coverage   68.05%   68.04%   -0.01%     
==========================================
  Files        1533     1533              
  Lines      264453   264529      +76     
==========================================
+ Hits       179964   180000      +36     
- Misses      84489    84529      +40     
Flag Coverage Δ
rust 68.04% <50.52%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

query: Query,
can_timeout_cancel: bool,
) -> Result<LocalQueryStream> {
let timeout = if cfg!(madsim) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a bug in madsim which may lead to invalid memory access. We skip madsim using this approach for now.

Copy link
Member

@yezizp2012 yezizp2012 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@liurenjie1024 liurenjie1024 added this pull request to the merge queue Dec 13, 2023
Merged via the queue into main with commit b930b34 Dec 13, 2023
26 of 27 checks passed
@liurenjie1024 liurenjie1024 deleted the renjie/issue-7409 branch December 13, 2023 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Discussion: support the statement/query level timeout in Risingwave DB
2 participants