This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 49bd21f902b branch-3.1: [fix](iceberg) Remove duplicated warehouse
propert #54525 (#54600)
49bd21f902b is described below
commit 49bd21f902bf7b716e6f6305cf4f88f7974e382a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 13 14:29:25 2025 +0800
branch-3.1: [fix](iceberg) Remove duplicated warehouse propert #54525
(#54600)
Cherry-picked from #54525
Co-authored-by: zy-kkk <[email protected]>
---
.../datasource/property/metastore/IcebergRestProperties.java | 11 +++--------
.../property/metastore/IcebergRestPropertiesTest.java | 4 ++--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
index c55611f47dd..f7ffac84fd0 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/IcebergRestProperties.java
@@ -58,11 +58,6 @@ public class IcebergRestProperties extends
AbstractIcebergProperties {
description = "The prefix of the iceberg rest catalog service.")
private String icebergRestPrefix = "";
- @ConnectorProperty(names = {"iceberg.rest.warehouse", "warehouse"},
- required = false,
- description = "The warehouse of the iceberg rest catalog service.")
- private String icebergRestWarehouse = "";
-
@ConnectorProperty(names = {"iceberg.rest.security.type"},
required = false,
description = "The security type of the iceberg rest catalog
service,"
@@ -258,8 +253,8 @@ public class IcebergRestProperties extends
AbstractIcebergProperties {
icebergRestCatalogProperties.put(PREFIX_PROPERTY,
icebergRestPrefix);
}
- if (Strings.isNotBlank(icebergRestWarehouse)) {
-
icebergRestCatalogProperties.put(CatalogProperties.WAREHOUSE_LOCATION,
icebergRestWarehouse);
+ if (Strings.isNotBlank(warehouse)) {
+
icebergRestCatalogProperties.put(CatalogProperties.WAREHOUSE_LOCATION,
warehouse);
}
if (isIcebergRestVendedCredentialsEnabled()) {
@@ -314,7 +309,7 @@ public class IcebergRestProperties extends
AbstractIcebergProperties {
* This method handles all storage types (HDFS, S3, MinIO, etc.) and
populates
* the fileIOProperties map and Configuration object accordingly.
*
- * @param storagePropertiesMap Map of storage properties
+ * @param storagePropertiesList Map of storage properties
* @param fileIOProperties Options map to be populated
* @param conf Configuration object to be populated (for HDFS), will be
created if null and HDFS is used
*/
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/IcebergRestPropertiesTest.java
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/IcebergRestPropertiesTest.java
index 1d550e061cc..e310bb8c3dc 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/IcebergRestPropertiesTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/IcebergRestPropertiesTest.java
@@ -32,8 +32,8 @@ public class IcebergRestPropertiesTest {
public void testBasicRestProperties() {
Map<String, String> props = new HashMap<>();
props.put("iceberg.rest.uri", "http://localhost:8080";);
- props.put("iceberg.rest.warehouse", "s3://warehouse/path");
props.put("iceberg.rest.prefix", "prefix");
+ props.put("warehouse", "s3://warehouse/path");
IcebergRestProperties restProps = new IcebergRestProperties(props);
restProps.initNormalizeAndCheckProps();
@@ -209,7 +209,7 @@ public class IcebergRestPropertiesTest {
Map<String, String> props2 = new HashMap<>();
props2.put("iceberg.rest.uri", "http://localhost:8080";);
- props2.put("iceberg.rest.warehouse", "s3://warehouse/path");
+ props2.put("warehouse", "s3://warehouse/path");
IcebergRestProperties restProps2 = new IcebergRestProperties(props2);
restProps2.initNormalizeAndCheckProps();
Assertions.assertEquals("s3://warehouse/path",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
