(ignite-3) branch main updated: IGNITE-28347 Sql. Fix flaky test SqlOutdatedPlanTest.planningIsRepeatedUsingTheSameTransaction (#7866)

[ppa]

This is an automated email from the ASF dual-hosted git repository.

ppa pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 7abb97b645d IGNITE-28347 Sql. Fix flaky test 
SqlOutdatedPlanTest.planningIsRepeatedUsingTheSameTransaction (#7866)
7abb97b645d is described below

commit 7abb97b645d71ad51f7f121d71aa311fd18d94e6
Author: Pavel Pereslegin <xxt...@gmail.com>
AuthorDate: Wed Mar 25 16:31:00 2026 +0300

    IGNITE-28347 Sql. Fix flaky test 
SqlOutdatedPlanTest.planningIsRepeatedUsingTheSameTransaction (#7866)
---
 .../apache/ignite/internal/sql/engine/exec/SqlOutdatedPlanTest.java  | 4 +++-
 .../apache/ignite/internal/sql/engine/framework/TestBuilders.java    | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/SqlOutdatedPlanTest.java
 
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/SqlOutdatedPlanTest.java
index 65492b069fe..d59f0c6a4f3 100644
--- 
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/SqlOutdatedPlanTest.java
+++ 
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/SqlOutdatedPlanTest.java
@@ -217,7 +217,9 @@ public class SqlOutdatedPlanTest extends 
BaseIgniteAbstractTest {
                         Semaphore semaphore = prepareBlockHolder.get();
 
                         try {
-                            semaphore.tryAcquire(10, TimeUnit.SECONDS);
+                            boolean acquired = semaphore.tryAcquire(10, 
TimeUnit.SECONDS);
+
+                            assertThat(acquired, is(true));
                         } catch (InterruptedException e) {
                             throw new RuntimeException(e);
                         } finally {
diff --git 
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
 
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
index f1a82d670bb..438afc8ddde 100644
--- 
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
+++ 
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
@@ -145,6 +145,7 @@ import 
org.apache.ignite.internal.sql.engine.util.cache.CaffeineCacheFactory;
 import org.apache.ignite.internal.systemview.SystemViewManagerImpl;
 import org.apache.ignite.internal.systemview.api.SystemView;
 import 
org.apache.ignite.internal.table.distributed.TableStatsStalenessConfiguration;
+import org.apache.ignite.internal.testframework.IgniteTestUtils;
 import org.apache.ignite.internal.thread.IgniteThreadFactory;
 import org.apache.ignite.internal.tx.InternalTransaction;
 import org.apache.ignite.internal.type.NativeType;
@@ -1731,7 +1732,9 @@ public class TestBuilders {
             Runnable callback = prepareCallback;
 
             if (callback != null) {
-                callback.run();
+                // Run the callback asynchronously to avoid blocking the 
calling thread.
+                return IgniteTestUtils.runAsync(callback::run)
+                        .thenCompose(ignore -> 
delegate.prepareAsync(parsedResult, ctx));
             }
 
             return delegate.prepareAsync(parsedResult, ctx);