1818package org .apache .doris .datasource .lance ;
1919
2020import org .apache .doris .catalog .Env ;
21+ import org .apache .doris .catalog .RefreshManager ;
2122import org .apache .doris .datasource .CatalogMgr ;
2223import org .apache .doris .datasource .ExternalCatalog ;
2324import org .apache .doris .datasource .ExternalMetaCacheMgr ;
25+ import org .apache .doris .datasource .ExternalObjectLog ;
2426import org .apache .doris .datasource .lance .job .LanceIndexDatasetLocator ;
27+ import org .apache .doris .persist .EditLog ;
2528
2629import org .apache .arrow .memory .BufferAllocator ;
2730import org .junit .jupiter .api .Assertions ;
3740import java .util .Collections ;
3841import java .util .HashMap ;
3942import java .util .Map ;
43+ import java .util .Optional ;
4044import java .util .concurrent .CountDownLatch ;
4145import java .util .concurrent .ExecutorService ;
4246import java .util .concurrent .Executors ;
@@ -208,7 +212,7 @@ public void testMetadataRefreshInvalidatesAccessWithoutClosingSession() throws E
208212 caches .invalidateTable (catalog .getId (), "mapped_db" , "mapped_table" );
209213 caches .invalidateDb (catalog .getId (), "mapped_db" );
210214 caches .invalidateCatalog (catalog .getId ());
211- Mockito .verify (client , Mockito .times (3 )).invalidateTableAccessCache ();
215+ Mockito .verify (client , Mockito .times (2 )).invalidateTableAccessCache ();
212216 Mockito .verify (session , Mockito .never ()).close ();
213217 Mockito .verify (catalog , Mockito .never ()).createClient ();
214218 } finally {
@@ -235,6 +239,123 @@ public void testIndexJobLocatorBypassesQueryAccessCache() throws Exception {
235239 }
236240 }
237241
242+ @ Test
243+ public void testRoutineDatabaseObjectCleanupPreservesHotAccess () throws Exception {
244+ try (AccessFixture fixture = new AccessFixture ()) {
245+ LanceNamespaceClient access = fixture .access ();
246+ access .resolveTableAccess ("default" , "items" );
247+ new LanceExternalDatabase (fixture .catalog , 1 , "cold_db" , "cold_db" ).resetMetaToUninitialized ();
248+ access .resolveTableAccess ("default" , "items" );
249+ Mockito .verify (fixture .namespace ).describeTable (Mockito .any ());
250+ }
251+ }
252+
253+ @ Test
254+ public void testRefreshReplayInvalidatesAccessWithMissingObjects () throws Exception {
255+ for (boolean missingDatabase : new boolean [] {false , true }) {
256+ for (boolean legacyIds : new boolean [] {false , true }) {
257+ try (AccessFixture fixture = new AccessFixture ()) {
258+ LanceNamespaceClient access = fixture .access ();
259+ access .resolveTableAccess ("default" , "items" );
260+ LanceExternalDatabase database = Mockito .mock (LanceExternalDatabase .class );
261+ Mockito .doReturn (missingDatabase ? Optional .empty () : Optional .of (database ))
262+ .when (fixture .catalog ).getDbForReplay ("mapped_db" );
263+ Mockito .doReturn (missingDatabase ? Optional .empty () : Optional .of (database ))
264+ .when (fixture .catalog ).getDbForReplay (1L );
265+ ExternalObjectLog log = ExternalObjectLog .createForRefreshTable (
266+ fixture .catalog .getId (), "mapped_db" , "mapped_table" , 0 );
267+ if (legacyIds ) {
268+ log .setDbName (null );
269+ log .setTableName (null );
270+ log .setDbId (1L );
271+ log .setTableId (2L );
272+ }
273+ // Access entries can survive eviction of the smaller database/table object caches.
274+ new RefreshManager ().replayRefreshTable (log );
275+ access .resolveTableAccess ("default" , "items" );
276+ Mockito .verify (fixture .namespace , Mockito .times (2 )).describeTable (Mockito .any ());
277+ Mockito .verify (fixture .catalog , Mockito .never ()).createClient ();
278+ }
279+ }
280+ }
281+ }
282+
283+ @ Test
284+ public void testDatabaseRefreshReplayWithoutDatabaseObject () throws Exception {
285+ try (AccessFixture fixture = new AccessFixture ()) {
286+ LanceNamespaceClient access = fixture .access ();
287+ access .resolveTableAccess ("default" , "items" );
288+ Mockito .doReturn (Optional .empty ()).when (fixture .catalog ).getDbForReplay ("mapped_db" );
289+ new RefreshManager ().replayRefreshDb (
290+ ExternalObjectLog .createForRefreshDb (fixture .catalog .getId (), "mapped_db" ));
291+ access .resolveTableAccess ("default" , "items" );
292+ Mockito .verify (fixture .namespace , Mockito .times (2 )).describeTable (Mockito .any ());
293+ }
294+ }
295+
296+ @ Test
297+ public void testExplicitDatabaseRefreshInvalidatesAccess () throws Exception {
298+ try (AccessFixture fixture = new AccessFixture ()) {
299+ LanceNamespaceClient access = fixture .access ();
300+ access .resolveTableAccess ("default" , "items" );
301+ LanceExternalDatabase database = new LanceExternalDatabase (fixture .catalog , 1 , "mapped_db" , "default" );
302+ Mockito .doReturn (database ).when (fixture .catalog ).getDbOrDdlException ("mapped_db" );
303+ new RefreshManager ().handleRefreshDb ("lifecycle" , "mapped_db" );
304+ access .resolveTableAccess ("default" , "items" );
305+ Mockito .verify (fixture .namespace , Mockito .times (2 )).describeTable (Mockito .any ());
306+ }
307+ }
308+
309+ @ Test
310+ public void testNamespaceRemovalInvalidatesAccessWithoutDatabaseObjects () throws Exception {
311+ try (AccessFixture fixture = new AccessFixture ()) {
312+ LanceNamespaceClient access = fixture .access ();
313+ access .resolveTableAccess ("default" , "items" );
314+ setField (ExternalCatalog .class , fixture .catalog , "initialized" , false );
315+ fixture .catalog .unregisterDatabase ("mapped_db" );
316+ access .resolveTableAccess ("default" , "items" );
317+ Mockito .verify (fixture .namespace , Mockito .times (2 )).describeTable (Mockito .any ());
318+ Mockito .verify (fixture .catalog , Mockito .never ()).createClient ();
319+ }
320+ }
321+
322+ private static final class AccessFixture implements AutoCloseable {
323+ private final LanceNamespace namespace = Mockito .mock (LanceNamespace .class );
324+ private final LanceCatalogClient client = new LanceCatalogClient (namespace ,
325+ Mockito .mock (BufferAllocator .class ), Mockito .mock (Session .class ), "filesystem" , "default" ,
326+ Collections .emptyList (), Collections .emptyList (), Collections .emptyMap (), Collections .emptyList ());
327+ private final LanceExternalCatalog catalog = catalog (client );
328+ private final MockedStatic <Env > currentEnv ;
329+
330+ private AccessFixture () throws Exception {
331+ Mockito .when (namespace .describeTable (Mockito .any ())).thenReturn (
332+ new DescribeTableResponse ().tableUri ("file:///warehouse/items.lance" ));
333+ ExternalMetaCacheMgr caches = Env .getCurrentEnv ().getExtMetaCacheMgr ();
334+ Env env = Mockito .mock (Env .class );
335+ CatalogMgr catalogs = Mockito .mock (CatalogMgr .class );
336+ Mockito .when (env .getCatalogMgr ()).thenReturn (catalogs );
337+ Mockito .when (env .getExtMetaCacheMgr ()).thenReturn (caches );
338+ Mockito .when (env .getEditLog ()).thenReturn (Mockito .mock (EditLog .class ));
339+ Mockito .doReturn (catalog ).when (catalogs ).getCatalog ("lifecycle" );
340+ long catalogId = catalog .getId ();
341+ Mockito .doReturn (catalog ).when (catalogs ).getCatalog (catalogId );
342+ currentEnv = Mockito .mockStatic (Env .class );
343+ currentEnv .when (Env ::getCurrentEnv ).thenReturn (env );
344+ }
345+
346+ private LanceNamespaceClient access () throws Exception {
347+ Field field = LanceCatalogClient .class .getDeclaredField ("namespaceClient" );
348+ field .setAccessible (true );
349+ return (LanceNamespaceClient ) field .get (client );
350+ }
351+
352+ @ Override
353+ public void close () {
354+ currentEnv .close ();
355+ catalog .onClose ();
356+ }
357+ }
358+
238359 private static LanceCatalogClient client (Session session ) {
239360 return new LanceCatalogClient (Mockito .mock (LanceNamespace .class ), Mockito .mock (BufferAllocator .class ),
240361 session , "filesystem" , "default" , Collections .emptyList (), Collections .emptyList (),
0 commit comments