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 5a0fd87b6d IGNITE-18356 Remove already implemented issues from todo
mentioning - Fixes #1427.
5a0fd87b6d is described below
commit 5a0fd87b6dc8a7a09734ab659a54521e8a34a752
Author: zstan <[email protected]>
AuthorDate: Fri Dec 9 16:36:14 2022 +0300
IGNITE-18356 Remove already implemented issues from todo mentioning - Fixes
#1427.
Signed-off-by: zstan <[email protected]>
---
.../runner/app/ItIgniteNodeRestartTest.java | 2 +-
.../internal/sql/engine/SqlQueryProcessor.java | 16 ++---
.../internal/sql/engine/schema/IgniteSchema.java | 9 +--
.../internal/sql/engine/schema/IgniteTable.java | 7 ++
.../sql/engine/schema/IgniteTableImpl.java | 6 ++
.../sql/engine/schema/SqlSchemaManagerImpl.java | 28 +++-----
.../engine/exec/schema/SqlSchemaManagerTest.java | 15 ++---
.../planner/AbstractAggregatePlannerTest.java | 25 ++++----
.../sql/engine/planner/AbstractPlannerTest.java | 11 ++--
.../planner/AggregateDistinctPlannerTest.java | 4 +-
.../sql/engine/planner/AggregatePlannerTest.java | 20 +++---
.../CorrelatedNestedLoopJoinPlannerTest.java | 12 ++--
.../engine/planner/HashAggregatePlannerTest.java | 8 +--
.../engine/planner/HashIndexSpoolPlannerTest.java | 18 ++----
.../internal/sql/engine/planner/PlannerTest.java | 75 +++++++++++-----------
.../engine/planner/SortAggregatePlannerTest.java | 16 ++---
.../planner/SortedIndexSpoolPlannerTest.java | 12 ++--
.../sql/engine/planner/TableSpoolPlannerTest.java | 8 +--
.../sql/engine/planner/UnionPlannerTest.java | 12 ++--
19 files changed, 137 insertions(+), 167 deletions(-)
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index 7e981e6849..18f98dddfd 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -713,7 +713,7 @@ public class ItIgniteNodeRestartTest extends
IgniteAbstractTest {
* Starts two nodes and checks that the data are storing through restarts.
Nodes restart in reverse order when they started at first.
*/
@Test
- @Disabled("https://issues.apache.org/jira/browse/IGNITE-17986";)
+ @Disabled("https://issues.apache.org/jira/browse/IGNITE-18044";)
public void testTwoNodesRestartReverse() {
twoNodesRestart(false);
}
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 1b98bca14c..0ce7773d9e 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
@@ -561,9 +561,7 @@ public class SqlQueryProcessor implements QueryProcessor {
private abstract static class AbstractTableEventListener implements
EventListener<TableEventParameters> {
protected final SqlSchemaManagerImpl schemaHolder;
- private AbstractTableEventListener(
- SqlSchemaManagerImpl schemaHolder
- ) {
+ private AbstractTableEventListener(SqlSchemaManagerImpl schemaHolder) {
this.schemaHolder = schemaHolder;
}
}
@@ -577,9 +575,7 @@ public class SqlQueryProcessor implements QueryProcessor {
}
private static class TableCreatedListener extends
AbstractTableEventListener {
- private TableCreatedListener(
- SqlSchemaManagerImpl schemaHolder
- ) {
+ private TableCreatedListener(SqlSchemaManagerImpl schemaHolder) {
super(schemaHolder);
}
@@ -597,9 +593,7 @@ public class SqlQueryProcessor implements QueryProcessor {
}
private static class TableUpdatedListener extends
AbstractTableEventListener {
- private TableUpdatedListener(
- SqlSchemaManagerImpl schemaHolder
- ) {
+ private TableUpdatedListener(SqlSchemaManagerImpl schemaHolder) {
super(schemaHolder);
}
@@ -617,9 +611,7 @@ public class SqlQueryProcessor implements QueryProcessor {
}
private static class TableDroppedListener extends
AbstractTableEventListener {
- private TableDroppedListener(
- SqlSchemaManagerImpl schemaHolder
- ) {
+ private TableDroppedListener(SqlSchemaManagerImpl schemaHolder) {
super(schemaHolder);
}
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchema.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchema.java
index 3c35f6c671..d15127a78e 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchema.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchema.java
@@ -76,11 +76,10 @@ public class IgniteSchema extends AbstractSchema {
/**
* Add table.
*
- * @param tblName Table name.
* @param tbl Table.
*/
- public void addTable(String tblName, InternalIgniteTable tbl) {
- tblMap.put(tblName, tbl);
+ public void addTable(InternalIgniteTable tbl) {
+ tblMap.put(tbl.name(), tbl);
}
/**
@@ -90,10 +89,6 @@ public class IgniteSchema extends AbstractSchema {
*/
public void removeTable(String tblName) {
InternalIgniteTable rmv = (InternalIgniteTable) tblMap.remove(tblName);
-
- // TODO: https://issues.apache.org/jira/browse/IGNITE-17474
- // Decouple tables and indices.
- idxMap.values().removeIf(idx ->
idx.index().tableId().equals(rmv.id()));
}
/**
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTable.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTable.java
index 378076462f..c4a7e45bf4 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTable.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTable.java
@@ -55,6 +55,13 @@ public interface IgniteTable extends TranslatableTable,
Wrapper {
*/
int version();
+ /**
+ * Gets a name of the table.
+ *
+ * @return Table name.
+ */
+ String name();
+
/**
* Returns a descriptor of the table.
*
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTableImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTableImpl.java
index 6a2125a374..8993cf29bc 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTableImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteTableImpl.java
@@ -147,6 +147,12 @@ public class IgniteTableImpl extends AbstractTable
implements InternalIgniteTabl
return ver;
}
+ /** {@inheritDoc} */
+ @Override
+ public String name() {
+ return table().name();
+ }
+
/** {@inheritDoc} */
@Override
public RelDataType getRowType(RelDataTypeFactory typeFactory,
ImmutableBitSet requiredColumns) {
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
index 9b6854ef01..fa15bd3d5c 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
@@ -32,7 +32,6 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
@@ -241,7 +240,7 @@ public class SqlSchemaManagerImpl implements
SqlSchemaManager {
});
}))
.thenCombine(igniteTableFuture, (v, igniteTable) -> {
- schema.addTable(table.name(), igniteTable);
+ schema.addTable(igniteTable);
return res;
});
@@ -430,10 +429,8 @@ public class SqlSchemaManagerImpl implements
SqlSchemaManager {
return
CompletableFuture.completedFuture(resIdxs);
})
).thenCompose(ignore -> {
- String tblName = tableNameById(schema,
index.tableId());
-
table.addIndex(schemaIndex);
- schema.addTable(tblName, table);
+ schema.addTable(table);
schema.addIndex(index.id(), schemaIndex);
return completedFuture(resTbls);
@@ -448,16 +445,6 @@ public class SqlSchemaManagerImpl implements
SqlSchemaManager {
}
}
- private static String tableNameById(IgniteSchema schema, UUID tableId) {
- return schema.getTableMap()
- .entrySet()
- .stream()
- .filter(entry -> tableId
- .equals(((InternalIgniteTable) entry.getValue()).id()))
- .map(Entry::getKey)
- .findFirst().get();
- }
-
/**
* Index dropped callback method deregisters index from Calcite schema.
*
@@ -492,10 +479,14 @@ public class SqlSchemaManagerImpl implements
SqlSchemaManager {
Map<UUID, InternalIgniteTable> resTbls = new
HashMap<>(tables);
- InternalIgniteTable table =
resTbls.compute(rmvIndex.index().tableId(),
+ InternalIgniteTable table =
resTbls.computeIfPresent(rmvIndex.index().tableId(),
(k, v) ->
IgniteTableImpl.copyOf((IgniteTableImpl) v));
- table.removeIndex(rmvIndex.name());
+ if (table != null) {
+ table.removeIndex(rmvIndex.name());
+ } else {
+ return completedFuture(resTbls);
+ }
return indicesVv.update(causalityToken,
(indices, idxEx) -> inBusyLock(busyLock, () -> {
if (idxEx != null) {
@@ -508,8 +499,7 @@ public class SqlSchemaManagerImpl implements
SqlSchemaManager {
assert
table.id().equals(rmvIdx.index().tableId());
- String tblName =
tableNameById(schema, rmvIdx.index().tableId());
- schema.addTable(tblName, table);
+ schema.addTable(table);
return completedFuture(resIdxs);
}
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
index af50e42db5..d525384dfa 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
@@ -163,10 +163,9 @@ public class SqlSchemaManagerTest {
@Test
public void testTableEventIsProcessedRequiredVersionIsSame() {
- when(table.name()).thenReturn("PUBLIC.T");
-
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
+ when(mock.name()).thenReturn("PUBLIC.T");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);
@@ -186,10 +185,9 @@ public class SqlSchemaManagerTest {
@Test
public void testTableEventIsProcessedRequiredVersionIsLess() {
- when(table.name()).thenReturn("PUBLIC.T");
-
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
+ when(mock.name()).thenReturn("PUBLIC.T\"");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);
@@ -210,10 +208,10 @@ public class SqlSchemaManagerTest {
@Test
public void testTableEventIsProcessedRequiredVersionIsGreater() throws
NodeStoppingException {
when(table.schemaView()).thenReturn(schemaRegistry);
- when(table.name()).thenReturn("PUBLIC.T");
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
+ when(mock.name()).thenReturn("PUBLIC.T");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);
@@ -244,6 +242,7 @@ public class SqlSchemaManagerTest {
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
+ when(mock.name()).thenReturn("T");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);
@@ -267,11 +266,11 @@ public class SqlSchemaManagerTest {
}
@Test
- public void testIndexEventHandler() throws Exception {
+ public void testIndexEventHandler() {
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
+ when(mock.name()).thenReturn("T");
- when(table.name()).thenReturn("T");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);
when(schemaRegistry.lastSchemaVersion()).thenReturn(schemaDescriptor.version());
@@ -317,8 +316,8 @@ public class SqlSchemaManagerTest {
public void testIndexEventsProcessed() throws Exception {
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
+ when(mock.name()).thenReturn("T");
- when(table.name()).thenReturn("T");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);
when(schemaRegistry.lastSchemaVersion()).thenReturn(schemaDescriptor.version());
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java
index 0539ea5e1f..a684456741 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AbstractAggregatePlannerTest.java
@@ -22,20 +22,18 @@ 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.jetbrains.annotations.NotNull;
/**
- * AbstractAggregatePlannerTest.
- * TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859
+ * Base class for further planner test implementations.
*/
public class AbstractAggregatePlannerTest extends AbstractPlannerTest {
/**
- * CreateBroadcastTable.
+ * Creates table with broadcast distribution.
*
- * @return REPLICATED test table (ID, VAL0, VAL1, GRP0, GRP1)
+ * @param tblName Table name.
+ * @return Table instance with broadcast distribution and multiple
predefined columns.
*/
- @NotNull
- protected TestTable createBroadcastTable() {
+ protected TestTable createBroadcastTable(String tblName) {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
TestTable tbl = new TestTable(
@@ -45,7 +43,7 @@ public class AbstractAggregatePlannerTest extends
AbstractPlannerTest {
.add("VAL1", f.createJavaType(Integer.class))
.add("GRP0", f.createJavaType(Integer.class))
.add("GRP1", f.createJavaType(Integer.class))
- .build()) {
+ .build(), tblName) {
@Override
public IgniteDistribution distribution() {
@@ -56,13 +54,12 @@ public class AbstractAggregatePlannerTest extends
AbstractPlannerTest {
}
/**
- * CreateAffinityTable.
- * TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859
+ * Creates table with specified affinity distribution.
*
- * @return PARTITIONED test table (ID, VAL0, VAL1, GRP0, GRP1)
+ * @param tblName Table name.
+ * @return Table instance with specified affinity distribution and
multiple predefined columns.
*/
- @NotNull
- protected AbstractPlannerTest.TestTable createAffinityTable() {
+ protected AbstractPlannerTest.TestTable createAffinityTable(String
tblName) {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
return new TestTable(
@@ -72,7 +69,7 @@ public class AbstractAggregatePlannerTest extends
AbstractPlannerTest {
.add("VAL1", f.createJavaType(Integer.class))
.add("GRP0", f.createJavaType(Integer.class))
.add("GRP1", f.createJavaType(Integer.class))
- .build()) {
+ .build(), tblName) {
@Override
public IgniteDistribution distribution() {
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 d32f429270..e483175010 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
@@ -405,7 +405,7 @@ public abstract class AbstractPlannerTest extends
IgniteAbstractTest {
}
};
- schema.addTable(name, table);
+ schema.addTable(table);
}
/**
@@ -422,7 +422,7 @@ public abstract class AbstractPlannerTest extends
IgniteAbstractTest {
protected static TestTable createTable(IgniteSchema schema, String name,
IgniteDistribution distr, Object... fields) {
TestTable tbl = createTable(name, DEFAULT_TBL_SIZE, distr, fields);
- schema.addTable(name, tbl);
+ schema.addTable(tbl);
return tbl;
}
@@ -630,7 +630,7 @@ public abstract class AbstractPlannerTest extends
IgniteAbstractTest {
IgniteSchema schema = new IgniteSchema("PUBLIC");
for (TestTable tbl : tbls) {
- schema.addTable(tbl.name(), tbl);
+ schema.addTable(tbl);
}
return schema;
@@ -960,9 +960,8 @@ public abstract class AbstractPlannerTest extends
IgniteAbstractTest {
throw new AssertionError();
}
- /**
- * Get name.
- */
+ /** {@inheritDoc} */
+ @Override
public String name() {
return name;
}
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregateDistinctPlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregateDistinctPlannerTest.java
index f474cccc4f..bc0118fa8f 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregateDistinctPlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregateDistinctPlannerTest.java
@@ -53,11 +53,11 @@ public class AggregateDistinctPlannerTest extends
AbstractAggregatePlannerTest {
@ParameterizedTest
@EnumSource
public void mapReduceDistinctWithIndex(AggregateAlgorithm algo) throws
Exception {
- TestTable tbl = createAffinityTable().addIndex("val0_val1", 1, 2);
+ TestTable tbl = createAffinityTable("TEST").addIndex("val0_val1", 1,
2);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT DISTINCT val0, val1 FROM test";
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
index 4bf5f6b409..45abe1e4de 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
@@ -73,11 +73,11 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
@ParameterizedTest
@EnumSource
public void singleWithoutIndex(AggregateAlgorithm algo) throws Exception {
- TestTable tbl = createBroadcastTable().addIndex("val0_val1", 1, 2);
+ TestTable tbl = createBroadcastTable("TEST").addIndex("val0_val1", 1,
2);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT AVG(val0) FROM test GROUP BY grp0";
@@ -110,11 +110,11 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
@ParameterizedTest
@EnumSource
public void singleWithIndex(AggregateAlgorithm algo) throws Exception {
- TestTable tbl = createBroadcastTable().addIndex("grp0_grp1", 3, 4);
+ TestTable tbl = createBroadcastTable("TEST").addIndex("grp0_grp1", 3,
4);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT AVG(val0) FILTER(WHERE val1 > 10) FROM test GROUP
BY grp0";
@@ -147,11 +147,11 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
@ParameterizedTest
@EnumSource
public void mapReduceGroupBy(AggregateAlgorithm algo) throws Exception {
- TestTable tbl = createAffinityTable();
+ TestTable tbl = createAffinityTable("TEST");
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT AVG(val0) FILTER (WHERE val1 > 10) FROM test
GROUP BY grp1, grp0";
@@ -190,11 +190,11 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
@ParameterizedTest
@EnumSource
public void distribution(AggregateAlgorithm algo) throws Exception {
- TestTable tbl = createAffinityTable().addIndex("grp0", 3);
+ TestTable tbl = createAffinityTable("TEST").addIndex("grp0", 3);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT AVG(val0), grp0 FROM TEST GROUP BY grp0 UNION ALL
SELECT val0, grp0 FROM test";
@@ -230,13 +230,13 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
@ParameterizedTest
@EnumSource
public void expandDistinctAggregates(AggregateAlgorithm algo) throws
Exception {
- TestTable tbl = createAffinityTable()
+ TestTable tbl = createAffinityTable("TEST")
.addIndex("idx_val0", 3, 1, 0)
.addIndex("idx_val1", 3, 2, 0);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT "
+ "/*+ EXPAND_DISTINCT_AGG */ "
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 56b0f66cf1..ae54c60774 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
@@ -51,13 +51,12 @@ public class CorrelatedNestedLoopJoinPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -67,13 +66,12 @@ public class CorrelatedNestedLoopJoinPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
@@ -118,13 +116,12 @@ public class CorrelatedNestedLoopJoinPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -135,13 +132,12 @@ public class CorrelatedNestedLoopJoinPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashAggregatePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashAggregatePlannerTest.java
index 6b58859ee4..f51674c6eb 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashAggregatePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/HashAggregatePlannerTest.java
@@ -56,7 +56,7 @@ public class HashAggregatePlannerTest extends
AbstractAggregatePlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("SALARY", f.createJavaType(Double.class))
- .build()) {
+ .build(), "EMPS") {
@Override
public IgniteDistribution distribution() {
@@ -66,7 +66,7 @@ public class HashAggregatePlannerTest extends
AbstractAggregatePlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("EMPS", employer);
+ publicSchema.addTable(employer);
String sql = "SELECT * FROM emps WHERE emps.salary = (SELECT
AVG(emps.salary) FROM emps)";
@@ -100,11 +100,11 @@ public class HashAggregatePlannerTest extends
AbstractAggregatePlannerTest {
*/
@Test
public void noGroupByAggregate() throws Exception {
- TestTable tbl = createAffinityTable().addIndex("val0_val1", 1, 2);
+ TestTable tbl = createAffinityTable("TEST").addIndex("val0_val1", 1,
2);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sqlCount = "SELECT COUNT(*) FROM test";
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 262a3368ee..9ae4feffed 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
@@ -51,13 +51,12 @@ public class HashIndexSpoolPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -68,13 +67,12 @@ public class HashIndexSpoolPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
@@ -114,14 +112,13 @@ public class HashIndexSpoolPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID0", f.createJavaType(Integer.class))
.add("JID1", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -131,14 +128,13 @@ public class HashIndexSpoolPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID0", f.createJavaType(Integer.class))
.add("JID1", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
@@ -180,13 +176,12 @@ public class HashIndexSpoolPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -196,13 +191,12 @@ public class HashIndexSpoolPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
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 17c75a85cf..4e74979a1b 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
@@ -103,7 +103,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("PROJECTID", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "DEVELOPER") {
@Override
public IgniteIndex getIndex(String idxName) {
throw new AssertionError("Should not be called");
@@ -130,7 +130,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("VER", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "PROJECT") {
@Override public ColocationGroup
colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forAssignments(Arrays.asList(
select(NODES, 0, 1),
@@ -147,8 +147,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("DEVELOPER", developer);
- publicSchema.addTable("PROJECT", project);
+ publicSchema.addTable(developer);
+ publicSchema.addTable(project);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -197,7 +197,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("PROJECTID", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "DEVELOPER") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 0, 1, 2, 3));
@@ -214,7 +214,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("VER", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "PROJECT") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 0, 1, 2, 3));
@@ -227,8 +227,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("DEVELOPER", developer);
- publicSchema.addTable("PROJECT", project);
+ publicSchema.addTable(developer);
+ publicSchema.addTable(project);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -276,7 +276,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("PROJECTID", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "DEVELOPER") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 0));
@@ -293,7 +293,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("VER", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "PROJECT") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forAssignments(Arrays.asList(
@@ -311,8 +311,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("DEVELOPER", developer);
- publicSchema.addTable("PROJECT", project);
+ publicSchema.addTable(developer);
+ publicSchema.addTable(project);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -357,7 +357,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("PROJECTID", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "DEVELOPER") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 1, 2, 3));
@@ -374,7 +374,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("VER", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "PROJECT") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forAssignments(Arrays.asList(
@@ -392,8 +392,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("DEVELOPER", developer);
- publicSchema.addTable("PROJECT", project);
+ publicSchema.addTable(developer);
+ publicSchema.addTable(project);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -441,7 +441,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("PROJECTID", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "DEVELOPER") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 0));
@@ -457,7 +457,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("VER", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "PROJECT") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forAssignments(Arrays.asList(
@@ -475,8 +475,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("DEVELOPER", developer);
- publicSchema.addTable("PROJECT", project);
+ publicSchema.addTable(developer);
+ publicSchema.addTable(project);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -521,7 +521,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("PROJECTID", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "DEVELOPER") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 2));
@@ -538,7 +538,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("VER", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "PROJECT") {
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
return ColocationGroup.forNodes(select(NODES, 0, 1));
@@ -552,8 +552,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("DEVELOPER", developer);
- publicSchema.addTable("PROJECT", project);
+ publicSchema.addTable(developer);
+ publicSchema.addTable(project);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -599,7 +599,7 @@ public class PlannerTest extends AbstractPlannerTest {
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "TEST") {
@Override
public IgniteDistribution distribution() {
return IgniteDistributions.single();
@@ -608,7 +608,7 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", testTbl);
+ publicSchema.addTable(testTbl);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -656,7 +656,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("DEPTNO", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "EMP") {
@Override public IgniteDistribution distribution() {
return IgniteDistributions.broadcast();
@@ -667,7 +667,7 @@ public class PlannerTest extends AbstractPlannerTest {
new RelDataTypeFactory.Builder(f)
.add("DEPTNO", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
- .build()) {
+ .build(), "DEPT") {
@Override
public IgniteDistribution distribution() {
@@ -677,8 +677,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("EMP", emp);
- publicSchema.addTable("DEPT", dept);
+ publicSchema.addTable(emp);
+ publicSchema.addTable(dept);
SchemaPlus schema = createRootSchema(false)
.add("PUBLIC", publicSchema);
@@ -754,7 +754,7 @@ public class PlannerTest extends AbstractPlannerTest {
public void testMergeJoinIsNotAppliedForNonEquiJoin() throws Exception {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
- TestTable emp = new TestTable(
+ TestTable emp = new TestTable("EMP",
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
@@ -769,7 +769,7 @@ public class PlannerTest extends AbstractPlannerTest {
emp.addIndex(new
IgniteIndex(TestSortedIndex.create(RelCollations.of(ImmutableIntList.of(1, 2)),
"emp_idx", emp)));
- TestTable dept = new TestTable(
+ TestTable dept = new TestTable("DEPT",
new RelDataTypeFactory.Builder(f)
.add("DEPTNO", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
@@ -785,8 +785,8 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("EMP", emp);
- publicSchema.addTable("DEPT", dept);
+ publicSchema.addTable(emp);
+ publicSchema.addTable(dept);
String sql = "select d.deptno, d.name, e.id, e.name from dept d join
emp e "
+ "on d.deptno = e.deptno and e.name >= d.name order by
e.name, d.deptno";
@@ -808,12 +808,11 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "TEST",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "TEST") {
@Override
public IgniteDistribution distribution() {
@@ -849,7 +848,7 @@ public class PlannerTest extends AbstractPlannerTest {
.add("COL2", f.createJavaType(String.class))
.add("COL3", f.createJavaType(Integer.class))
.add("COL4", f.createJavaType(Float.class))
- .build()) {
+ .build(), "TAB0") {
@Override public IgniteDistribution distribution() {
return IgniteDistributions.affinity(0, "tab0", "hash");
@@ -862,7 +861,7 @@ public class PlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TAB0", tab0);
+ publicSchema.addTable(tab0);
// just check for planning completeness for finite time.
assertPlan(sql, publicSchema, (k) -> true);
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortAggregatePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortAggregatePlannerTest.java
index 7f761ed72d..f0f1f489ba 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortAggregatePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/SortAggregatePlannerTest.java
@@ -62,11 +62,11 @@ public class SortAggregatePlannerTest extends
AbstractAggregatePlannerTest {
*/
@Test
public void notApplicableForSortAggregate() {
- TestTable tbl = createAffinityTable().addIndex("val0_val1", 1, 2);
+ TestTable tbl = createAffinityTable("TEST").addIndex("val0_val1", 1,
2);
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sqlMin = "SELECT MIN(val0) FROM test";
@@ -87,11 +87,11 @@ public class SortAggregatePlannerTest extends
AbstractAggregatePlannerTest {
public void testNoSortAppendingWithCorrectCollation() throws Exception {
RelFieldCollation coll = new RelFieldCollation(1,
RelFieldCollation.Direction.DESCENDING);
- TestTable tbl = createAffinityTable().addIndex(RelCollations.of(coll),
"val0Idx");
+ TestTable tbl =
createAffinityTable("TEST").addIndex(RelCollations.of(coll), "val0Idx");
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT ID FROM test WHERE VAL0 IN (SELECT VAL0 FROM
test)";
@@ -130,7 +130,7 @@ public class SortAggregatePlannerTest extends
AbstractAggregatePlannerTest {
.add("VAL1", f.createJavaType(Integer.class))
.add("GRP0", f.createJavaType(Integer.class))
.add("GRP1", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "TEST") {
@Override
public IgniteDistribution distribution() {
@@ -141,7 +141,7 @@ public class SortAggregatePlannerTest extends
AbstractAggregatePlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT MIN(val0) FROM test GROUP BY grp1, grp0";
@@ -178,7 +178,7 @@ public class SortAggregatePlannerTest extends
AbstractAggregatePlannerTest {
.add("VAL1", f.createJavaType(Integer.class))
.add("GRP0", f.createJavaType(Integer.class))
.add("GRP1", f.createJavaType(Integer.class))
- .build()) {
+ .build(), "TEST") {
@Override
public IgniteDistribution distribution() {
@@ -189,7 +189,7 @@ public class SortAggregatePlannerTest extends
AbstractAggregatePlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TEST", tbl);
+ publicSchema.addTable(tbl);
String sql = "SELECT MIN(val0) FROM test GROUP BY grp1, grp0";
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 9f2496826a..f9aed43182 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
@@ -58,13 +58,12 @@ public class SortedIndexSpoolPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -75,13 +74,12 @@ public class SortedIndexSpoolPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
@@ -122,14 +120,13 @@ public class SortedIndexSpoolPlannerTest extends
AbstractPlannerTest {
IgniteTypeFactory f = new IgniteTypeFactory(IgniteTypeSystem.INSTANCE);
publicSchema.addTable(
- "T0",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID0", f.createJavaType(Integer.class))
.add("JID1", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -139,14 +136,13 @@ public class SortedIndexSpoolPlannerTest extends
AbstractPlannerTest {
);
publicSchema.addTable(
- "T1",
new TestTable(
new RelDataTypeFactory.Builder(f)
.add("ID", f.createJavaType(Integer.class))
.add("JID0", f.createJavaType(Integer.class))
.add("JID1", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
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 98a0ec0b8b..25935217c2 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
@@ -49,7 +49,7 @@ public class TableSpoolPlannerTest extends
AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T0") {
@Override
public IgniteDistribution distribution() {
@@ -62,7 +62,7 @@ public class TableSpoolPlannerTest extends
AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("JID", f.createJavaType(Integer.class))
.add("VAL", f.createJavaType(String.class))
- .build()) {
+ .build(), "T1") {
@Override
public IgniteDistribution distribution() {
@@ -72,8 +72,8 @@ public class TableSpoolPlannerTest extends
AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("T0", t0);
- publicSchema.addTable("T1", t1);
+ publicSchema.addTable(t0);
+ publicSchema.addTable(t1);
String sql = "select * "
+ "from 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 91dd8f8895..87f4360d74 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
@@ -84,7 +84,7 @@ public class UnionPlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("SALARY", f.createJavaType(Double.class))
- .build()) {
+ .build(), "TABLE1") {
@Override public IgniteDistribution distribution() {
return IgniteDistributions.affinity(0, "Table1", "hash");
@@ -96,7 +96,7 @@ public class UnionPlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("SALARY", f.createJavaType(Double.class))
- .build()) {
+ .build(), "TABLE2") {
@Override public IgniteDistribution distribution() {
return IgniteDistributions.affinity(0, "Table2", "hash");
@@ -108,7 +108,7 @@ public class UnionPlannerTest extends AbstractPlannerTest {
.add("ID", f.createJavaType(Integer.class))
.add("NAME", f.createJavaType(String.class))
.add("SALARY", f.createJavaType(Double.class))
- .build()) {
+ .build(), "TABLE3") {
@Override public IgniteDistribution distribution() {
return IgniteDistributions.affinity(0, "Table3", "hash");
@@ -117,9 +117,9 @@ public class UnionPlannerTest extends AbstractPlannerTest {
IgniteSchema publicSchema = new IgniteSchema("PUBLIC");
- publicSchema.addTable("TABLE1", tbl1);
- publicSchema.addTable("TABLE2", tbl2);
- publicSchema.addTable("TABLE3", tbl3);
+ publicSchema.addTable(tbl1);
+ publicSchema.addTable(tbl2);
+ publicSchema.addTable(tbl3);
return publicSchema;
}
