0AyanamiRei opened a new pull request, #66886: URL: https://github.com/apache/doris/pull/66886
<!-- pr-watcher:conflict-pick task_id=conflict-pick:f593c954e72b12097b16cfff907e88e364de8ef0f36d302cc253794954d64751 --> ### What problem does this PR solve? Related PR: #66224 Backport [apache/doris#66224](https://github.com/apache/doris/pull/66224) to `branch-4.0`. - Source merge commit: `12f262a678990e60449da8c3d77e4848ddc5913d` - Target base commit: `461d003df3c01467c11270858e122615e8f69821` ### Conflict resolution - `be/src/http/action/http_stream.cpp`: Kept branch-4.0’s implementation and added only the MiB constant required by the source PR; excluded an unrelated helper inherited from the newer source branch. (adapted) - `be/test/http/stream_load_test.cpp`: Preserved branch-4.0’s HTTP, stream-load context, and WAL include paths while adding the headers required by the source PR’s three size-limit tests. (adapted) ### Checks actually run - `git diff HEAD^ HEAD --check`: passed (exit 0) - `clang-format --dry-run --Werror <changed C/C++ files>`: passed (exit 0) No submodules were initialized. This automation only runs formatting/whitespace, provenance, conflict-marker, and clean-worktree checks. It does not run builds, unit tests, or regression tests. -- 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]
