This is an automated email from the ASF dual-hosted git repository.
lide pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new ac7a51424d9 [fix](multicatalog) fix no data error when read table on
cosn (#32779)
ac7a51424d9 is described below
commit ac7a51424d905746a4cb0e61bef5af137c6c27ec
Author: Yulei-Yang <yulei.yang0...@gmail.com>
AuthorDate: Tue Mar 26 11:03:13 2024 +0800
[fix](multicatalog) fix no data error when read table on cosn (#32779)
---
fe/fe-core/pom.xml | 5 +++--
.../apache/doris/datasource/property/PropertyConverter.java | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 2998909f5a4..f47ad05c945 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -35,7 +35,7 @@ under the License.
<antlr4.version>4.9.3</antlr4.version>
<awssdk.version>2.17.257</awssdk.version>
<huaweiobs.version>3.1.1-hw-46</huaweiobs.version>
- <tencentcos.version>3.3.5</tencentcos.version>
+ <tencentcos.version>8.2.7</tencentcos.version>
</properties>
<profiles>
<profile>
@@ -418,10 +418,11 @@ under the License.
<artifactId>hadoop-aliyun</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
+ <groupId>com.qcloud.cos</groupId>
<artifactId>hadoop-cos</artifactId>
<version>${tencentcos.version}</version>
</dependency>
+
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-core</artifactId>
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 66396e2c337..bf32044a777 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.aliyun.datalake.metastore.common.DataLakeConfig;
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 class PropertyConverter {
} 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 @@ public class PropertyConverter {
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<String, String> entry : props.entrySet()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
