3434import org .apache .doris .datasource .CatalogIf ;
3535import org .apache .doris .datasource .CatalogMgr ;
3636import org .apache .doris .datasource .hive .HMSExternalTable ;
37+ import org .apache .doris .datasource .mvcc .MvccReadSelector ;
38+ import org .apache .doris .datasource .mvcc .MvccSnapshot ;
3739import org .apache .doris .mysql .privilege .DataMaskPolicy ;
3840import org .apache .doris .mysql .privilege .RowFilterPolicy ;
3941import org .apache .doris .nereids .CascadesContext ;
4244import org .apache .doris .nereids .SqlCacheContext .FullColumnName ;
4345import org .apache .doris .nereids .SqlCacheContext .FullTableName ;
4446import org .apache .doris .nereids .SqlCacheContext .ScanTable ;
47+ import org .apache .doris .nereids .SqlCacheContext .TableReference ;
4548import org .apache .doris .nereids .SqlCacheContext .TableVersion ;
4649import org .apache .doris .nereids .StatementContext ;
4750import org .apache .doris .nereids .analyzer .UnboundVariable ;
6770import org .apache .doris .qe .StmtExecutor ;
6871import org .apache .doris .qe .cache .CacheAnalyzer ;
6972import org .apache .doris .qe .cache .SqlCache ;
73+ import org .apache .doris .qe .cache .SqlCacheVersion ;
74+ import org .apache .doris .qe .cache .SqlCacheVersionProvider ;
7075import org .apache .doris .rpc .RpcException ;
7176
7277import com .github .benmanes .caffeine .cache .Cache ;
@@ -126,8 +131,8 @@ public void invalidateAboutTable(TableIf tableIf) {
126131 for (Entry <String , SqlCacheContext > kv : sqlCaches .asMap ().entrySet ()) {
127132 String key = kv .getKey ();
128133 SqlCacheContext context = kv .getValue ();
129- for (Entry <FullTableName , TableVersion > nameToVersion : context .getUsedTables ().entrySet ()) {
130- FullTableName tableName = nameToVersion .getKey ();
134+ for (Entry <TableReference , TableVersion > nameToVersion : context .getUsedTables ().entrySet ()) {
135+ FullTableName tableName = nameToVersion .getKey (). tableName ;
131136 TableVersion tableVersion = nameToVersion .getValue ();
132137 if (tableVersion .id == tableIf .getId ()) {
133138 invalidateKeys .add (key );
@@ -341,7 +346,7 @@ private Optional<LogicalSqlCache> tryParseSql(
341346 if (privilegeChanged (connectContext , env , sqlCacheContext )) {
342347 return invalidateCache (key );
343348 }
344- IsChanged tableIsChanged = tablesOrDataChanged (env , sqlCacheContext );
349+ IsChanged tableIsChanged = tablesOrDataChanged (env , sqlCacheContext , connectContext . getStatementContext () );
345350 if (tableIsChanged .changed ) {
346351 if (tableIsChanged .invalidCache ) {
347352 return invalidateCache (key );
@@ -427,21 +432,22 @@ private Optional<LogicalSqlCache> tryParseSql(
427432 }
428433 }
429434
430- private IsChanged tablesOrDataChanged (Env env , SqlCacheContext sqlCacheContext ) {
435+ private IsChanged tablesOrDataChanged (Env env , SqlCacheContext sqlCacheContext , StatementContext statement ) {
431436 if (sqlCacheContext .hasUnsupportedTables ()) {
432437 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
433438 }
434439
435440 // the query maybe scan empty partition of the table, we should check these table version too,
436441 // but the table not exists in sqlCacheContext.getScanTables(), so we need check here.
437442 // check table type and version
438- for (Entry <FullTableName , TableVersion > scanTable : sqlCacheContext .getUsedTables ().entrySet ()) {
443+ for (Entry <TableReference , TableVersion > scanTable : sqlCacheContext .getUsedTables ().entrySet ()) {
439444 TableVersion tableVersion = scanTable .getValue ();
440445 if (tableVersion .type != TableType .OLAP && tableVersion .type != TableType .MATERIALIZED_VIEW
441- && tableVersion .type != TableType .HMS_EXTERNAL_TABLE ) {
446+ && tableVersion .type != TableType .HMS_EXTERNAL_TABLE
447+ && tableVersion .type != TableType .ICEBERG_EXTERNAL_TABLE ) {
442448 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
443449 }
444- TableIf tableIf = findTableIf (env , scanTable .getKey ());
450+ TableIf tableIf = findTableIf (env , scanTable .getKey (). tableName );
445451 if (tableIf == null ) {
446452 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
447453 } else if (tableIf .isTemporary ()) {
@@ -471,9 +477,24 @@ private IsChanged tablesOrDataChanged(Env env, SqlCacheContext sqlCacheContext)
471477 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
472478 }
473479 }
480+ } else if (tableVersion .sqlCacheVersion != null ) {
481+ MvccReadSelector selector = scanTable .getKey ().selector ;
482+ Optional <MvccSnapshot > pin = Optional .empty ();
483+ if (!selector .isLatest ()) {
484+ // Reuse the analyzer's resolver: snapshot existence, timestamp semantics, ref kind,
485+ // branch/tag movement and schema selection all remain owned by the existing MVCC path.
486+ statement .loadSnapshots (tableIf , selector .getTableSnapshot (), selector .getScanParams ());
487+ pin = statement .getSnapshot (tableIf , selector .getTableSnapshot (), selector .getScanParams ());
488+ }
489+ Optional <SqlCacheVersion > current = ((SqlCacheVersionProvider ) tableIf )
490+ .getSqlCacheVersion (pin );
491+ if (!current .isPresent () || !tableVersion .sqlCacheVersion .getVersion ()
492+ .equals (current .get ().getVersion ())) {
493+ return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
494+ }
474495 } else if (tableIf instanceof HMSExternalTable ) {
475- HMSExternalTable hiveTable = ( HMSExternalTable ) tableIf ;
476- if (tableVersion .version != hiveTable .getUpdateTime ()) {
496+ // Preserve the existing Hive update-time validation when no version provider is available.
497+ if (tableVersion .version != (( HMSExternalTable ) tableIf ) .getUpdateTime ()) {
477498 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
478499 }
479500 } else {
@@ -494,7 +515,8 @@ private IsChanged tablesOrDataChanged(Env env, SqlCacheContext sqlCacheContext)
494515 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
495516 }
496517 }
497- } else if (!(tableIf instanceof HMSExternalTable )) {
518+ } else if (!(tableIf instanceof HMSExternalTable )
519+ && !(tableIf instanceof SqlCacheVersionProvider )) {
498520 return IsChanged .CHANGED_AND_INVALIDATE_CACHE ;
499521 }
500522 }
@@ -559,7 +581,8 @@ private boolean dataMaskPoliciesChanged(
559581 */
560582 private boolean tryLockTables (ConnectContext connectContext , Env env , SqlCacheContext sqlCacheContext ) {
561583 StatementContext currentStatementContext = connectContext .getStatementContext ();
562- for (FullTableName fullTableName : sqlCacheContext .getUsedTables ().keySet ()) {
584+ for (TableReference reference : sqlCacheContext .getUsedTables ().keySet ()) {
585+ FullTableName fullTableName = reference .tableName ;
563586 TableIf tableIf = findTableIf (env , fullTableName );
564587 if (tableIf == null ) {
565588 return false ;
0 commit comments