[BugFix] fix the behavior of fe_conf.statistic_collect_query_timeout
Why I'm doing:
The statistic_collect_query_timeout should be the timeout of the whole ANALYZE TABLE job, but actually it's treated as the timeout of a sql task.
What I'm doing:
Fixes #issue
What type of PR is this:
- [x] BugFix
- [ ] Feature
- [ ] Enhancement
- [ ] Refactor
- [ ] UT
- [ ] Doc
- [ ] Tool
Does this PR entail a change in behavior?
- [ ] Yes, this PR will result in a change in behavior.
- [x] No, this PR will not result in a change in behavior.
If yes, please specify the type of change:
- [ ] Interface/UI changes: syntax, type conversion, expression evaluation, display information
- [ ] Parameter changes: default values, similar parameters but with different default values
- [ ] Policy changes: use new policy to replace old one, functionality automatically enabled
- [ ] Feature removed
- [ ] Miscellaneous: upgrade & downgrade compatibility, etc.
Checklist:
- [ ] I have added test cases for my bug fix or my new feature
- [ ] This pr needs user documentation (for new or modified features or behaviors)
- [ ] I have added documentation for my new feature or new function
- [ ] This is a backport pr
Bugfix cherry-pick branch check:
- [x] I have checked the version labels which the pr will be auto-backported to the target branch
- [x] 4.0
- [x] 3.5
- [ ] 3.4
- [ ] 3.3
[!NOTE] Enforces analyze job timeout by computing remaining time and setting per-task query/insert timeouts, updating collect APIs and adding tests.
- Core behavior
- Add
calculateAndSetRemainingTimeout(context, analyzeStatus)inStatisticsCollectJobto compute remaining job time and setqueryTimeoutS/insertTimeoutSper SQL/insert task.StatisticExecutor.collectStatisticssetsanalyzeStatus.startTimeif missing.- API changes
- Update
collectStatisticSyncsignature tocollectStatisticSync(String sql, ConnectContext, AnalyzeStatus)and invoke timeout calculation before execution in:
FullStatisticsCollectJob,ExternalFullStatisticsCollectJob,HistogramStatisticsCollectJob,ExternalHistogramStatisticsCollectJob,SampleStatisticsCollectJob.HyperStatisticsCollectJob: compute remaining timeout before each query job and before inserts; updateflushInsertStatisticsDatato acceptAnalyzeStatus.- Session defaults
- Clarify in
StatisticUtilsthat timeouts are dynamically overridden per task, keeping large defaults.- Tests
- Add
testJobTimeoutto verify remaining-time logic and timeout exceptions.- Adjust existing tests to new method signatures and start-time initialization.
Written by Cursor Bugbot for commit 8beab2136b8003c4f595f7e02e0835f85567022b. This will update automatically on new commits. Configure here.
๐งช CI Insights
Here's what we observed from your CI run for 8beab213.
๐ข All jobs passed!
But CI Insights is watching ๐
Quality Gate passed
Issues
2 New issues
0 Accepted issues
Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code
[Java-Extensions Incremental Coverage Report]
:white_check_mark: pass : 0 / 0 (0%)
[FE Incremental Coverage Report]
:white_check_mark: pass : 24 / 29 (82.76%)
file detail
| path | covered_line | new_line | coverage | not_covered_line_detail | |
|---|---|---|---|---|---|
| :large_blue_circle: | com/starrocks/statistic/SampleStatisticsCollectJob.java | 0 | 2 | 00.00% | [64, 84] |
| :large_blue_circle: | com/starrocks/statistic/FullStatisticsCollectJob.java | 0 | 2 | 00.00% | [147, 190] |
| :large_blue_circle: | com/starrocks/statistic/StatisticExecutor.java | 1 | 2 | 50.00% | [525] |
| :large_blue_circle: | com/starrocks/statistic/HyperStatisticsCollectJob.java | 3 | 3 | 100.00% | [] |
| :large_blue_circle: | com/starrocks/statistic/ExternalFullStatisticsCollectJob.java | 2 | 2 | 100.00% | [] |
| :large_blue_circle: | com/starrocks/statistic/ExternalHistogramStatisticsCollectJob.java | 1 | 1 | 100.00% | [] |
| :large_blue_circle: | com/starrocks/statistic/StatisticsCollectJob.java | 16 | 16 | 100.00% | [] |
| :large_blue_circle: | com/starrocks/statistic/HistogramStatisticsCollectJob.java | 1 | 1 | 100.00% | [] |
[BE Incremental Coverage Report]
:white_check_mark: pass : 0 / 0 (0%)
@cursor review
@Mergifyio backport branch-4.0
@Mergifyio backport branch-3.5
backport branch-4.0
โ Backports have been created
- #66787 [BugFix] fix the behavior of fe_conf.statistic_collect_query_timeout (backport #66363) has been created for branch
branch-4.0
backport branch-3.5
โ Backports have been created
- #66788 [BugFix] fix the behavior of fe_conf.statistic_collect_query_timeout (backport #66363) has been created for branch
branch-3.5but encountered conflicts