morningman opened a new pull request, #67558:
URL: https://github.com/apache/doris/pull/67558

   Cherry-picked from #67504
   
   ### Backport notes
   
   Two conflicts, both resolved without changing behaviour:
   
   - `Config`: branch-4.1 still has the bilingual 
`autobucket_partition_size_per_bucket_gb` description
     that master rewrote, so that entry is kept as it is here and the new
     `arrow_flight_deferred_query_idle_timeout_second` is inserted above it, 
verbatim.
   - `StmtExecutor`: the comment above the deferral gate is taken from upstream 
verbatim, so it already
     mentions #67368. That fix is being backported separately (see below); the 
gate itself does not
     depend on it.
   
   One adaptation: `SplitAssignment` is 
`org.apache.doris.datasource.SplitAssignment` on this branch, not
   `org.apache.doris.datasource.split.SplitAssignment`, so 
`ArrowFlightDeferralGateTest` imports it from
   its package here.
   
   Everything else -- `ScanNode.hasBatchSplitSource`, 
`Coordinator.hasBatchSplitSource`, the
   `ConnectContext` idle reaper, `FlightSqlConnectProcessor`, 
`StmtExecutorTest`,
   `FlightSqlDeferredQueryIdleTimeoutTest` and both regression suites -- 
applied cleanly.
   
   ### Merge order
   
   Touches the same `StmtExecutor` comment as #67557 (the branch-4.1 backport 
of #67487). Merging that one first keeps this
   one conflict-free.
   
   🤖 Generated with [Claude Code](https://claude.com/claude-code)
   
   https://claude.ai/code/session_01DzUYFcGHQH3bnLGCjpncVj
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to