You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2023/07/25 10:00:23 UTC
[ignite-3] 03/11: Fix dependency resolving in SQL.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-19499
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 5578c092dfb3b5f207fa3d89defd1f4f3a54af9c
Author: amashenkov <an...@gmail.com>
AuthorDate: Wed Jul 19 19:08:58 2023 +0300
Fix dependency resolving in SQL.
---
.../apache/ignite/internal/index/IndexManager.java | 2 +-
.../apache/ignite/internal/schema/SchemaManager.java | 12 ++++++------
.../ignite/internal/sql/engine/SqlQueryProcessor.java | 1 -
.../sql/engine/exec/ExecutionServiceImpl.java | 19 ++++++++++++++-----
.../sql/engine/prepare/MappingQueryContext.java | 10 +++++++++-
.../internal/sql/engine/schema/IgniteSchemaTable.java | 2 +-
.../sql/engine/exec/ExecutionServiceImplTest.java | 3 ++-
.../internal/sql/engine/framework/TestNode.java | 4 ++--
.../internal/sql/engine/planner/PlannerTest.java | 2 +-
.../internal/table/distributed/TableManager.java | 9 ++++-----
10 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
index 555e05de18..89fee4b074 100644
--- a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
+++ b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
@@ -308,7 +308,7 @@ public class IndexManager extends Producer<IndexEvent, IndexEventParameters> imp
}
});
- return createIndexFuture;
+ return createIndexFuture;
}
/**
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
index d61c9389cd..92f6090456 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
@@ -118,7 +118,7 @@ public class SchemaManager extends Producer<SchemaEvent, SchemaEventParameters>
private CompletableFuture<?> onSchemaChange(CreateTableEventParameters evt) {
CatalogTableDescriptor tableDescriptor = evt.tableDescriptor();
- int newSchemaVersion = INITIAL_SCHEMA_VERSION;// evt.catalogVersion();
+ int newSchemaVersion = INITIAL_SCHEMA_VERSION; // evt.catalogVersion();
int tblId = tableDescriptor.id();
SchemaDescriptor newSchema = CatalogDescriptorUtils.convert(newSchemaVersion, tableDescriptor);
@@ -193,8 +193,8 @@ public class SchemaManager extends Producer<SchemaEvent, SchemaEventParameters>
);
}
- return registerSchema(registries, tblId, newSchema);
- }));
+ return registerSchema(registries, tblId, newSchema);
+ }));
} finally {
busyLock.leaveBusy();
}
@@ -354,11 +354,11 @@ public class SchemaManager extends Producer<SchemaEvent, SchemaEventParameters>
* Gets a schema descriptor from the configuration storage.
*
* @param schemaVer Schema version.
- * @param tblId
+ * @param tableId Table id.
* @return Schema descriptor.
*/
- private CompletableFuture<SchemaDescriptor> getSchemaDescriptor(int schemaVer, Integer tblId) {
- CompletableFuture<Entry> ent = metastorageMgr.get(schemaWithVerHistKey(tblId, schemaVer));
+ private CompletableFuture<SchemaDescriptor> getSchemaDescriptor(int schemaVer, int tableId) {
+ CompletableFuture<Entry> ent = metastorageMgr.get(schemaWithVerHistKey(tableId, schemaVer));
return ent.thenApply(e -> SchemaSerializerImpl.INSTANCE.deserialize(e.value()));
}
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 010e7b1e4d..6d5cd4c58a 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
@@ -40,7 +40,6 @@ import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.tools.Frameworks;
import org.apache.calcite.util.Pair;
import org.apache.ignite.internal.catalog.CatalogManager;
-import org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.index.IndexManager;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImpl.java
index ea12b0a4e0..3cf9154624 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImpl.java
@@ -85,6 +85,7 @@ 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.HashFunctionFactoryImpl;
import org.apache.ignite.internal.sql.engine.util.TypeUtils;
+import org.apache.ignite.internal.table.distributed.TableManager;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.internal.util.ExceptionUtils;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -128,6 +129,8 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
private final ExecutionDependencyResolver dependencyResolver;
+ private final TableManager tableManager;
+
private final ImplementorFactory<RowT> implementorFactory;
private final Map<UUID, DistributedQueryManager> queryManagerMap = new ConcurrentHashMap<>();
@@ -135,6 +138,7 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
/**
* Creates the execution services.
*
+ * @param <RowT> Type of the sql row.
* @param topSrvc Topology service.
* @param msgSrvc Message service.
* @param sqlSchemaManager Schema manager.
@@ -143,7 +147,7 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
* @param handler Row handler.
* @param mailboxRegistry Mailbox registry.
* @param exchangeSrvc Exchange service.
- * @param <RowT> Type of the sql row.
+ * @param tableManager Table Manager.
* @return An execution service.
*/
public static <RowT> ExecutionServiceImpl<RowT> create(
@@ -155,7 +159,8 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
RowHandler<RowT> handler,
MailboxRegistry mailboxRegistry,
ExchangeService exchangeSrvc,
- ExecutionDependencyResolver dependencyResolver
+ ExecutionDependencyResolver dependencyResolver,
+ TableManager tableManager
) {
return new ExecutionServiceImpl<>(
msgSrvc,
@@ -171,7 +176,8 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
new HashFunctionFactoryImpl<>(sqlSchemaManager, handler),
mailboxRegistry,
exchangeSrvc,
- deps)
+ deps),
+ tableManager
);
}
@@ -186,6 +192,7 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
* @param taskExecutor Task executor.
* @param handler Row handler.
* @param implementorFactory Relational node implementor factory.
+ * @param tableManager Table manager.
*/
public ExecutionServiceImpl(
MessageService messageService,
@@ -196,7 +203,8 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
QueryTaskExecutor taskExecutor,
RowHandler<RowT> handler,
ExecutionDependencyResolver dependencyResolver,
- ImplementorFactory<RowT> implementorFactory
+ ImplementorFactory<RowT> implementorFactory,
+ TableManager tableManager
) {
this.localNode = topSrvc.localMember();
this.handler = handler;
@@ -208,6 +216,7 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
this.ddlCmdHnd = ddlCmdHnd;
this.dependencyResolver = dependencyResolver;
this.implementorFactory = implementorFactory;
+ this.tableManager = tableManager;
}
/** {@inheritDoc} */
@@ -639,7 +648,7 @@ public class ExecutionServiceImpl<RowT> implements ExecutionService, TopologyEve
private AsyncCursor<List<Object>> execute(InternalTransaction tx, MultiStepPlan plan) {
taskExecutor.execute(() -> {
try {
- plan.init(new MappingQueryContext(localNode.name(), mappingSrvc));
+ plan.init(new MappingQueryContext(localNode.name(), mappingSrvc, tableManager));
List<Fragment> fragments = plan.fragments();
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/MappingQueryContext.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/MappingQueryContext.java
index d1ebb46fad..da7658b596 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/MappingQueryContext.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/MappingQueryContext.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.sql.engine.metadata.IgniteMetadata;
import org.apache.ignite.internal.sql.engine.metadata.MappingService;
import org.apache.ignite.internal.sql.engine.metadata.RelMetadataQueryEx;
import org.apache.ignite.internal.sql.engine.util.Commons;
+import org.apache.ignite.internal.table.distributed.TableManager;
/**
* Query mapping context.
@@ -30,6 +31,7 @@ import org.apache.ignite.internal.sql.engine.util.Commons;
public class MappingQueryContext {
private final String locNodeName;
private final MappingService mappingService;
+ private final TableManager tableManager;
private RelOptCluster cluster;
@@ -41,10 +43,12 @@ public class MappingQueryContext {
*/
public MappingQueryContext(
String locNodeName,
- MappingService mappingService
+ MappingService mappingService,
+ TableManager tableManager
) {
this.locNodeName = locNodeName;
this.mappingService = mappingService;
+ this.tableManager = tableManager;
}
/** Creates a cluster. */
@@ -66,4 +70,8 @@ public class MappingQueryContext {
public MappingService mappingService() {
return mappingService;
}
+
+ public TableManager tableManager() {
+ return tableManager;
+ }
}
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchemaTable.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchemaTable.java
index 4181054e0d..e6d34557e7 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchemaTable.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteSchemaTable.java
@@ -193,7 +193,7 @@ public final class IgniteSchemaTable extends AbstractTable implements IgniteTabl
/** {@inheritDoc} */
@Override
public ColocationGroup colocationGroup(MappingQueryContext ctx) {
- throw new UnsupportedOperationException("Execution related methods are not available.");
+ return IgniteTableImpl.partitionedGroup(ctx.tableManager().getTable(id).internalTable()).get();
}
/** {@inheritDoc} */
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
index d865f11f61..bbe6f06d2b 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutionServiceImplTest.java
@@ -613,7 +613,8 @@ public class ExecutionServiceImplTest {
taskExecutor,
ArrayRowHandler.INSTANCE,
dependencyResolver,
- (ctx, deps) -> node.implementor(ctx, mailboxRegistry, exchangeService, deps)
+ (ctx, deps) -> node.implementor(ctx, mailboxRegistry, exchangeService, deps),
+ null
);
taskExecutor.start();
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
index 934d30d4c7..632ee782a8 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
@@ -150,8 +150,8 @@ public class TestNode implements LifecycleAware {
return new ScanNode<>(ctx, dataProvider);
}
- }
- ));
+ },
+ null));
parserService = new ParserServiceImpl(0, EmptyCacheFactory.INSTANCE);
}
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 2f887ffb83..3499c20e0b 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
@@ -915,6 +915,6 @@ public class PlannerTest extends AbstractPlannerTest {
private static MappingQueryContext mapContext(String locNodeName,
MappingService mappingService) {
- return new MappingQueryContext(locNodeName, mappingService);
+ return new MappingQueryContext(locNodeName, mappingService, null);
}
}
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index f0b9b39f7b..697b7933bf 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -203,7 +203,6 @@ import org.apache.ignite.lang.DistributionZoneNotFoundException;
import org.apache.ignite.lang.IgniteException;
import org.apache.ignite.lang.IgniteExceptionUtils;
import org.apache.ignite.lang.IgniteInternalException;
-import org.apache.ignite.lang.IgniteStringFormatter;
import org.apache.ignite.lang.IgniteSystemProperties;
import org.apache.ignite.lang.NodeStoppingException;
import org.apache.ignite.lang.TableAlreadyExistsException;
@@ -1293,10 +1292,9 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
// We use the event notification future as the result so that dependent components can complete the schema updates.
// TODO: https://issues.apache.org/jira/browse/IGNITE-19913 Possible performance degradation.
- CompletableFuture<?> eventFut = fireEvent(TableEvent.CREATE, new TableEventParameters(causalityToken, tableId));
+ fireEvent(TableEvent.CREATE, new TableEventParameters(causalityToken, tableId));
- // TODO: investigate why createParts and eventFutures hangs.
-// return allOf(createPartsFut, eventFut);
+ // TODO: investigate why createParts hangs.
return completedFuture(false);
}
@@ -2890,7 +2888,8 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
}
if (primaryCols.contains(colName)) {
- throw new SqlException(STMT_VALIDATION_ERR, format("Can`t delete column, belongs to primary key: [name={}]", colName));
+ throw new SqlException(STMT_VALIDATION_ERR,
+ format("Can`t delete column, belongs to primary key: [name={}]", colName));
}
}