Skip to content

[enhance](iceberg) Refactor Iceberg metadata cache structure and add table cache test cases #59716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 9 commits into from
Jan 29, 2026
Merged

[enhance](iceberg) Refactor Iceberg metadata cache structure and add table cache test cases #59716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f5015d0
refactor: update IcebergMetadataCache to use IcebergTableCacheValue a…
suxiaogang223 Jan 7, 2026
f99c04c
fix build
suxiaogang223 Jan 9, 2026
435fccc
remove snapshotList cache
suxiaogang223 Jan 9, 2026
0994657
clean code
suxiaogang223 Jan 9, 2026
50374a7
add cases
suxiaogang223 Jan 9, 2026
2391454
fix cases
suxiaogang223 Jan 12, 2026
35ab787
fix
suxiaogang223 Jan 26, 2026
991bc75
Refactor IcebergUtils cache access
suxiaogang223 Jan 26, 2026
b94d3ff
Fix latest Iceberg schema selection
suxiaogang223 Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ public MvccSnapshot loadSnapshot(Optional<TableSnapshot> tableSnapshot, Optional
return HudiUtils.getHudiMvccSnapshot(tableSnapshot, this);
} else if (getDlaType() == DLAType.ICEBERG) {
return new IcebergMvccSnapshot(
IcebergUtils.getIcebergSnapshotCacheValue(tableSnapshot, this, scanParams));
IcebergUtils.getSnapshotCacheValue(tableSnapshot, this, scanParams));
} else {
return new EmptyMvccSnapshot();
}
Expand Down
21 changes: 5 additions & 16 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/hive/IcebergDlaTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.doris.catalog.PartitionItem;
import org.apache.doris.catalog.PartitionType;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.datasource.iceberg.IcebergSchemaCacheValue;
import org.apache.doris.datasource.iceberg.IcebergSnapshotCacheValue;
import org.apache.doris.datasource.iceberg.IcebergUtils;
import org.apache.doris.datasource.mvcc.MvccSnapshot;
Expand Down Expand Up @@ -52,9 +51,7 @@ public IcebergDlaTable(HMSExternalTable table) {

@Override
public Map<String, PartitionItem> getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) {
return Maps.newHashMap(
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, hmsTable)
.getPartitionInfo().getNameToPartitionItem());
return Maps.newHashMap(IcebergUtils.getIcebergPartitionItems(snapshot, hmsTable));
}

@Override
Expand All @@ -69,19 +66,13 @@ public Set<String> getPartitionColumnNames(Optional<MvccSnapshot> snapshot) {

@Override
public List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot) {
IcebergSnapshotCacheValue snapshotValue =
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, hmsTable);
IcebergSchemaCacheValue schemaValue = IcebergUtils.getSchemaCacheValue(
hmsTable,
snapshotValue.getSnapshot().getSchemaId());
return schemaValue.getPartitionColumns();
return IcebergUtils.getIcebergPartitionColumns(snapshot, hmsTable);
}

@Override
public MTMVSnapshotIf getPartitionSnapshot(String partitionName, MTMVRefreshContext context,
Optional<MvccSnapshot> snapshot) throws AnalysisException {
IcebergSnapshotCacheValue snapshotValue =
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, hmsTable);
IcebergSnapshotCacheValue snapshotValue = IcebergUtils.getSnapshotCacheValue(snapshot, hmsTable);
long latestSnapshotId = snapshotValue.getPartitionInfo().getLatestSnapshotId(partitionName);
// If partition snapshot ID is unavailable (<= 0), fallback to table snapshot ID
// This can happen when last_updated_snapshot_id is null in Iceberg metadata
Expand All @@ -102,16 +93,14 @@ public MTMVSnapshotIf getPartitionSnapshot(String partitionName, MTMVRefreshCont
public MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context, Optional<MvccSnapshot> snapshot)
throws AnalysisException {
hmsTable.makeSureInitialized();
IcebergSnapshotCacheValue snapshotValue =
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, hmsTable);
IcebergSnapshotCacheValue snapshotValue = IcebergUtils.getSnapshotCacheValue(snapshot, hmsTable);
return new MTMVSnapshotIdSnapshot(snapshotValue.getSnapshot().getSnapshotId());
}

@Override
public MTMVSnapshotIf getTableSnapshot(Optional<MvccSnapshot> snapshot) throws AnalysisException {
hmsTable.makeSureInitialized();
IcebergSnapshotCacheValue snapshotValue =
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, hmsTable);
IcebergSnapshotCacheValue snapshotValue = IcebergUtils.getSnapshotCacheValue(snapshot, hmsTable);
return new MTMVSnapshotIdSnapshot(snapshotValue.getSnapshot().getSnapshotId());
}

Expand Down
13 changes: 1 addition & 12 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public abstract class IcebergExternalCatalog extends ExternalCatalog {
public static final String ICEBERG_S3_TABLES = "s3tables";
public static final String EXTERNAL_CATALOG_NAME = "external_catalog.name";
public static final String ICEBERG_TABLE_META_CACHE_TTL_SECOND = "iceberg.table.meta.cache.ttl-second";
public static final String ICEBERG_SNAPSHOT_META_CACHE_TTL_SECOND = "iceberg.snapshot.meta.cache.ttl-second";
public static final String ICEBERG_MANIFEST_CACHE_ENABLE = "iceberg.manifest.cache.enable";
public static final String ICEBERG_MANIFEST_CACHE_CAPACITY_MB = "iceberg.manifest.cache.capacity-mb";
public static final String ICEBERG_MANIFEST_CACHE_TTL_SECOND = "iceberg.manifest.cache.ttl-second";
Expand Down Expand Up @@ -97,15 +96,6 @@ public void checkProperties() throws DdlException {
+ tableMetaCacheTtlSecond);
}

