This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-18872 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 1b80de9963835157ec4470e21220b8421f3b2fd4 Author: amashenkov <[email protected]> AuthorDate: Tue May 2 14:13:40 2023 +0300 Use single instance of IgniteTypeFactory --- .../internal/sql/engine/ItImplicitCastsTest.java | 3 ++- .../datatypes/tests/BaseCustomDataTypeTest.java | 5 ++--- .../datatypes/tests/TestTypeArgumentsTest.java | 4 ++-- .../sql/engine/type/IgniteTypeFactory.java | 8 -------- .../internal/sql/engine/util/BaseQueryContext.java | 5 +++-- .../sql/engine/exec/RuntimeSortedIndexTest.java | 3 ++- .../engine/exec/exp/ExpressionFactoryImplTest.java | 8 ++------ .../engine/exec/rel/MergeJoinExecutionTest.java | 8 ++------ .../sql/engine/planner/AbstractPlannerTest.java | 4 ++-- .../CorrelatedNestedLoopJoinPlannerTest.java | 6 +++--- .../engine/planner/HashIndexSpoolPlannerTest.java | 8 ++++---- .../planner/IndexSearchBoundsPlannerTest.java | 4 ++-- .../sql/engine/planner/LimitOffsetPlannerTest.java | 4 ++-- .../internal/sql/engine/planner/PlannerTest.java | 24 +++++++++++----------- .../planner/ProjectFilterScanMergePlannerTest.java | 4 ++-- .../sql/engine/planner/SetOpPlannerTest.java | 4 ++-- .../planner/SortedIndexSpoolPlannerTest.java | 6 +++--- .../engine/planner/TableFunctionPlannerTest.java | 4 ++-- .../sql/engine/planner/TableSpoolPlannerTest.java | 4 ++-- .../sql/engine/planner/UnionPlannerTest.java | 4 ++-- .../engine/prepare/LeastRestrictiveTypesTest.java | 3 ++- .../engine/sql/IgniteSqlDecimalLiteralTest.java | 4 ++-- 22 files changed, 57 insertions(+), 70 deletions(-) diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItImplicitCastsTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItImplicitCastsTest.java index 135d53cd67..032f37dfd6 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItImplicitCastsTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItImplicitCastsTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.internal.sql.engine.type.IgniteCustomType; import org.apache.ignite.internal.sql.engine.type.IgniteCustomTypeCoercionRules; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; import org.apache.ignite.internal.sql.engine.type.UuidType; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.tx.Transaction; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -92,7 +93,7 @@ public class ItImplicitCastsTest extends ClusterPerClassIntegrationTest { } private static Stream<ColumnPair> columnPairs() { - IgniteTypeFactory typeFactory = new IgniteTypeFactory(); + IgniteTypeFactory typeFactory = Commons.typeFactory(); List<ColumnPair> columnPairs = new ArrayList<>(); columnPairs.add(new ColumnPair(typeFactory.createSqlType(SqlTypeName.INTEGER), typeFactory.createSqlType(SqlTypeName.FLOAT))); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/BaseCustomDataTypeTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/BaseCustomDataTypeTest.java index fbe60d2dbf..d7268d5f47 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/BaseCustomDataTypeTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/BaseCustomDataTypeTest.java @@ -31,8 +31,7 @@ import org.apache.ignite.internal.sql.engine.AsyncSqlCursor; import org.apache.ignite.internal.sql.engine.ClusterPerClassIntegrationTest; import org.apache.ignite.internal.sql.engine.QueryProcessor; import org.apache.ignite.internal.sql.engine.type.IgniteCustomType; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.sql.engine.util.QueryChecker; import org.apache.ignite.internal.sql.engine.util.QueryChecker.QueryTemplate; import org.apache.ignite.sql.ColumnMetadata; @@ -78,7 +77,7 @@ public abstract class BaseCustomDataTypeTest<T extends Comparable<T>> extends Cl testTypeSpec = getTypeSpec(); storageType = testTypeSpec.storageType(); - dataSamples = testTypeSpec.createSamples(new IgniteTypeFactory(IgniteTypeSystem.INSTANCE)); + dataSamples = testTypeSpec.createSamples(Commons.typeFactory()); orderedValues = dataSamples.ordered(); values = dataSamples.values(); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/TestTypeArgumentsTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/TestTypeArgumentsTest.java index 569dc8b187..fe456bc95d 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/TestTypeArgumentsTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/datatypes/tests/TestTypeArgumentsTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.stream.Collectors; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.sql.ColumnType; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ public class TestTypeArgumentsTest { private final TestType type = new TestType(); - private final TestDataSamples<String> samples = type.createSamples(new IgniteTypeFactory(IgniteTypeSystem.INSTANCE)); + private final TestDataSamples<String> samples = type.createSamples(Commons.typeFactory()); /** * Tests for {@link TestTypeArguments#unary(CustomDataTypeTestSpec, TestDataSamples, Comparable)}. diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java index 3218cb79d0..740386d7ad 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java @@ -94,14 +94,6 @@ public class IgniteTypeFactory extends JavaTypeFactoryImpl { } } - /** - * Constructor. - * TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859 - */ - public IgniteTypeFactory() { - this(IgniteTypeSystem.INSTANCE); - } - /** * Constructor. * diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/BaseQueryContext.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/BaseQueryContext.java index 3985f225c8..96d81f4a09 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/BaseQueryContext.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/BaseQueryContext.java @@ -103,6 +103,7 @@ public final class BaseQueryContext extends AbstractQueryContext { } RelDataTypeSystem typeSys = CALCITE_CONNECTION_CONFIG.typeSystem(RelDataTypeSystem.class, FRAMEWORK_CONFIG.getTypeSystem()); + TYPE_FACTORY = createTypeFactory(typeSys); DFLT_REX_BUILDER = createRexBuilder(TYPE_FACTORY); @@ -181,9 +182,9 @@ public final class BaseQueryContext extends AbstractQueryContext { this.parameters = parameters; this.plannerTimeout = plannerTimeout; - RelDataTypeSystem typeSys = CALCITE_CONNECTION_CONFIG.typeSystem(RelDataTypeSystem.class, cfg.getTypeSystem()); + typeFactory = TYPE_FACTORY; - typeFactory = createTypeFactory(typeSys); + assert TYPE_FACTORY.getTypeSystem() == cfg.getTypeSystem(); rexBuilder = createRexBuilder(typeFactory); } diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/RuntimeSortedIndexTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/RuntimeSortedIndexTest.java index af6d1daf2b..480996bbb6 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/RuntimeSortedIndexTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/RuntimeSortedIndexTest.java @@ -36,6 +36,7 @@ import org.apache.calcite.util.ImmutableIntList; import org.apache.calcite.util.Pair; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; import org.apache.ignite.internal.sql.engine.util.BaseQueryContext; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.sql.engine.util.TypeUtils; import org.apache.ignite.internal.testframework.IgniteAbstractTest; import org.apache.ignite.internal.util.Cursor; @@ -68,7 +69,7 @@ public class RuntimeSortedIndexTest extends IgniteAbstractTest { @Test public void test() throws Exception { - IgniteTypeFactory tf = new IgniteTypeFactory(); + IgniteTypeFactory tf = Commons.typeFactory(); List<Pair<RelDataType, ImmutableIntList>> testIndexes = Arrays.stream(ROW_TYPES) .map(rt -> Pair.of(TypeUtils.createRowType(tf, rt.getKey()), rt.getValue())) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImplTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImplTest.java index 15f962c2b5..b9e000da37 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImplTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/exp/ExpressionFactoryImplTest.java @@ -17,20 +17,18 @@ package org.apache.ignite.internal.sql.engine.exec.exp; -import static org.apache.ignite.internal.sql.engine.util.BaseQueryContext.CALCITE_CONNECTION_CONFIG; import static org.junit.jupiter.api.Assertions.assertNotSame; import java.util.Arrays; import java.util.Collections; import org.apache.calcite.rel.type.RelDataTypeField; import org.apache.calcite.rel.type.RelDataTypeFieldImpl; -import org.apache.calcite.rel.type.RelDataTypeSystem; import org.apache.calcite.rel.type.RelRecordType; import org.apache.calcite.rex.RexDynamicParam; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.sql.validate.SqlConformanceEnum; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,9 +44,7 @@ public class ExpressionFactoryImplTest { @BeforeEach public void prepare() { - RelDataTypeSystem typeSys = CALCITE_CONNECTION_CONFIG.typeSystem(RelDataTypeSystem.class, IgniteTypeSystem.INSTANCE); - - typeFactory = new IgniteTypeFactory(typeSys); + typeFactory = Commons.typeFactory(); expFactory = new ExpressionFactoryImpl<>(null, typeFactory, SqlConformanceEnum.DEFAULT); } diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/MergeJoinExecutionTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/MergeJoinExecutionTest.java index ee4680ed19..29e733486f 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/MergeJoinExecutionTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/MergeJoinExecutionTest.java @@ -23,7 +23,6 @@ import static org.apache.calcite.rel.core.JoinRelType.INNER; import static org.apache.calcite.rel.core.JoinRelType.LEFT; import static org.apache.calcite.rel.core.JoinRelType.RIGHT; import static org.apache.calcite.rel.core.JoinRelType.SEMI; -import static org.apache.ignite.internal.sql.engine.util.BaseQueryContext.CALCITE_CONNECTION_CONFIG; import static org.apache.ignite.internal.util.ArrayUtils.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; @@ -39,15 +38,14 @@ import org.apache.calcite.rel.RelFieldCollation.Direction; import org.apache.calcite.rel.RelFieldCollation.NullDirection; import org.apache.calcite.rel.core.JoinRelType; import org.apache.calcite.rel.type.RelDataType; -import org.apache.calcite.rel.type.RelDataTypeSystem; import org.apache.calcite.sql.validate.SqlConformanceEnum; import org.apache.calcite.util.ImmutableBitSet; import org.apache.ignite.internal.sql.engine.exec.ArrayRowHandler; import org.apache.ignite.internal.sql.engine.exec.ExecutionContext; import org.apache.ignite.internal.sql.engine.exec.exp.ExpressionFactoryImpl; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; import org.apache.ignite.internal.sql.engine.util.BaseQueryContext; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.sql.engine.util.TypeUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -482,9 +480,7 @@ public class MergeJoinExecutionTest extends AbstractExecutionTest { RelDataType rightType = TypeUtils.createRowType(ctx.getTypeFactory(), Integer.class, String.class); ScanNode<Object[]> rightNode = new ScanNode<>(ctx, Arrays.asList(right)); - RelDataTypeSystem typeSys = CALCITE_CONNECTION_CONFIG.typeSystem(RelDataTypeSystem.class, IgniteTypeSystem.INSTANCE); - - IgniteTypeFactory typeFactory = new IgniteTypeFactory(typeSys); + IgniteTypeFactory typeFactory = Commons.typeFactory(); ExecutionContext<Object[]> ectx = new ExecutionContext<>(BaseQueryContext.builder().logger(log).build(), null, null, null, diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractPlannerTest.java index c31027e6d3..3a0b191ff5 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractPlannerTest.java @@ -117,8 +117,8 @@ import org.apache.ignite.internal.sql.engine.schema.TableDescriptor; import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.TraitUtils; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; import org.apache.ignite.internal.sql.engine.util.BaseQueryContext; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.table.InternalTable; import org.apache.ignite.internal.testframework.IgniteAbstractTest; import org.apache.ignite.internal.testframework.IgniteTestUtils; @@ -132,7 +132,7 @@ import org.jetbrains.annotations.Nullable; * TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859 */ public abstract class AbstractPlannerTest extends IgniteAbstractTest { - protected static final IgniteTypeFactory TYPE_FACTORY = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + protected static final IgniteTypeFactory TYPE_FACTORY = Commons.typeFactory(); protected static final int DEFAULT_TBL_SIZE = 500_000; diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/CorrelatedNestedLoopJoinPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/CorrelatedNestedLoopJoinPlannerTest.java index ae54c60774..705952a164 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/CorrelatedNestedLoopJoinPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/CorrelatedNestedLoopJoinPlannerTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.Test; /** @@ -48,7 +48,7 @@ public class CorrelatedNestedLoopJoinPlannerTest extends AbstractPlannerTest { @Test public void testValidIndexExpressions() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); publicSchema.addTable( new TestTable( @@ -113,7 +113,7 @@ public class CorrelatedNestedLoopJoinPlannerTest extends AbstractPlannerTest { @Test public void testInvalidIndexExpressions() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); publicSchema.addTable( new TestTable( diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashIndexSpoolPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashIndexSpoolPlannerTest.java index 48ff02a868..7d58a07b7a 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashIndexSpoolPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashIndexSpoolPlannerTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -51,7 +51,7 @@ public class HashIndexSpoolPlannerTest extends AbstractPlannerTest { @Test public void testSingleKey() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); createTable(publicSchema, "T0", new RelDataTypeFactory.Builder(f) .add("ID", f.createJavaType(Integer.class)) @@ -94,7 +94,7 @@ public class HashIndexSpoolPlannerTest extends AbstractPlannerTest { @Test public void testMultipleKeys() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); publicSchema.addTable( new TestTable( @@ -158,7 +158,7 @@ public class HashIndexSpoolPlannerTest extends AbstractPlannerTest { @Test public void testSourceWithoutCollation() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); publicSchema.addTable( new TestTable( diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/IndexSearchBoundsPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/IndexSearchBoundsPlannerTest.java index a19b1edc18..15903fa1de 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/IndexSearchBoundsPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/IndexSearchBoundsPlannerTest.java @@ -43,7 +43,7 @@ import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.trait.TraitUtils; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.sql.engine.util.RexUtils; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.BeforeAll; @@ -67,7 +67,7 @@ public class IndexSearchBoundsPlannerTest extends AbstractPlannerTest { @BeforeEach public void beforeEach() { - IgniteTypeFactory typeFactory = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory typeFactory = Commons.typeFactory(); tbl = new TestTable( new RelDataTypeFactory.Builder(typeFactory) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/LimitOffsetPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/LimitOffsetPlannerTest.java index ee052b2fed..8c82c52da1 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/LimitOffsetPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/LimitOffsetPlannerTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.util.ArrayUtils; import org.junit.jupiter.api.Test; @@ -199,7 +199,7 @@ public class LimitOffsetPlannerTest extends AbstractPlannerTest { * Creates PUBLIC schema with one TEST table. */ private IgniteSchema createSchemaWithTable(IgniteDistribution distr, int... indexedColumns) { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); RelDataType type = new RelDataTypeFactory.Builder(f) .add("ID", f.createJavaType(Integer.class)) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java index dec8c44b32..cb0c1014d1 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java @@ -63,8 +63,8 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistribution; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; import org.apache.ignite.internal.sql.engine.util.BaseQueryContext; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.internal.util.CollectionUtils; import org.apache.ignite.network.ClusterNode; import org.jetbrains.annotations.Nullable; @@ -102,7 +102,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testSplitterColocatedPartitionedPartitioned() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable developer = new TestTable( new RelDataTypeFactory.Builder(f) @@ -194,7 +194,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testSplitterColocatedReplicatedReplicated() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable developer = new TestTable( new RelDataTypeFactory.Builder(f) @@ -272,7 +272,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testSplitterPartiallyColocatedReplicatedAndPartitioned() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable developer = new TestTable( new RelDataTypeFactory.Builder(f) @@ -353,7 +353,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testSplitterPartiallyColocated1() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable developer = new TestTable( new RelDataTypeFactory.Builder(f) @@ -436,7 +436,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testSplitterPartiallyColocated2() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable developer = new TestTable( new RelDataTypeFactory.Builder(f) @@ -516,7 +516,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testSplitterNonColocated() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable developer = new TestTable( new RelDataTypeFactory.Builder(f) @@ -595,7 +595,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testMergeFilters() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable testTbl = new TestTable( new RelDataTypeFactory.Builder(f) @@ -651,7 +651,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testJoinPushExpressionRule() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable emp = new TestTable( new RelDataTypeFactory.Builder(f) @@ -753,7 +753,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testMergeJoinIsNotAppliedForNonEquiJoin() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable emp = new TestTable("EMP", new RelDataTypeFactory.Builder(f) @@ -806,7 +806,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void testNotStandardFunctions() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); publicSchema.addTable( new TestTable( @@ -839,7 +839,7 @@ public class PlannerTest extends AbstractPlannerTest { @Test public void correctPlanningWithOrToUnion() throws Exception { - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); TestTable tab0 = new TestTable( new RelDataTypeFactory.Builder(f) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ProjectFilterScanMergePlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ProjectFilterScanMergePlannerTest.java index c4527cf3a5..066bc211c0 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ProjectFilterScanMergePlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ProjectFilterScanMergePlannerTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteIndex; import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -53,7 +53,7 @@ public class ProjectFilterScanMergePlannerTest extends AbstractPlannerTest { public void setup() { publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); RelDataType type = new RelDataTypeFactory.Builder(f) .add("A", f.createSqlType(SqlTypeName.INTEGER)) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SetOpPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SetOpPlannerTest.java index a9ee2c22f3..c20db5c0a6 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SetOpPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SetOpPlannerTest.java @@ -37,7 +37,7 @@ import org.apache.ignite.internal.sql.engine.rel.set.IgniteSetOp; import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.params.ParameterizedTest; @@ -60,7 +60,7 @@ public class SetOpPlannerTest extends AbstractPlannerTest { public void setup() { publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); RelDataType type = new RelDataTypeFactory.Builder(f) .add("ID", f.createJavaType(Integer.class)) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortedIndexSpoolPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortedIndexSpoolPlannerTest.java index 66a01fc88d..16735a59ee 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortedIndexSpoolPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortedIndexSpoolPlannerTest.java @@ -40,7 +40,7 @@ import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.trait.TraitUtils; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -56,7 +56,7 @@ public class SortedIndexSpoolPlannerTest extends AbstractPlannerTest { @Test public void testNotColocatedEqJoin() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); createTable(publicSchema, "T0", @@ -106,7 +106,7 @@ public class SortedIndexSpoolPlannerTest extends AbstractPlannerTest { @Test public void testPartialIndexForCondition() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); createTable(publicSchema, "T0", diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableFunctionPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableFunctionPlannerTest.java index 20ec4d47e3..7134116a18 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableFunctionPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableFunctionPlannerTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.sql.engine.rel.IgniteTableFunctionScan; import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -47,7 +47,7 @@ public class TableFunctionPlannerTest extends AbstractPlannerTest { public void setup() { publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); RelDataType type = new RelDataTypeFactory.Builder(f) .add("ID", f.createJavaType(Integer.class)) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableSpoolPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableSpoolPlannerTest.java index 3ae2cc54f6..e86d0c95f1 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableSpoolPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/TableSpoolPlannerTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.internal.sql.engine.rel.IgniteTableSpool; import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -45,7 +45,7 @@ public class TableSpoolPlannerTest extends AbstractPlannerTest { @Test public void tableSpoolDistributed() throws Exception { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); createTable(publicSchema, "T0", diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/UnionPlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/UnionPlannerTest.java index a60ecf3833..abf870cd8e 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/UnionPlannerTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/UnionPlannerTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.sql.engine.rel.agg.IgniteReduceAggregateBase; import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.trait.IgniteDistributions; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeSystem; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.junit.jupiter.api.Test; /** @@ -79,7 +79,7 @@ public class UnionPlannerTest extends AbstractPlannerTest { private IgniteSchema prepareSchema() { IgniteSchema publicSchema = new IgniteSchema("PUBLIC"); - IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE); + IgniteTypeFactory f = Commons.typeFactory(); createTable(publicSchema, "TABLE1", diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java index c49e4ad34a..e5c75718c2 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.internal.schema.NativeTypes; import org.apache.ignite.internal.sql.engine.type.IgniteCustomType; import org.apache.ignite.internal.sql.engine.type.IgniteCustomTypeSpec; import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.sql.ColumnType; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -41,7 +42,7 @@ import org.junit.jupiter.params.provider.MethodSource; */ public class LeastRestrictiveTypesTest { - private static final IgniteTypeFactory TYPE_FACTORY = new IgniteTypeFactory(); + private static final IgniteTypeFactory TYPE_FACTORY = Commons.typeFactory(); private static final RelDataType TINYINT = TYPE_FACTORY.createSqlType(SqlTypeName.TINYINT); diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlDecimalLiteralTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlDecimalLiteralTest.java index c5eb42b08a..aa3ab707ed 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlDecimalLiteralTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlDecimalLiteralTest.java @@ -34,7 +34,7 @@ import org.apache.calcite.sql.pretty.SqlPrettyWriter; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.util.Litmus; import org.apache.ignite.internal.sql.engine.planner.AbstractPlannerTest; -import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory; +import org.apache.ignite.internal.sql.engine.util.Commons; import org.apache.ignite.sql.SqlException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -59,7 +59,7 @@ public class IgniteSqlDecimalLiteralTest extends AbstractPlannerTest { assertEquals(input, literal.getValue(), "value"); - var typeFactory = new IgniteTypeFactory(); + var typeFactory = Commons.typeFactory(); var actualType = literal.createSqlType(typeFactory); var expectedType = typeFactory.createSqlType(SqlTypeName.DECIMAL, input.precision(), input.scale());
