This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 7355f76d398 branch-4.0: [fix]handle loading iceberg partitions by auth
#57988 (#58021)
7355f76d398 is described below
commit 7355f76d39836687938f19426f85bcf48069de54
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 14 16:49:15 2025 +0800
branch-4.0: [fix]handle loading iceberg partitions by auth #57988 (#58021)
Cherry-picked from #57988
Co-authored-by: zhaorongsheng <[email protected]>
---
.../org/apache/doris/datasource/iceberg/IcebergUtils.java | 11 ++++++++++-
.../doris/datasource/iceberg/source/IcebergScanNode.java | 5 ++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergUtils.java
index 580a730f891..f1c2b73b279 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergUtils.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergUtils.java
@@ -1102,7 +1102,16 @@ public class IcebergUtils {
return IcebergPartitionInfo.empty();
}
Table table = getIcebergTable(dorisTable);
- List<IcebergPartition> icebergPartitions = loadIcebergPartition(table,
snapshotId);
+ List<IcebergPartition> icebergPartitions;
+ try {
+ icebergPartitions =
dorisTable.getCatalog().getExecutionAuthenticator()
+ .execute(() -> loadIcebergPartition(table, snapshotId));
+ } catch (Exception e) {
+ String errorMsg = String.format("Failed to get iceberg partition
info, table: %s.%s.%s, snapshotId: %s",
+ dorisTable.getCatalog().getName(), dorisTable.getDbName(),
dorisTable.getName(), snapshotId);
+ LOG.warn(errorMsg, e);
+ throw new AnalysisException(errorMsg, e);
+ }
Map<String, IcebergPartition> nameToPartition = Maps.newHashMap();
Map<String, PartitionItem> nameToPartitionItem = Maps.newHashMap();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/source/IcebergScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/source/IcebergScanNode.java
index 0517117645e..99e5033dcee 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/source/IcebergScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/source/IcebergScanNode.java
@@ -159,10 +159,9 @@ public class IcebergScanNode extends FileQueryScanNode {
isPartitionedTable = icebergTable.spec().isPartitioned();
formatVersion = ((BaseTable)
icebergTable).operations().current().formatVersion();
preExecutionAuthenticator =
source.getCatalog().getExecutionAuthenticator();
- IcebergExternalCatalog catalog = (IcebergExternalCatalog)
source.getCatalog();
storagePropertiesMap =
VendedCredentialsFactory.getStoragePropertiesMapWithVendedCredentials(
- catalog.getCatalogProperty().getMetastoreProperties(),
- catalog.getCatalogProperty().getStoragePropertiesMap(),
+
source.getCatalog().getCatalogProperty().getMetastoreProperties(),
+
source.getCatalog().getCatalogProperty().getStoragePropertiesMap(),
icebergTable
);
backendStorageProperties =
CredentialUtils.getBackendPropertiesFromStorageMap(storagePropertiesMap);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
