IGNITE-18004 Compilation fixed, test disabled.

modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDataTypesTest.java

@@ -26,6 +26,7 @@
 import java.util.stream.Collectors;
 import org.apache.calcite.runtime.CalciteContextException;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -46,6 +47,7 @@ public void dropTables() {
 
     /** Tests correctness with unicode. */
     @Test
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-18005")
     public void testUnicodeStrings() {
         sql("CREATE TABLE string_table(key int primary key, val varchar)");
 

modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java

@@ -399,7 +399,8 @@ public class IgniteImpl implements Ignite {
                 schemaManager,
                 dataStorageMgr,
                 txManager,
-                () -> dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions())
+                () -> dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions()),
+                clock
         );
 
         sql = new IgniteSqlImpl(qryEngine);

modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java

@@ -141,6 +141,8 @@ public class SqlQueryProcessor implements QueryProcessor {
     /** Transaction manager. */
     private final TxManager txManager;
 
+    private HybridClock clock;
+
     /** Constructor. */
     public SqlQueryProcessor(
             Consumer<Function<Long, CompletableFuture<?>>> registry,
@@ -150,7 +152,8 @@ public SqlQueryProcessor(
             SchemaManager schemaManager,
             DataStorageManager dataStorageManager,
             TxManager txManager,
-            Supplier<Map<String, Map<String, Class<?>>>> dataStorageFieldsSupplier
+            Supplier<Map<String, Map<String, Class<?>>>> dataStorageFieldsSupplier,
+            HybridClock clock
     ) {
         this.registry = registry;
         this.clusterSrvc = clusterSrvc;
@@ -160,6 +163,7 @@ public SqlQueryProcessor(
         this.dataStorageManager = dataStorageManager;
         this.txManager = txManager;
         this.dataStorageFieldsSupplier = dataStorageFieldsSupplier;
+        this.clock = clock;
     }
 
     /** {@inheritDoc} */
@@ -390,7 +394,7 @@ private CompletableFuture<AsyncSqlCursor<List<Object>>> querySingle0(
                 })
                 .thenCompose(sqlNode -> {
                     final boolean rwOp = dataModificationOp(sqlNode);
-                    final HybridTimestamp txTime = outerTx != null ? outerTx.readTimestamp() : rwOp ? null : new HybridClock().now();
+                    final HybridTimestamp txTime = outerTx != null ? outerTx.readTimestamp() : rwOp ? null : clock.now();
 
                     BaseQueryContext ctx = BaseQueryContext.builder()
                             .frameworkConfig(

modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java

@@ -47,6 +47,7 @@
 import org.apache.ignite.configuration.ConfigurationValue;
 import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
 import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
+import org.apache.ignite.internal.hlc.HybridClock;
 import org.apache.ignite.internal.index.IndexManager;
 import org.apache.ignite.internal.logger.IgniteLogger;
 import org.apache.ignite.internal.logger.Loggers;
@@ -127,6 +128,9 @@ public class StopCalciteModuleTest {
     @Mock
     InternalTable tbl;
 
+    @Mock
+    HybridClock clock;
+
     SchemaRegistry schemaReg;
 
     TestRevisionRegister testRevisionRegister = new TestRevisionRegister();
@@ -216,7 +220,8 @@ public void testStopQueryOnNodeStop() throws Exception {
                 schemaManager,
                 dataStorageManager,
                 txManager,
-                Map::of
+                Map::of,
+                clock
         );
 
         when(tbl.tableId()).thenReturn(UUID.randomUUID());

modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java

@@ -48,7 +48,7 @@
 import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
 import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
 import org.apache.ignite.internal.configuration.testframework.InjectRevisionListenerHolder;
-import org.apache.ignite.internal.hlc.HybridClockImpl;
+import org.apache.ignite.internal.hlc.HybridClock;
 import org.apache.ignite.internal.index.IndexManager;
 import org.apache.ignite.internal.metastorage.MetaStorageManager;
 import org.apache.ignite.internal.raft.Loza;
@@ -130,6 +130,9 @@ public class MockedStructuresTest extends IgniteAbstractTest {
     @Mock
     MetaStorageManager msm;
 
+    @Mock
+    HybridClock clock;
+
     /**
      * Revision listener holder. It uses for the test configurations:
      * <ul>
@@ -245,10 +248,13 @@ void before() throws Exception {
                 schemaManager,
                 dataStorageManager,
                 tm,
-                () -> dataStorageModules.collectSchemasFields(List.of(
-                        RocksDbDataStorageConfigurationSchema.class,
-                        TestDataStorageConfigurationSchema.class
-                ))
+                () -> dataStorageModules.collectSchemasFields(
+                        List.of(
+                                RocksDbDataStorageConfigurationSchema.class,
+                                TestDataStorageConfigurationSchema.class
+                        )
+                ),
+                clock
         );
 
         queryProc.start();
@@ -506,7 +512,7 @@ private TableManager createTableManager() {
                 msm,
                 schemaManager,
                 view -> new LocalLogStorageFactory(),
-                new HybridClockImpl(),
+                clock,
                 mock(OutgoingSnapshotsManager.class)
         );