// check iceberg.snapshot.meta.cache.ttl-second parameter
String partitionCacheTtlSecond = catalogProperty.getOrDefault(ICEBERG_SNAPSHOT_META_CACHE_TTL_SECOND, null);
if (Objects.nonNull(partitionCacheTtlSecond) && NumberUtils.toInt(partitionCacheTtlSecond, CACHE_NO_TTL)
< CACHE_TTL_DISABLE_CACHE) {
throw new DdlException(
"The parameter " + ICEBERG_SNAPSHOT_META_CACHE_TTL_SECOND + " is wrong, value is "
+ partitionCacheTtlSecond);
}

String manifestCacheEnable = catalogProperty.getOrDefault(ICEBERG_MANIFEST_CACHE_ENABLE, null);
if (Objects.nonNull(manifestCacheEnable)
&& !(manifestCacheEnable.equalsIgnoreCase("true") || manifestCacheEnable.equalsIgnoreCase("false"))) {
Expand Down Expand Up @@ -135,8 +125,7 @@ public void checkProperties() throws DdlException {
public void notifyPropertiesUpdated(Map<String, String> updatedProps) {
super.notifyPropertiesUpdated(updatedProps);
String tableMetaCacheTtl = updatedProps.getOrDefault(ICEBERG_TABLE_META_CACHE_TTL_SECOND, null);
String snapshotMetaCacheTtl = updatedProps.getOrDefault(ICEBERG_SNAPSHOT_META_CACHE_TTL_SECOND, null);
if (Objects.nonNull(tableMetaCacheTtl) || Objects.nonNull(snapshotMetaCacheTtl)) {
if (Objects.nonNull(tableMetaCacheTtl)) {
Env.getCurrentEnv().getExtMetaCacheMgr().getIcebergMetadataCache(this).init();
}
String manifestCacheEnable = updatedProps.getOrDefault(ICEBERG_MANIFEST_CACHE_ENABLE, null);
Expand Down
22 changes: 7 additions & 15 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,12 @@ public void beforeMTMVRefresh(MTMV mtmv) throws DdlException {

@Override
public Map<String, PartitionItem> getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) {
return Maps.newHashMap(
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, this)
.getPartitionInfo().getNameToPartitionItem());
return Maps.newHashMap(IcebergUtils.getIcebergPartitionItems(snapshot, this));
}

@Override
public Map<String, PartitionItem> getNameToPartitionItems(Optional<MvccSnapshot> snapshot) {
return IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, this)
.getPartitionInfo().getNameToPartitionItem();
return IcebergUtils.getIcebergPartitionItems(snapshot, this);
}

@Override
Expand All @@ -158,18 +155,13 @@ public Set<String> getPartitionColumnNames(Optional<MvccSnapshot> snapshot) thro

@Override
public List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot) {
IcebergSnapshotCacheValue snapshotValue =
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, this);
IcebergSchemaCacheValue schemaValue = IcebergUtils.getSchemaCacheValue(
this, snapshotValue.getSnapshot().getSchemaId());
return schemaValue.getPartitionColumns();
return IcebergUtils.getIcebergPartitionColumns(snapshot, this);
}

@Override
public MTMVSnapshotIf getPartitionSnapshot(String partitionName, MTMVRefreshContext context,
Optional<MvccSnapshot> snapshot) throws AnalysisException {
IcebergSnapshotCacheValue snapshotValue =
IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, this);
IcebergSnapshotCacheValue snapshotValue = IcebergUtils.getSnapshotCacheValue(snapshot, this);
long latestSnapshotId = snapshotValue.getPartitionInfo().getLatestSnapshotId(partitionName);
// If partition snapshot ID is unavailable (<= 0), fallback to table snapshot ID
// This can happen when last_updated_snapshot_id is null in Iceberg metadata
Expand All @@ -195,13 +187,13 @@ public MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context, Optional<Mvcc
@Override
public MTMVSnapshotIf getTableSnapshot(Optional<MvccSnapshot> snapshot) throws AnalysisException {
makeSureInitialized();
IcebergSnapshotCacheValue snapshotValue = IcebergUtils.getOrFetchSnapshotCacheValue(snapshot, this);
IcebergSnapshotCacheValue snapshotValue = IcebergUtils.getSnapshotCacheValue(snapshot, this);
return new MTMVSnapshotIdSnapshot(snapshotValue.getSnapshot().getSnapshotId());
}

@Override
public long getNewestUpdateVersionOrTime() {
return IcebergUtils.getIcebergSnapshotCacheValue(Optional.empty(), this, Optional.empty())
return IcebergUtils.getLatestSnapshotCacheValue(this)
.getPartitionInfo().getNameToIcebergPartition().values().stream()
.mapToLong(IcebergPartition::getLastUpdateTime).max().orElse(0);
}
Expand Down Expand Up @@ -256,7 +248,7 @@ public MvccSnapshot loadSnapshot(Optional<TableSnapshot> tableSnapshot, Optional
if (isView()) {
return new EmptyMvccSnapshot();
} else {
return new IcebergMvccSnapshot(IcebergUtils.getIcebergSnapshotCacheValue(
return new IcebergMvccSnapshot(IcebergUtils.getSnapshotCacheValue(
tableSnapshot, this, scanParams));
}
}
Expand Down
Loading
Loading