This is an automated email from the ASF dual-hosted git repository.
morningman 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 916a5d49cb5 [BugFix](HadoopCatalog) backport 26769 to Branch 2.0
#26769 (#30707)
916a5d49cb5 is described below
commit 916a5d49cb596ba65b9daac422e1b4e6ef41d74b
Author: GoGoWen <[email protected]>
AuthorDate: Sun Feb 4 10:39:51 2024 +0800
[BugFix](HadoopCatalog) backport 26769 to Branch 2.0 #26769 (#30707)
bp #26769
---
.../datasource/iceberg/IcebergHadoopExternalCatalog.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
index 06d1a4caaa2..683a5b62b63 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
@@ -38,13 +38,15 @@ public class IcebergHadoopExternalCatalog extends
IcebergExternalCatalog {
String warehouse = props.get(CatalogProperties.WAREHOUSE_LOCATION);
Preconditions.checkArgument(StringUtils.isNotEmpty(warehouse),
"Cannot initialize Iceberg HadoopCatalog because 'warehouse'
must not be null or empty");
- String nameService = StringUtils.substringBetween(warehouse,
HdfsResource.HDFS_FILE_PREFIX, "/");
- if (StringUtils.isEmpty(nameService)) {
- throw new IllegalArgumentException("Unrecognized 'warehouse'
location format"
- + " because name service is required.");
- }
catalogProperty = new CatalogProperty(resource, props);
- catalogProperty.addProperty(HdfsResource.HADOOP_FS_NAME,
HdfsResource.HDFS_FILE_PREFIX + nameService);
+ if (StringUtils.startsWith(warehouse, HdfsResource.HDFS_PREFIX)) {
+ String nameService = StringUtils.substringBetween(warehouse,
HdfsResource.HDFS_FILE_PREFIX, "/");
+ if (StringUtils.isEmpty(nameService)) {
+ throw new IllegalArgumentException("Unrecognized 'warehouse'
location format"
+ + " because name service is required.");
+ }
+ catalogProperty.addProperty(HdfsResource.HADOOP_FS_NAME,
HdfsResource.HDFS_FILE_PREFIX + nameService);
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
