Commit 70eb7c6
Fix: add timeout check to single-thread fast path in BaseSingleBlockCombineOperator
The getNextBlockSingleThread() fast path was missing the timeout protection
present in the original mergeResults() method. A stalled segment operator
could block indefinitely with no deadline enforcement.
Fix: check System.currentTimeMillis() >= endTimeMs before invoking each
segment operator. If the deadline is exceeded, return a timeout results block
immediately. This mirrors the waitTimeMs <= 0 guard in mergeResults().
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent 0fd547c commit 70eb7c6
1 file changed
Lines changed: 8 additions & 0 deletions
File tree
- pinot-core/src/main/java/org/apache/pinot/core/operator/combine
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| 81 | + | |
| 82 | + | |
81 | 83 | | |
82 | 84 | | |
83 | 85 | | |
84 | 86 | | |
| 87 | + | |
85 | 88 | | |
86 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
87 | 95 | | |
88 | 96 | | |
89 | 97 | | |
| |||
0 commit comments