You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sa...@apache.org on 2022/10/27 22:08:20 UTC
[ignite-3] branch ignite-3.0.0-beta1 updated: IGNITE-18004 Compilation fixed, test disabled (#1270)
This is an automated email from the ASF dual-hosted git repository.
sanpwc pushed a commit to branch ignite-3.0.0-beta1
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-3.0.0-beta1 by this push:
new 1ddf62f92a IGNITE-18004 Compilation fixed, test disabled (#1270)
1ddf62f92a is described below
commit 1ddf62f92a25dc85cd9dbd6e02552b252654f48a
Author: Alexander Lapin <la...@gmail.com>
AuthorDate: Fri Oct 28 01:08:14 2022 +0300
IGNITE-18004 Compilation fixed, test disabled (#1270)
---
.../ignite/internal/sql/engine/ItDataTypesTest.java | 2 ++
.../org/apache/ignite/internal/app/IgniteImpl.java | 3 ++-
.../ignite/internal/sql/engine/SqlQueryProcessor.java | 10 +++++++---
.../internal/sql/engine/StopCalciteModuleTest.java | 7 ++++++-
.../internal/sql/engine/exec/MockedStructuresTest.java | 18 ++++++++++++------
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDataTypesTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDataTypesTest.java
index 064e991806..1fb2969a45 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDataTypesTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDataTypesTest.java
@@ -26,6 +26,7 @@ import java.util.Set;
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 class ItDataTypesTest extends AbstractBasicIntegrationTest {
/** 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)");
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index c9a6dc6312..45d099b1a7 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -392,7 +392,8 @@ public class IgniteImpl implements Ignite {
schemaManager,
dataStorageMgr,
txManager,
- () -> dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions())
+ () -> dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions()),
+ clock
);
sql = new IgniteSqlImpl(qryEngine);
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index 25beeb5419..b3fdf34019 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@ -43,7 +43,7 @@ import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.tools.Frameworks;
import org.apache.calcite.util.Pair;
-import org.apache.ignite.internal.hlc.HybridClockImpl;
+import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.index.IndexManager;
import org.apache.ignite.internal.index.event.IndexEvent;
@@ -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 class SqlQueryProcessor implements QueryProcessor {
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 class SqlQueryProcessor implements QueryProcessor {
this.dataStorageManager = dataStorageManager;
this.txManager = txManager;
this.dataStorageFieldsSupplier = dataStorageFieldsSupplier;
+ this.clock = clock;
}
/** {@inheritDoc} */
@@ -390,7 +394,7 @@ public class SqlQueryProcessor implements QueryProcessor {
})
.thenCompose(sqlNode -> {
final boolean rwOp = dataModificationOp(sqlNode);
- final HybridTimestamp txTime = outerTx != null ? outerTx.readTimestamp() : rwOp ? null : new HybridClockImpl().now();
+ final HybridTimestamp txTime = outerTx != null ? outerTx.readTimestamp() : rwOp ? null : clock.now();
BaseQueryContext ctx = BaseQueryContext.builder()
.frameworkConfig(
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java
index 58fc2974fc..7f8e5139ef 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/StopCalciteModuleTest.java
@@ -47,6 +47,7 @@ import java.util.function.Function;
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 class StopCalciteModuleTest {
schemaManager,
dataStorageManager,
txManager,
- Map::of
+ Map::of,
+ clock
);
when(tbl.tableId()).thenReturn(UUID.randomUUID());
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
index adc742225d..38e8b211b2 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
@@ -55,7 +55,7 @@ import org.apache.ignite.internal.configuration.notifications.ConfigurationStora
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;
@@ -147,6 +147,9 @@ public class MockedStructuresTest extends IgniteAbstractTest {
@Mock
MetaStorageManager msm;
+ @Mock
+ HybridClock clock;
+
/**
* Revision listener holder. It uses for the test configurations:
* <ul>
@@ -260,10 +263,13 @@ public class MockedStructuresTest extends IgniteAbstractTest {
schemaManager,
dataStorageManager,
tm,
- () -> dataStorageModules.collectSchemasFields(List.of(
- RocksDbDataStorageConfigurationSchema.class,
- TestDataStorageConfigurationSchema.class
- ))
+ () -> dataStorageModules.collectSchemasFields(
+ List.of(
+ RocksDbDataStorageConfigurationSchema.class,
+ TestDataStorageConfigurationSchema.class
+ )
+ ),
+ clock
);
queryProc.start();
@@ -770,7 +776,7 @@ public class MockedStructuresTest extends IgniteAbstractTest {
msm,
schemaManager,
view -> new LocalLogStorageFactory(),
- new HybridClockImpl()
+ clock
);
tableManager.start();