0AyanamiRei opened a new pull request, #66896: URL: https://github.com/apache/doris/pull/66896
<!-- pr-watcher:conflict-pick task_id=conflict-pick:ccb064f018a074242ce0193b0487f993c16feedbe9a1cb47bff45f24bdabda53 --> ### What problem does this PR solve? Related PR: #65420 Backport [apache/doris#65420](https://github.com/apache/doris/pull/65420) to `branch-4.1`. - Source merge commit: `c8b4a1c6d2105fef78a9c4db87e6a7ddde00c3c8` - Target base commit: `984c535c98710a115b795be278710a1d987c67a5` ### Conflict resolution - `be/src/common/config.cpp`: Added the source CPU-aware limiter definitions while retaining branch-4.1’s ${DORIS_HOME}/plugins/connectors Trino path. (adapted) - `be/src/util/s3_util.h`: Removed the obsolete factory rate_limiter API required by the source change while retaining branch-4.1’s private get_aws_credentials_provider declaration. (adapted) - `be/src/util/s3_util.cpp`: Removed the branch-4.1 cache hash local that became unused after applying the source factory cache-key refactor; -Werror compilation exposed it. (adapted) - `regression-test/data/cloud_p0/s3/test_s3_rate_limiter.out`: Removed the extra blank line at EOF required by repository diff-check rules without changing expected rows. (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]
