You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ki...@apache.org on 2025/11/14 03:54:31 UTC
(doris) branch master updated: [fix]handle loading iceberg partitions by auth (#57988)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d1f036d7533 [fix]handle loading iceberg partitions by auth (#57988)
d1f036d7533 is described below
commit d1f036d75337d09b4de98ddcf43f24455e6c8129
Author: zhaorongsheng <zh...@users.noreply.github.com>
AuthorDate: Fri Nov 14 11:54:25 2025 +0800
[fix]handle loading iceberg partitions by auth (#57988)
### What problem does this PR solve?
Issue Number: close #57987
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
.../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 6038b469538..2ad596fa9a3 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: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org