(ignite-3) branch main updated: IGNITE-22753 Sql. TestCluster, NPE eventually raised on mocked structure (#4207)

[zstan]

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

zstan 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 f5cdb73b6a IGNITE-22753 Sql. TestCluster, NPE eventually raised on 
mocked structure (#4207)
f5cdb73b6a is described below

commit f5cdb73b6afe3e235baa75b911475d8bf95d1a86
Author: Evgeniy Stanilovskiy <stanilov...@gmail.com>
AuthorDate: Fri Aug 9 13:58:42 2024 +0300

    IGNITE-22753 Sql. TestCluster, NPE eventually raised on mocked structure 
(#4207)
---
 modules/sql-engine/build.gradle                                      | 1 +
 .../apache/ignite/internal/sql/engine/framework/TestBuilders.java    | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/sql-engine/build.gradle b/modules/sql-engine/build.gradle
index 8f0804e08c..5edde4def5 100644
--- a/modules/sql-engine/build.gradle
+++ b/modules/sql-engine/build.gradle
@@ -106,6 +106,7 @@ dependencies {
     testImplementation(testFixtures(project(':ignite-table')))
     testImplementation(testFixtures(project(':ignite-transactions')))
     testImplementation(testFixtures(project(':ignite-low-watermark')))
+    testImplementation(testFixtures(project(':ignite-metrics')))
 
     testImplementation libs.mockito.junit
     testImplementation libs.mockito.core
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 eb5abd0660..e5aa3899c4 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
@@ -24,7 +24,6 @@ import static 
org.apache.ignite.internal.testframework.IgniteTestUtils.await;
 import static 
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
 import static org.apache.ignite.internal.util.CollectionUtils.nullOrEmpty;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81,7 +80,7 @@ import org.apache.ignite.internal.hlc.TestClockService;
 import org.apache.ignite.internal.logger.IgniteLogger;
 import org.apache.ignite.internal.logger.Loggers;
 import org.apache.ignite.internal.manager.ComponentContext;
-import org.apache.ignite.internal.metrics.MetricManagerImpl;
+import org.apache.ignite.internal.metrics.NoOpMetricManager;
 import org.apache.ignite.internal.sql.SqlCommon;
 import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
 import org.apache.ignite.internal.sql.engine.exec.ExecutableTable;
@@ -637,7 +636,7 @@ public class TestBuilders {
             var schemaManager = new SqlSchemaManagerImpl(catalogManager, 
CaffeineCacheFactory.INSTANCE, 0);
             var prepareService = new PrepareServiceImpl(clusterName, 0, 
CaffeineCacheFactory.INSTANCE,
                     new DdlSqlToCommandConverter(), PLANNING_TIMEOUT, 
PLANNING_THREAD_COUNT,
-                    mock(MetricManagerImpl.class), schemaManager);
+                    new NoOpMetricManager(), schemaManager);
 
             Map<String, List<List<String>>> owningNodesByTableName = new 
HashMap<>();
             for (Entry<String, Map<String, ScannableTable>> entry : 
nodeName2tableName2table.entrySet()) {