924060929 commented on code in PR #66913:
URL: https://github.com/apache/doris/pull/66913#discussion_r4056795116
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalMetaCache.java:
##########
@@ -134,10 +148,49 @@ IcebergSnapshotEntryKey.class,
IcebergSnapshotCacheValue.class, defaultEntryCach
public Table getIcebergTable(ExternalTable dorisTable) {
NameMapping nameMapping = dorisTable.getOrBuildNameMapping();
- return
tableEntry.get(nameMapping.getCtlId()).get(nameMapping).getIcebergTable();
+ IcebergTableCacheValue.Lease lease = statementLease(nameMapping);
+ if (lease != null) {
+ return lease.getIcebergTable();
Review Comment:
Fixed in 6d7d2cf39e3. `IcebergWriteSchemaContext.create()` now obtains the
retained table and both mapping options through `withIcebergTableGeneration`,
so schema/default conversion cannot combine a G1 table with G2 catalog flags.
Added a deterministic test with opposite live-catalog and retained-generation
options; the writer/system/meta-cache/schema-display suites (122 tests),
scan-node suite (100 tests), FE Checkstyle, and `./build.sh --fe -j4` all pass.
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/source/IcebergScanNode.java:
##########
@@ -1773,20 +1900,11 @@ private Table useFrozenTableGeneration(Table
currentTable) {
if
(snapshot.filter(IcebergMvccSnapshot.class::isInstance).isPresent()) {
IcebergSnapshotCacheValue cacheValue =
((IcebergMvccSnapshot)
snapshot.get()).getSnapshotCacheValue();
+ frozenEnableMappingVarbinary =
cacheValue.isEnableMappingVarbinary();
Review Comment:
Fixed in 6d7d2cf39e3. System-table schema analysis now creates the metadata
table and parses it from one `IcebergSnapshotCacheValue`, using that same
retained generation’s varbinary/timestamptz options. This matches the
generation used by execution. Added a deterministic opposite-config test; the
writer/system/meta-cache/schema-display suites (122 tests), scan-node suite
(100 tests), FE Checkstyle, and `./build.sh --fe -j4` all pass.
--
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]
