0AyanamiRei opened a new pull request, #66893: URL: https://github.com/apache/doris/pull/66893
<!-- pr-watcher:conflict-pick task_id=conflict-pick:d0bba6bc21fde0b782157cdd97d7d3afb261322bb5b1ee5fe723b0ef5ac05767 --> ### What problem does this PR solve? Related PR: #65379 Backport [apache/doris#65379](https://github.com/apache/doris/pull/65379) to `branch-4.1`. - Source merge commit: `07ba0d1e448be58bef46e17c01498cb3d9864891` - Target base commit: `984c535c98710a115b795be278710a1d987c67a5` ### Conflict resolution - `be/src/common/config.cpp`: Applied the HTTPS default and updated comment while preserving the target-only enable_index_compaction setting. (adapted) - `be/test/io/s3_client_factory_test.cpp`: Added the AWS client configuration/helper coverage without importing the source branch's unavailable Cloud configuration context. (adapted) - `fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java`: Mapped endpoint preservation and temporary ping normalization to the target's S3Properties, StorageProperties, and S3ObjStorage APIs. (adapted) - `fe/fe-core/src/test/java/org/apache/doris/catalog/S3ResourcePersistParityTest.java`: The test belongs to an SPI refactor absent from the target; preserved the target's decision not to contain this file. (kept_target) - `fe/fe-core/src/test/java/org/apache/doris/catalog/S3ResourceTest.java`: Mapped source assertions to S3Properties.getObjStoreInfoPB and retained the target API layout. (adapted) - `fe/fe-core/src/test/java/org/apache/doris/common/util/S3UtilTest.java`: Kept the source endpoint-scheme tests together with target-only glob-prefix tests, and used the branch-4.1-compatible Optional.orElseThrow supplier form. (adapted) - `fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/dlf/DLFCatalog.java`: Passed the raw endpoint string so the new configurable default scheme applies instead of forcing HTTP. (adapted) - `fe/fe-core/src/main/java/org/apache/doris/fs/obj/S3ObjStorage.java`: Preserved the branch-4.1 object-storage client path while delegating scheme selection to S3Util. (adapted) - `fe/fe-core/src/main/java/org/apache/doris/datasource/connectivity/AbstractS3CompatibleConnectivityTester.java`: Updated the branch-only connectivity caller for the String endpoint API and default-scheme behavior. (adapted) - `fe/fe-core/src/main/java/org/apache/doris/cloud/storage/DefaultRemote.java`: Applied S3Util.buildEndpointUrl to the Stage and Copy Into remote client instead of forcing scheme-less endpoints to HTTP. (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]
