You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/04/12 17:02:47 UTC
[doris] 03/33: [zhongjin] remove s3 hadoop properties
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch doris-for-zhongjin
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 727075cbda98d6495dd367a4f347b0c43cca0657
Author: morningman <mo...@163.com>
AuthorDate: Tue Apr 4 15:07:02 2023 +0800
[zhongjin] remove s3 hadoop properties
---
.../java/org/apache/doris/catalog/S3Resource.java | 47 +---------------------
1 file changed, 2 insertions(+), 45 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
index 4c21cdac6e..e315fa814d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
@@ -262,50 +262,7 @@ public class S3Resource extends Resource {
}
public static Map<String, String> getS3HadoopProperties(Map<String, String> properties) {
- Map<String, String> s3Properties = Maps.newHashMap();
- if (properties.containsKey(S3_ACCESS_KEY)) {
- s3Properties.put(Constants.ACCESS_KEY, properties.get(S3_ACCESS_KEY));
- }
- if (properties.containsKey(S3Resource.S3_SECRET_KEY)) {
- s3Properties.put(Constants.SECRET_KEY, properties.get(S3_SECRET_KEY));
- }
- if (properties.containsKey(S3Resource.S3_ENDPOINT)) {
- s3Properties.put(Constants.ENDPOINT, properties.get(S3_ENDPOINT));
- }
- if (properties.containsKey(S3Resource.S3_REGION)) {
- s3Properties.put(Constants.AWS_REGION, properties.get(S3_REGION));
- }
- if (properties.containsKey(S3Resource.S3_MAX_CONNECTIONS)) {
- s3Properties.put(Constants.MAXIMUM_CONNECTIONS, properties.get(S3_MAX_CONNECTIONS));
- }
- if (properties.containsKey(S3Resource.S3_REQUEST_TIMEOUT_MS)) {
- s3Properties.put(Constants.REQUEST_TIMEOUT, properties.get(S3_REQUEST_TIMEOUT_MS));
- }
- if (properties.containsKey(S3Resource.S3_CONNECTION_TIMEOUT_MS)) {
- s3Properties.put(Constants.SOCKET_TIMEOUT, properties.get(S3_CONNECTION_TIMEOUT_MS));
- }
- s3Properties.put(Constants.MAX_ERROR_RETRIES, "2");
- s3Properties.put("fs.s3.impl.disable.cache", "true");
- s3Properties.put("fs.s3.impl", S3AFileSystem.class.getName());
-
- String defaultProviderList = String.join(",", DEFAULT_CREDENTIALS_PROVIDERS);
- String credentialsProviders = s3Properties
- .getOrDefault("fs.s3a.aws.credentials.provider", defaultProviderList);
- s3Properties.put("fs.s3a.aws.credentials.provider", credentialsProviders);
-
- s3Properties.put(Constants.PATH_STYLE_ACCESS, properties.getOrDefault(S3Resource.USE_PATH_STYLE, "false"));
- if (properties.containsKey(S3Resource.S3_TOKEN)) {
- s3Properties.put(Constants.SESSION_TOKEN, properties.get(S3_TOKEN));
- s3Properties.put("fs.s3a.aws.credentials.provider", TemporaryAWSCredentialsProvider.class.getName());
- s3Properties.put("fs.s3.impl.disable.cache", "true");
- s3Properties.put("fs.s3a.impl.disable.cache", "true");
- }
- for (Map.Entry<String, String> entry : properties.entrySet()) {
- if (entry.getKey().startsWith(S3Resource.S3_FS_PREFIX)) {
- s3Properties.put(entry.getKey(), entry.getValue());
- }
- }
-
- return s3Properties;
+ // TBDS does not need this
+ return Maps.newHashMap();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org