diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index 2998909f5a4980..f47ad05c945c5e 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -35,7 +35,7 @@ under the License. 4.9.3 2.17.257 3.1.1-hw-46 - 3.3.5 + 8.2.7 @@ -418,10 +418,11 @@ under the License. hadoop-aliyun - org.apache.hadoop + com.qcloud.cos hadoop-cos ${tencentcos.version} + com.aliyun.odps odps-sdk-core diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/PropertyConverter.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/PropertyConverter.java index 66396e2c337ca2..bf32044a7774da 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/PropertyConverter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/PropertyConverter.java @@ -39,9 +39,9 @@ import com.amazonaws.glue.catalog.util.AWSGlueConfig; import com.google.common.base.Strings; import com.google.common.collect.Maps; +import org.apache.hadoop.fs.CosFileSystem; +import org.apache.hadoop.fs.CosNConfigKeys; import org.apache.hadoop.fs.aliyun.oss.AliyunOSSFileSystem; -import org.apache.hadoop.fs.cosn.CosNConfigKeys; -import org.apache.hadoop.fs.cosn.CosNFileSystem; import org.apache.hadoop.fs.obs.OBSConstants; import org.apache.hadoop.fs.obs.OBSFileSystem; import org.apache.hadoop.fs.s3a.Constants; @@ -186,7 +186,7 @@ public static String getHadoopFSImplByScheme(String fsScheme) { } else if (fsScheme.equalsIgnoreCase("oss")) { return AliyunOSSFileSystem.class.getName(); } else if (fsScheme.equalsIgnoreCase("cosn")) { - return CosNFileSystem.class.getName(); + return CosFileSystem.class.getName(); } else { return S3AFileSystem.class.getName(); } @@ -342,8 +342,8 @@ private static Map convertToCOSProperties(Map pr cosProperties.put("fs.cosn.impl.disable.cache", "true"); cosProperties.put("fs.cosn.impl", getHadoopFSImplByScheme("cosn")); if (credential.isWhole()) { - cosProperties.put(CosNConfigKeys.COSN_SECRET_ID_KEY, credential.getAccessKey()); - cosProperties.put(CosNConfigKeys.COSN_SECRET_KEY_KEY, credential.getSecretKey()); + cosProperties.put(CosNConfigKeys.COSN_USERINFO_SECRET_ID_KEY, credential.getAccessKey()); + cosProperties.put(CosNConfigKeys.COSN_USERINFO_SECRET_KEY_KEY, credential.getSecretKey()); } // session token is unsupported for (Map.Entry entry : props.entrySet()) {