This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-27242 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit a9e69ed310ef8e0d3b5a921dc0caf2085d40c69a Author: amashenkov <[email protected]> AuthorDate: Fri Dec 12 17:52:46 2025 +0300 minor --- .../sql/engine/prepare/PrepareServiceImplTest.java | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImplTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImplTest.java index a3a9b4a55f1..7fdb0923a8e 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImplTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImplTest.java @@ -341,9 +341,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { IgniteSchema schema = new IgniteSchema("PUBLIC", 0, List.of(igniteTable)); Cache<Object, Object> cache = CaffeineCacheFactory.INSTANCE.create(100); - CacheFactory cacheFactory = new DummyCacheFactory(cache); - - PrepareServiceImpl service = createPlannerService(schema, cacheFactory, 100); + PrepareServiceImpl service = createPlannerService(schema, new DummyCacheFactory(cache), 100L); StringBuilder stmt = new StringBuilder(); for (int i = 0; i < 100; i++) { @@ -401,7 +399,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { IgniteSchema schema = new IgniteSchema("TEST", 0, List.of(table)); - PrepareServiceImpl service = createPlannerService(schema, CaffeineCacheFactory.INSTANCE, Integer.MAX_VALUE); + PrepareServiceImpl service = createPlannerService(schema, CaffeineCacheFactory.INSTANCE, Long.MAX_VALUE); assertThat(service.cache.size(), is(0)); @@ -449,17 +447,17 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { IgniteSchema schema = new IgniteSchema("TEST", 0, List.of(table1, table2)); // 1 item cache plan size - PrepareServiceImpl service = (PrepareServiceImpl) createPlannerService(schema, 1); + PrepareServiceImpl service = createPlannerService(schema, 1); - String selectQuery = "SELECT * FROM test.t1 WHERE c = 1"; - await(service.prepareAsync(parse(selectQuery), operationContext().build())); + String query1 = "SELECT * FROM test.t1 WHERE c = 1"; + await(service.prepareAsync(parse(query1), operationContext().build())); assertThat(service.cache.size(), is(1)); CacheKey key1 = service.cache.entrySet().iterator().next().getKey(); // different table - String insertQuery = "SELECT * FROM test.t2 WHERE c = 1"; - QueryPlan plan2 = await(service.prepareAsync(parse(insertQuery), operationContext().build())); + String query2 = "SELECT * FROM test.t2 WHERE c = 1"; + QueryPlan plan2 = await(service.prepareAsync(parse(query2), operationContext().build())); assertThat(service.cache.size(), is(1)); CacheKey key2 = service.cache.entrySet().iterator().next().getKey(); @@ -474,7 +472,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { Awaitility.await() .atMost(Duration.ofMillis(2 * PLAN_UPDATER_REFRESH_PERIOD)) .until( - () -> !plan2.equals(await(service.prepareAsync(parse(insertQuery), operationContext().build()))) + () -> !plan2.equals(await(service.prepareAsync(parse(query2), operationContext().build()))) ); } @@ -614,7 +612,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { Awaitility.await().timeout(30, TimeUnit.SECONDS).untilAsserted(() -> { int expireSeconds = 2; PrepareServiceImpl service = - createPlannerService(schema, CaffeineCacheFactory.INSTANCE, Integer.MAX_VALUE, expireSeconds, 1000); + createPlannerService(schema, CaffeineCacheFactory.INSTANCE, Long.MAX_VALUE, expireSeconds, 1000); String query = "SELECT * FROM test.t WHERE c = 1"; QueryPlan p0 = await(service.prepareAsync(parse(query), operationContext().build())); @@ -646,7 +644,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { Cache<Object, Object> cache = CaffeineCacheFactory.INSTANCE.create(100); - PrepareServiceImpl service = createPlannerService(schema, new DummyCacheFactory(cache), 1000); + PrepareServiceImpl service = createPlannerService(schema, new DummyCacheFactory(cache), 1000L); await(service.prepareAsync(parse("SELECT * FROM t1"), createContext())); await(service.prepareAsync(parse("SELECT * FROM t1 WHERE C > 0"), createContext())); @@ -669,7 +667,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { Cache<Object, Object> cache = CaffeineCacheFactory.INSTANCE.create(100); - PrepareServiceImpl service = createPlannerService(schema, new DummyCacheFactory(cache), 1000); + PrepareServiceImpl service = createPlannerService(schema, new DummyCacheFactory(cache), 1000L); { // Simple name. await(service.prepareAsync(parse("SELECT * FROM t1"), createContext())); @@ -739,7 +737,7 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { )); PrepareServiceImpl service = - createPlannerService(schema, CaffeineCacheFactory.INSTANCE, Integer.MAX_VALUE, 100, 1000); + createPlannerService(schema, CaffeineCacheFactory.INSTANCE, Long.MAX_VALUE, 100, 1000); BlockingQueue<PreparedPlan> result = new LinkedBlockingQueue<>(); @@ -846,22 +844,25 @@ public class PrepareServiceImplTest extends BaseIgniteAbstractTest { return createPlannerService(createSchema()); } - private static PrepareService createPlannerService(IgniteSchema schema, int cacheSize) { - return createPlannerService(schema, CaffeineCacheFactory.INSTANCE, 10000, Integer.MAX_VALUE, cacheSize); + private static PrepareService createPlannerService(IgniteSchema schema) { + return createPlannerService(schema, CaffeineCacheFactory.INSTANCE, 10000L, Integer.MAX_VALUE, 1000); } - private static PrepareService createPlannerService(IgniteSchema schema) { - return createPlannerService(schema, CaffeineCacheFactory.INSTANCE, 10000); + private static PrepareServiceImpl createPlannerService(IgniteSchema schema, int cacheSize) { + // Run clean up tasks in the current thread, so no eviction event is delayed. + CacheFactory cacheFactory = CaffeineCacheFactory.create(Runnable::run); + + return createPlannerService(schema, cacheFactory, 10000L, Integer.MAX_VALUE, cacheSize); } - private static PrepareServiceImpl createPlannerService(IgniteSchema schemas, CacheFactory cacheFactory, int timeoutMillis) { + private static PrepareServiceImpl createPlannerService(IgniteSchema schemas, CacheFactory cacheFactory, long timeoutMillis) { return createPlannerService(schemas, cacheFactory, timeoutMillis, Integer.MAX_VALUE, 1000); } private static PrepareServiceImpl createPlannerService( IgniteSchema schemas, CacheFactory cacheFactory, - int timeoutMillis, + long timeoutMillis, int planExpireSeconds, int cacheSize ) {
