This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 69b65cb061ef3a0cd68efcb83415c7f640646d8a
Author: Kirill Tkalenko <tkalkir...@yandex.ru>
AuthorDate: Tue Aug 29 15:10:36 2023 +0300
catalog-feature after ai-merge
---
...butionZoneManagerLogicalTopologyEventsTest.java | 2 +-
.../ignite/internal/table/ItRoReadsTest.java | 8 +-
.../internal/sql/engine/SqlQueryProcessor.java | 109 +--------------------
.../table/distributed/TableManagerTest.java | 1 -
4 files changed, 9 insertions(+), 111 deletions(-)
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
index 009d7dac36..9f58aca736 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/DistributionZoneManagerLogicalTopologyEventsTest.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.distributionzones;
+import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAME;
import static
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl.LOGICAL_TOPOLOGY_KEY;
-import static
org.apache.ignite.internal.distributionzones.DistributionZoneManager.DEFAULT_ZONE_NAME;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertDataNodesForZone;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertLogicalTopology;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.assertLogicalTopologyVersion;
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
index 0cf52ecb97..d981474209 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItRoReadsTest.java
@@ -541,7 +541,13 @@ public class ItRoReadsTest extends BaseIgniteAbstractTest {
try {
var context = QueryContext.create(SqlQueryType.ALL);
- CompletableFuture<AsyncSqlCursor<List<Object>>> queryFuture =
queryEngine.querySingleAsync(sessionId, context, sql, args);
+ CompletableFuture<AsyncSqlCursor<List<Object>>> queryFuture =
queryEngine.querySingleAsync(
+ sessionId,
+ context,
+ node().transactions(),
+ sql,
+ args
+ );
assertThat(queryFuture, willCompleteSuccessfully());
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 ac63f66327..ca0c8c6b5e 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
@@ -101,7 +101,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
/**
- * SqlQueryProcessor.
+ * SqlQueryProcessor.
* TODO Documentation https://issues.apache.org/jira/browse/IGNITE-15859
*/
public class SqlQueryProcessor implements QueryProcessor {
@@ -510,113 +510,6 @@ public class SqlQueryProcessor implements QueryProcessor {
return metricManager;
}
- private abstract static class AbstractTableEventListener implements
EventListener<TableEventParameters> {
- protected final SqlSchemaManagerImpl schemaHolder;
-
- private AbstractTableEventListener(SqlSchemaManagerImpl schemaHolder) {
- this.schemaHolder = schemaHolder;
- }
- }
-
- private abstract static class AbstractIndexEventListener implements
EventListener<IndexEventParameters> {
- protected final SqlSchemaManagerImpl schemaHolder;
-
- private AbstractIndexEventListener(SqlSchemaManagerImpl schemaHolder) {
- this.schemaHolder = schemaHolder;
- }
- }
-
- private static class TableCreatedListener extends
AbstractTableEventListener {
- private TableCreatedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(TableEventParameters
parameters, @Nullable Throwable exception) {
- return schemaHolder.onTableCreated(
- // TODO:
https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class TableUpdatedListener extends
AbstractTableEventListener {
- private TableUpdatedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(TableEventParameters
parameters, @Nullable Throwable exception) {
- return schemaHolder.onTableUpdated(
- // TODO:
https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class TableDroppedListener extends
AbstractTableEventListener {
- private TableDroppedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(TableEventParameters
parameters, @Nullable Throwable exception) {
- return schemaHolder.onTableDropped(
- // TODO:
https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class IndexDroppedListener extends
AbstractIndexEventListener {
- private IndexDroppedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(IndexEventParameters
parameters, @Nullable Throwable exception) {
- return schemaHolder.onIndexDropped(
- // TODO:
https://issues.apache.org/jira/browse/IGNITE-17694 Hardcoded schemas
- DEFAULT_SCHEMA_NAME,
- parameters.tableId(),
- parameters.indexId(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
- private static class IndexCreatedListener extends
AbstractIndexEventListener {
- private IndexCreatedListener(SqlSchemaManagerImpl schemaHolder) {
- super(schemaHolder);
- }
-
- /** {@inheritDoc} */
- @Override
- public CompletableFuture<Boolean> notify(IndexEventParameters
parameters, @Nullable Throwable exception) {
- return schemaHolder.onIndexCreated(
- parameters.tableId(),
- parameters.indexId(),
- parameters.indexDescriptor(),
- parameters.causalityToken()
- )
- .thenApply(v -> false);
- }
- }
-
/** Performs additional validation of a parsed statement. **/
private static void validateParsedStatement(
QueryContext context,
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index 92f92345af..5883804874 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
@@ -62,7 +62,6 @@ import java.util.function.LongFunction;
import org.apache.ignite.configuration.NamedListView;
import org.apache.ignite.internal.affinity.AffinityUtils;
import org.apache.ignite.internal.baseline.BaselineManager;
-import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.CatalogTestUtils;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
