suxiaogang223 opened a new pull request, #60478:
URL: https://github.com/apache/doris/pull/60478
### What problem does this PR solve?
## Summary
Refactor Paimon metadata cache from a single global instance to per-catalog
instances,
introduce a two-level Table+Snapshot cache structure, and unify TTL
resolution logic
across Iceberg/Paimon/Schema caches.
## Motivation
The previous design shared a single `PaimonMetadataCache` instance and a
single global
`snapshotCache` across all Paimon catalogs. This caused:
- Different catalogs could not independently configure cache TTL.
- Cache keys had to carry `catalogId` for isolation; invalidation required
scanning all
keys and filtering.
- `PaimonExternalTable` eagerly fetched the `Table` object at construction
time, incurring
remote calls even when the table was never subsequently accessed.
## Changes
### Per-catalog cache instantiation
- Introduce `CatalogScopedCacheMgr<T>`, a generic catalog-keyed cache
manager backed by
`ConcurrentHashMap.computeIfAbsent`.
- `PaimonMetadataCacheMgr` now extends
`CatalogScopedCacheMgr<PaimonMetadataCache>`;
each catalog owns an independent `PaimonMetadataCache`.
- Migrate Iceberg's `icebergCacheMap` (previously hand-rolled double-checked
locking)
in `ExternalMetaCacheMgr` to the same `CatalogScopedCacheMgr`.
### Two-level table + snapshot cache
- Replace the single `snapshotCache` with `tableCache`
(key: `PaimonTableCacheKey`, value: `PaimonTableCacheValue`).
- `PaimonTableCacheValue` holds the Paimon `Table` object and lazy-loads
`PaimonSnapshotCacheValue` via double-checked locking.
- The `Table` object is managed by Caffeine `LoadingCache`, subject to
TTL/maxSize.
When TTL expires, Caffeine creates a new `PaimonTableCacheValue`, and
the snapshot
is re-lazily-loaded on next access.
- Normal queries hit `tableCache` directly; MTMV queries go through the
explicit
snapshot path; branch queries call the Paimon catalog directly (branches
have
independent schemas, not suitable for the main table cache).
### Unified TTL resolution
- Extract `ExternalCatalog.resolveCacheTtlSpec()` to centralize TTL property
parsing:
- `null` → use global default
(`external_cache_expire_time_seconds_after_access`)
- `-1` → no expiry (Caffeine does not set `expireAfterAccess`)
- `0` → disable cache (`maxSize=0`, Caffeine evicts immediately)
- `>0` → use as `expireAfterAccess`
- Applied uniformly to `IcebergMetadataCache`, `PaimonMetadataCache`, and
`ExternalSchemaCache`.
- Add `paimon.table.meta.cache.ttl-second` catalog property with validation
in
`checkProperties()`. `ALTER CATALOG SET` triggers cache reinitialization
via
`notifyPropertiesUpdated()`, consistent with Iceberg's existing pattern.
### Lazy table access in PaimonExternalTable
- Remove the eagerly-loaded `paimonTable` field from the constructor.
- All `Table` object access now goes through `PaimonUtils` →
`PaimonMetadataCache.tableCache`, making it lazy and cache-aware.
- Introduce `PaimonUtils` as the centralized static accessor for Paimon cache
operations, simplifying call sites.
### Iceberg invalidation fast path
- `IcebergMetadataCache.invalidateTableCache()` now attempts a direct key
lookup
(`getIfPresent`) first. On hit, invalidate immediately; on miss, fall back
to full
cache scan matching by local name. Avoids unnecessary iteration on the
common path.
### 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 -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
