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 2025/02/21 15:54:55 UTC
(ignite-3) branch ignite-24551 updated (df973a36901 -> 55752d7bcc0)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-24551
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
omit df973a36901 wip
add c02c50ed595 IGNITE-24341 Sql. System views. Add ordinal column to table_columns (#5257)
new dce57aa73cd Fix system views columns names.
new 55752d7bcc0 Fix system-views registration
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (df973a36901)
\
N -- N -- N refs/heads/ignite-24551 (55752d7bcc0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../compaction/ItCatalogCompactionTest.java | 3 -
.../systemviews/TablesSystemViewProvider.java | 22 +-
.../systemviews/ZonesSystemViewProvider.java | 2 +-
.../rest/sql/ItSqlQueryControllerTest.java | 9 -
.../transaction/ItTransactionControllerTest.java | 9 -
.../org/apache/ignite/internal/app/IgniteImpl.java | 1 +
.../sql/engine/BaseSqlMultiStatementTest.java | 6 +-
.../sql/engine/kill/ItSqlKillCommandTest.java | 2 +-
.../{ => systemviews}/ItComputeSystemViewTest.java | 2 +-
.../{ => systemviews}/ItIndexesSystemViewTest.java | 61 +++++-
.../{ => systemviews}/ItLocksSystemViewTest.java | 5 +-
.../{ => systemviews}/ItSchemasSystemViewTest.java | 5 +-
.../ItSqlQueriesSystemViewTest.java | 22 +-
.../{ => systemviews}/ItSystemViewsTest.java | 49 +++--
.../engine/systemviews/ItTablesSystemViewTest.java | 236 +++++++++++++++++++++
.../ItTransactionsSystemViewTest.java | 21 +-
.../{ => systemviews}/ItZonesSystemViewTest.java | 81 ++++++-
.../disaster/ItDisasterRecoverySystemViewTest.java | 6 -
18 files changed, 444 insertions(+), 98 deletions(-)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItComputeSystemViewTest.java (99%)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItIndexesSystemViewTest.java (60%)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItLocksSystemViewTest.java (95%)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItSchemasSystemViewTest.java (96%)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItSqlQueriesSystemViewTest.java (96%)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItSystemViewsTest.java (79%)
create mode 100644 modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItTransactionsSystemViewTest.java (90%)
rename modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/{ => systemviews}/ItZonesSystemViewTest.java (73%)
(ignite-3) 01/02: Fix system views columns names.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-24551
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit dce57aa73cd5fa03609cf3331a81b083546765ab
Author: amashenkov <am...@apache.org>
AuthorDate: Fri Feb 21 17:25:05 2025 +0300
Fix system views columns names.
---
.../systemviews/SystemViewViewProvider.java | 13 +++-
.../systemviews/TablesSystemViewProvider.java | 24 ++++++--
.../systemviews/ZonesSystemViewProvider.java | 6 +-
.../systemviews/ItIndexesSystemViewTest.java | 56 +++++++++++++++++
.../systemviews/ItSqlQueriesSystemViewTest.java | 13 ++--
.../sql/engine/systemviews/ItSystemViewsTest.java | 36 +++++++++--
.../engine/systemviews/ItTablesSystemViewTest.java | 62 +++++++++++++++++--
.../engine/systemviews/ItZonesSystemViewTest.java | 72 +++++++++++++++++++++-
8 files changed, 255 insertions(+), 27 deletions(-)
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/SystemViewViewProvider.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/SystemViewViewProvider.java
index 9390d0c4ef6..a00e36920d7 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/SystemViewViewProvider.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/SystemViewViewProvider.java
@@ -69,10 +69,16 @@ public class SystemViewViewProvider implements CatalogSystemViewProvider {
return SystemViews.<ViewWithSchema>clusterViewBuilder()
.name("SYSTEM_VIEWS")
+ .addColumn("VIEW_ID", INT32, entry -> entry.descriptor.id())
+ .addColumn("SCHEMA_NAME", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.schema)
+ .addColumn("VIEW_NAME", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.name())
+ .addColumn("TYPE", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.systemViewType().name())
+ // TODO https://issues.apache.org/jira/browse/IGNITE-24589: Next columns are deprecated and should be removed.
+ // They are kept for compatibility with 3.0 version, to allow columns being found by their old names.
.addColumn("ID", INT32, entry -> entry.descriptor.id())
.addColumn("SCHEMA", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.schema)
.addColumn("NAME", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.name())
- .addColumn("TYPE", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.systemViewType().name())
+ // End of legacy columns list. New columns must be added below this line.
.dataProvider(viewDataPublisher)
.build();
}
@@ -94,12 +100,15 @@ public class SystemViewViewProvider implements CatalogSystemViewProvider {
return SystemViews.<ColumnWithTableId>clusterViewBuilder()
.name("SYSTEM_VIEW_COLUMNS")
.addColumn("VIEW_ID", INT32, entry -> entry.id)
- .addColumn("NAME", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.name())
+ .addColumn("VIEW_NAME", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.name())
.addColumn("TYPE", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.type().name())
.addColumn("NULLABLE", BOOLEAN, entry -> entry.descriptor.nullable())
.addColumn("PRECISION", INT32, entry -> entry.descriptor.precision())
.addColumn("SCALE", INT32, entry -> entry.descriptor.scale())
.addColumn("LENGTH", INT32, entry -> entry.descriptor.length())
+ // TODO https://issues.apache.org/jira/browse/IGNITE-24589: Next column is deprecated and should be removed.
+ // It is kept for compatibility with 3.0 version, to allow column being found by it's old names.
+ .addColumn("NAME", stringOf(SYSTEM_VIEW_STRING_COLUMN_LENGTH), entry -> entry.descriptor.name())
.dataProvider(viewDataPublisher)
.build();
}
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java
index feb0acd024a..98290055ffa 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java
@@ -66,13 +66,22 @@ public class TablesSystemViewProvider implements CatalogSystemViewProvider {
return SystemViews.<TableWithSchemaAndZoneName>clusterViewBuilder()
.name("TABLES")
+ .addColumn("SCHEMA_NAME", STRING, entry -> entry.schemaName)
+ .addColumn("TABLE_NAME", STRING, entry -> entry.table.name())
+ .addColumn("TABLE_ID", INT32, entry -> entry.table.id())
+ .addColumn("PK_INDEX_ID", INT32, entry -> entry.table.primaryKeyIndexId())
+ .addColumn("ZONE_NAME", STRING, entry -> entry.zoneName)
+ .addColumn("STORAGE_PROFILE", STRING, entry -> entry.table.storageProfile())
+ .addColumn("COLOCATION_KEY_INDEX", STRING, entry -> concatColumns(entry.table.colocationColumns()))
+ .addColumn("SCHEMA_ID", INT32, entry -> entry.table.schemaId())
+ .addColumn("ZONE_ID", INT32, entry -> entry.table.zoneId())
+ // TODO https://issues.apache.org/jira/browse/IGNITE-24589: Next columns are deprecated and should be removed.
+ // They are kept for compatibility with 3.0 version, to allow columns being found by their old names.
.addColumn("SCHEMA", STRING, entry -> entry.schemaName)
.addColumn("NAME", STRING, entry -> entry.table.name())
.addColumn("ID", INT32, entry -> entry.table.id())
- .addColumn("PK_INDEX_ID", INT32, entry -> entry.table.primaryKeyIndexId())
.addColumn("ZONE", STRING, entry -> entry.zoneName)
- .addColumn("STORAGE_PROFILE", STRING, entry -> entry.table.storageProfile())
- .addColumn("COLOCATION_KEY_INDEX", STRING, entry -> concatColumns(entry.table.colocationColumns()))
+ // End of legacy columns list. New columns must be added below this line.
.dataProvider(viewDataPublisher)
.build();
}
@@ -106,16 +115,21 @@ public class TablesSystemViewProvider implements CatalogSystemViewProvider {
return SystemViews.<ColumnWithTableId>clusterViewBuilder()
.name("TABLE_COLUMNS")
- .addColumn("SCHEMA", STRING, entry -> entry.schema)
+ .addColumn("SCHEMA_NAME", STRING, entry -> entry.schema)
.addColumn("TABLE_NAME", STRING, entry -> entry.tableName)
.addColumn("TABLE_ID", INT32, entry -> entry.tableId)
.addColumn("COLUMN_NAME", STRING, entry -> entry.descriptor.name())
.addColumn("TYPE", STRING, entry -> entry.descriptor.type().name())
.addColumn("NULLABLE", BOOLEAN, entry -> entry.descriptor.nullable())
- .addColumn("PREC", INT32, entry -> entry.descriptor.precision())
+ .addColumn("PRECISION", INT32, entry -> entry.descriptor.precision())
.addColumn("SCALE", INT32, entry -> entry.descriptor.scale())
.addColumn("LENGTH", INT32, entry -> entry.descriptor.length())
.addColumn("COLUMN_ORDINAL", INT32, entry -> entry.columnOrdinal)
+ // TODO https://issues.apache.org/jira/browse/IGNITE-24589: Next columns are deprecated and should be removed.
+ // They are kept for compatibility with 3.0 version, to allow columns being found by their old names.
+ .addColumn("SCHEMA", STRING, entry -> entry.schema)
+ .addColumn("PREC", INT32, entry -> entry.descriptor.precision())
+ // End of legacy columns list. New columns must be added below this line.
.dataProvider(viewDataPublisher)
.build();
}
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/ZonesSystemViewProvider.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/ZonesSystemViewProvider.java
index 5433fffd068..048d90466b9 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/ZonesSystemViewProvider.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/ZonesSystemViewProvider.java
@@ -51,7 +51,7 @@ public final class ZonesSystemViewProvider implements CatalogSystemViewProvider
private static SystemView<?> getZoneView(Supplier<Catalog> catalogSupplier) {
return SystemViews.<ZoneWithDefaultMarker>clusterViewBuilder()
.name("ZONES")
- .addColumn("NAME", STRING, wrapper -> wrapper.zone.name())
+ .addColumn("ZONE_NAME", STRING, wrapper -> wrapper.zone.name())
.addColumn("PARTITIONS", INT32, wrapper -> wrapper.zone.partitions())
.addColumn("REPLICAS", INT32, wrapper -> wrapper.zone.replicas())
.addColumn("DATA_NODES_AUTO_ADJUST_SCALE_UP", INT32, wrapper -> wrapper.zone.dataNodesAutoAdjustScaleUp())
@@ -59,6 +59,10 @@ public final class ZonesSystemViewProvider implements CatalogSystemViewProvider
.addColumn("DATA_NODES_FILTER", STRING, wrapper -> wrapper.zone.filter())
.addColumn("IS_DEFAULT_ZONE", BOOLEAN, wrapper -> wrapper.isDefault)
.addColumn("CONSISTENCY_MODE", STRING, wrapper -> wrapper.zone.consistencyMode().name())
+ .addColumn("ZONE_ID", INT32, wrapper -> wrapper.zone.id())
+ // TODO https://issues.apache.org/jira/browse/IGNITE-24589: Next columns are deprecated and should be removed.
+ // They are kept for compatibility with 3.0 version, to allow columns being found by their old names.
+ .addColumn("NAME", STRING, wrapper -> wrapper.zone.name())
.dataProvider(SubscriptionUtils.fromIterable(() -> {
Catalog catalog = catalogSupplier.get();
CatalogZoneDescriptor defaultZone = catalog.defaultZone();
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java
index d943ef9a25a..1e8daf22c09 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java
@@ -24,9 +24,12 @@ import java.util.Collection;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogManager;
+import org.apache.ignite.internal.catalog.commands.CatalogUtils;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.sql.SqlCommon;
+import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
+import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.Test;
/** End-to-end tests to verify indexes system view. */
@@ -37,6 +40,59 @@ public class ItIndexesSystemViewTest extends AbstractSystemViewTest {
private static final String COLUMNS_COLLATIONS = "ID DESC, NAME ASC";
+ @Test
+ public void testMetadata() {
+ assertQuery("SELECT * FROM SYSTEM.INDEXES")
+ .columnMetadata(
+ new MetadataMatcher().name("INDEX_ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher().name("INDEX_NAME")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher().name("TABLE_ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher().name("TABLE_NAME")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher().name("SCHEMA_ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher().name("SCHEMA_NAME")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher().name("TYPE")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher().name("IS_UNIQUE")
+ .type(ColumnType.BOOLEAN)
+ .nullable(true),
+
+ new MetadataMatcher().name("COLUMNS")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher().name("STATUS")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true)
+ )
+ .check();
+ }
+
@Test
public void multipleIndexes() {
sql(String.format("CREATE TABLE %S (ID INT, NAME VARCHAR, CONSTRAINT PK PRIMARY KEY USING HASH(ID, NAME));", TABLE_NAME));
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java
index 0accfeb1126..0ba8600c6bd 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java
@@ -77,12 +77,8 @@ public class ItSqlQueriesSystemViewTest extends AbstractSystemViewTest {
}
@Test
- public void singleStatement() {
- String query = "SELECT * FROM SQL_QUERIES ORDER BY START_TIME";
-
- // Verify metadata.
- assertQuery(query)
- .withDefaultSchema("SYSTEM")
+ public void testMetadata() {
+ assertQuery("SELECT * FROM SYSTEM.SQL_QUERIES")
.columnMetadata(
new MetadataMatcher().name("INITIATOR_NODE").type(ColumnType.STRING).nullable(false),
new MetadataMatcher().name("ID").type(ColumnType.STRING).precision(36).nullable(true),
@@ -97,6 +93,11 @@ public class ItSqlQueriesSystemViewTest extends AbstractSystemViewTest {
)
.returnRowCount(1)
.check();
+ }
+
+ @Test
+ public void singleStatement() {
+ String query = "SELECT * FROM SQL_QUERIES ORDER BY START_TIME";
Ignite initiator = CLUSTER.aliveNode();
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java
index 16918909b02..1ba3ce64108 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java
@@ -74,18 +74,18 @@ public class ItSystemViewsTest extends AbstractSystemViewTest {
assertQuery(format("SELECT * FROM {}", SYSTEM_VIEWS.canonicalName()))
.columnMetadata(
new MetadataMatcher()
- .name("ID")
+ .name("VIEW_ID")
.type(ColumnType.INT32)
.nullable(true),
new MetadataMatcher()
- .name("SCHEMA")
+ .name("SCHEMA_NAME")
.type(ColumnType.STRING)
.precision(Short.MAX_VALUE)
.nullable(true),
new MetadataMatcher()
- .name("NAME")
+ .name("VIEW_NAME")
.type(ColumnType.STRING)
.precision(Short.MAX_VALUE)
.nullable(true),
@@ -94,6 +94,24 @@ public class ItSystemViewsTest extends AbstractSystemViewTest {
.name("TYPE")
.type(ColumnType.STRING)
.precision(Short.MAX_VALUE)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+ // Legacy column.
+ new MetadataMatcher()
+ .name("SCHEMA")
+ .type(ColumnType.STRING)
+ .precision(Short.MAX_VALUE)
+ .nullable(true),
+ // Legacy column.
+ new MetadataMatcher()
+ .name("NAME")
+ .type(ColumnType.STRING)
+ .precision(Short.MAX_VALUE)
.nullable(true)
)
.check();
@@ -109,7 +127,7 @@ public class ItSystemViewsTest extends AbstractSystemViewTest {
.nullable(true),
new MetadataMatcher()
- .name("NAME")
+ .name("VIEW_NAME")
.type(ColumnType.STRING)
.precision(Short.MAX_VALUE)
.nullable(true),
@@ -138,7 +156,15 @@ public class ItSystemViewsTest extends AbstractSystemViewTest {
new MetadataMatcher()
.name("LENGTH")
.type(ColumnType.INT32)
- .nullable(true))
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("NAME")
+ .type(ColumnType.STRING)
+ .precision(Short.MAX_VALUE)
+ .nullable(true)
+ )
.check();
}
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
index ee192822ca8..acffa3ec17d 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
@@ -42,19 +42,19 @@ public class ItTablesSystemViewTest extends AbstractSystemViewTest {
assertQuery("SELECT * FROM SYSTEM.TABLES")
.columnMetadata(
new MetadataMatcher()
- .name("SCHEMA")
+ .name("SCHEMA_NAME")
.type(ColumnType.STRING)
.precision(DEFAULT_VARLEN_LENGTH)
.nullable(true),
new MetadataMatcher()
- .name("NAME")
+ .name("TABLE_NAME")
.type(ColumnType.STRING)
.precision(DEFAULT_VARLEN_LENGTH)
.nullable(true),
new MetadataMatcher()
- .name("ID")
+ .name("TABLE_ID")
.type(ColumnType.INT32)
.nullable(true),
@@ -64,7 +64,7 @@ public class ItTablesSystemViewTest extends AbstractSystemViewTest {
.nullable(true),
new MetadataMatcher()
- .name("ZONE")
+ .name("ZONE_NAME")
.type(ColumnType.STRING)
.precision(DEFAULT_VARLEN_LENGTH)
.nullable(true),
@@ -79,6 +79,43 @@ public class ItTablesSystemViewTest extends AbstractSystemViewTest {
.name("COLOCATION_KEY_INDEX")
.type(ColumnType.STRING)
.precision(DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("SCHEMA_ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("ZONE_ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("SCHEMA")
+ .type(ColumnType.STRING)
+ .precision(DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("NAME")
+ .type(ColumnType.STRING)
+ .precision(DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("ZONE")
+ .type(ColumnType.STRING)
+ .precision(DEFAULT_VARLEN_LENGTH)
.nullable(true)
)
.check();
@@ -104,7 +141,7 @@ public class ItTablesSystemViewTest extends AbstractSystemViewTest {
assertQuery("SELECT * FROM SYSTEM.TABLE_COLUMNS")
.columnMetadata(
new MetadataMatcher()
- .name("SCHEMA")
+ .name("SCHEMA_NAME")
.type(ColumnType.STRING)
.precision(DEFAULT_VARLEN_LENGTH)
.nullable(true),
@@ -139,7 +176,7 @@ public class ItTablesSystemViewTest extends AbstractSystemViewTest {
.nullable(true),
new MetadataMatcher()
- .name("PREC")
+ .name("PRECISION")
.type(ColumnType.INT32)
.nullable(true),
@@ -156,6 +193,19 @@ public class ItTablesSystemViewTest extends AbstractSystemViewTest {
new MetadataMatcher()
.name("COLUMN_ORDINAL")
.type(ColumnType.INT32)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("SCHEMA")
+ .type(ColumnType.STRING)
+ .precision(DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("PREC")
+ .type(ColumnType.INT32)
.nullable(true)
)
.check();
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java
index eb25cf9793d..bf1227fefed 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java
@@ -31,7 +31,10 @@ import java.util.Objects;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogManager;
+import org.apache.ignite.internal.catalog.commands.CatalogUtils;
import org.apache.ignite.internal.catalog.descriptors.ConsistencyMode;
+import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
+import org.apache.ignite.sql.ColumnType;
import org.apache.ignite.sql.SqlException;
import org.junit.jupiter.api.Test;
@@ -59,7 +62,9 @@ public class ItZonesSystemViewTest extends AbstractSystemViewTest {
INFINITE_TIMER_VALUE,
DEFAULT_FILTER,
true,
- DEFAULT_CONSISTENCY_MODE.name()
+ DEFAULT_CONSISTENCY_MODE.name(),
+ 0,
+ catalog.defaultZone().name()
).check();
}
@@ -223,6 +228,68 @@ public class ItZonesSystemViewTest extends AbstractSystemViewTest {
sql("DROP ZONE " + ZONE_NAME);
}
+ @Test
+ public void testMetadata() {
+ assertQuery("SELECT * FROM SYSTEM.ZONES")
+ .columnMetadata(
+ new MetadataMatcher()
+ .name("ZONE_NAME")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("PARTITIONS")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("REPLICAS")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("DATA_NODES_AUTO_ADJUST_SCALE_UP")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("DATA_NODES_AUTO_ADJUST_SCALE_DOWN")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("DATA_NODES_FILTER")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("IS_DEFAULT_ZONE")
+ .type(ColumnType.BOOLEAN)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("CONSISTENCY_MODE")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true),
+
+ new MetadataMatcher()
+ .name("ZONE_ID")
+ .type(ColumnType.INT32)
+ .nullable(true),
+
+ // Legacy column.
+ new MetadataMatcher()
+ .name("NAME")
+ .type(ColumnType.STRING)
+ .precision(CatalogUtils.DEFAULT_VARLEN_LENGTH)
+ .nullable(true)
+ )
+ .check();
+ }
+
private static String createZoneSql(String zoneName, int partitions, int replicas, int scaleUp, int scaleDown, String filter) {
String sqlFormat = "CREATE ZONE \"%s\" WITH "
+ "\"PARTITIONS\" = %d, "
@@ -267,7 +334,8 @@ public class ItZonesSystemViewTest extends AbstractSystemViewTest {
}
private static String selectFromZonesSystemView(String zoneName) {
- String sqlFormat = "SELECT * FROM SYSTEM.ZONES WHERE NAME = '%s'";
+ String sqlFormat = "SELECT ZONE_NAME, PARTITIONS, REPLICAS, DATA_NODES_AUTO_ADJUST_SCALE_UP, DATA_NODES_AUTO_ADJUST_SCALE_DOWN, "
+ + "DATA_NODES_FILTER, IS_DEFAULT_ZONE, CONSISTENCY_MODE FROM SYSTEM.ZONES WHERE ZONE_NAME = '%s'";
return String.format(sqlFormat, zoneName);
}
(ignite-3) 02/02: Fix system-views registration
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-24551
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 55752d7bcc04c8e574067dd05b527c8cbc60ba69
Author: amashenkov <am...@apache.org>
AuthorDate: Fri Feb 21 18:53:58 2025 +0300
Fix system-views registration
---
.../compaction/ItCatalogCompactionTest.java | 3 --
.../rest/sql/ItSqlQueryControllerTest.java | 9 ------
.../transaction/ItTransactionControllerTest.java | 9 ------
.../org/apache/ignite/internal/app/IgniteImpl.java | 1 +
.../engine/systemviews/AbstractSystemViewTest.java | 34 ----------------------
.../systemviews/ItComputeSystemViewTest.java | 3 +-
.../systemviews/ItIndexesSystemViewTest.java | 3 +-
.../engine/systemviews/ItLocksSystemViewTest.java | 3 +-
.../systemviews/ItSchemasSystemViewTest.java | 3 +-
.../systemviews/ItSqlQueriesSystemViewTest.java | 4 +--
.../sql/engine/systemviews/ItSystemViewsTest.java | 3 +-
.../engine/systemviews/ItTablesSystemViewTest.java | 3 +-
.../systemviews/ItTransactionsSystemViewTest.java | 3 +-
.../engine/systemviews/ItZonesSystemViewTest.java | 3 +-
.../disaster/ItDisasterRecoverySystemViewTest.java | 6 ----
15 files changed, 19 insertions(+), 71 deletions(-)
diff --git a/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java b/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
index d9244e49f30..0a8aa1f609b 100644
--- a/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
+++ b/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
@@ -46,7 +46,6 @@ import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogManagerImpl;
import org.apache.ignite.internal.catalog.compaction.CatalogCompactionRunner.TimeHolder;
-import org.apache.ignite.internal.systemview.SystemViewManagerImpl;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.tx.Transaction;
@@ -122,8 +121,6 @@ class ItCatalogCompactionTest extends ClusterPerClassIntegrationTest {
void setup() {
List<Ignite> nodes = CLUSTER.runningNodes().collect(Collectors.toList());
assertEquals(initialNodes(), nodes.size());
-
- await(((SystemViewManagerImpl) unwrapIgniteImpl(CLUSTER.aliveNode()).systemViewManager()).completeRegistration());
}
@BeforeEach
diff --git a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/sql/ItSqlQueryControllerTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/sql/ItSqlQueryControllerTest.java
index 7ab8ec1ca99..f2144847fa4 100644
--- a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/sql/ItSqlQueryControllerTest.java
+++ b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/sql/ItSqlQueryControllerTest.java
@@ -19,10 +19,8 @@ package org.apache.ignite.internal.rest.sql;
import static io.micronaut.http.HttpRequest.DELETE;
import static io.micronaut.http.HttpStatus.NOT_FOUND;
-import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.apache.ignite.internal.rest.matcher.MicronautHttpResponseMatcher.assertThrowsProblem;
import static org.apache.ignite.internal.rest.matcher.ProblemMatcher.isProblem;
-import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.aMapWithSize;
import static org.hamcrest.Matchers.is;
@@ -41,12 +39,10 @@ import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
import org.apache.ignite.internal.rest.api.sql.SqlQueryInfo;
-import org.apache.ignite.internal.systemview.SystemViewManagerImpl;
import org.apache.ignite.sql.IgniteSql;
import org.apache.ignite.sql.ResultSet;
import org.apache.ignite.sql.SqlRow;
import org.apache.ignite.sql.Statement;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
/**
@@ -60,11 +56,6 @@ public class ItSqlQueryControllerTest extends ClusterPerClassIntegrationTest {
@Client("http://localhost:10300" + SQL_QUERY_URL)
HttpClient client;
- @BeforeAll
- void beforeAll() {
- await(((SystemViewManagerImpl) unwrapIgniteImpl(CLUSTER.aliveNode()).systemViewManager()).completeRegistration());
- }
-
@Test
void shouldReturnAllSqlQueries() {
String sql = "SELECT x FROM TABLE(SYSTEM_RANGE(1, 100));";
diff --git a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/transaction/ItTransactionControllerTest.java b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/transaction/ItTransactionControllerTest.java
index 005565a6d42..8171f47d092 100644
--- a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/transaction/ItTransactionControllerTest.java
+++ b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/transaction/ItTransactionControllerTest.java
@@ -19,10 +19,8 @@ package org.apache.ignite.internal.rest.transaction;
import static io.micronaut.http.HttpRequest.DELETE;
import static io.micronaut.http.HttpStatus.NOT_FOUND;
-import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.apache.ignite.internal.rest.matcher.MicronautHttpResponseMatcher.assertThrowsProblem;
import static org.apache.ignite.internal.rest.matcher.ProblemMatcher.isProblem;
-import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -39,11 +37,9 @@ import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.ignite.internal.ClusterPerClassIntegrationTest;
import org.apache.ignite.internal.rest.api.transaction.TransactionInfo;
-import org.apache.ignite.internal.systemview.SystemViewManagerImpl;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.tx.Transaction;
import org.apache.ignite.tx.TransactionOptions;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -58,11 +54,6 @@ public class ItTransactionControllerTest extends ClusterPerClassIntegrationTest
@Client("http://localhost:10300" + TRANSACTIONURL)
HttpClient client;
- @BeforeAll
- void beforeAll() {
- await(((SystemViewManagerImpl) unwrapIgniteImpl(CLUSTER.aliveNode()).systemViewManager()).completeRegistration());
- }
-
@Test
void shouldReturnAllTransactions() {
Transaction roTx = node(0).transactions().begin(new TransactionOptions().readOnly(true));
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index c8f1c3a07f2..20cc74abc0a 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -1507,6 +1507,7 @@ public class IgniteImpl implements Ignite {
}, joinExecutor)
.thenComposeAsync(ignored -> awaitSelfInLocalLogicalTopology(), joinExecutor)
.thenCompose(ignored -> catalogManager.catalogInitializationFuture())
+ .thenCompose(ignored -> systemViewManager.completeRegistration())
.thenRunAsync(() -> {
try {
// Enable watermark events.
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/AbstractSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/AbstractSystemViewTest.java
deleted file mode 100644
index 361a8c67d2a..00000000000
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/AbstractSystemViewTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.sql.engine.systemviews;
-
-import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
-
-import org.apache.ignite.internal.sql.engine.BaseSqlMultiStatementTest;
-import org.junit.jupiter.api.BeforeAll;
-
-/**
- * Base class for SQL system views integration tests.
- */
-public class AbstractSystemViewTest extends BaseSqlMultiStatementTest {
- /** Await system view registration. */
- @BeforeAll
- protected void awaitSystemViewRegistration() {
- await(systemViewManager().completeRegistration());
- }
-}
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java
index c81bec92dc6..edbb71e68fe 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItComputeSystemViewTest.java
@@ -57,6 +57,7 @@ import org.apache.ignite.compute.task.MapReduceTask;
import org.apache.ignite.compute.task.TaskExecution;
import org.apache.ignite.compute.task.TaskExecutionContext;
import org.apache.ignite.internal.hlc.ClockService;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.lang.CancelHandle;
import org.apache.ignite.sql.ColumnType;
@@ -68,7 +69,7 @@ import org.junit.jupiter.params.provider.ValueSource;
/**
* End-to-end tests to verify {@code COMPUTE_TASKS} system view.
*/
-public class ItComputeSystemViewTest extends AbstractSystemViewTest {
+public class ItComputeSystemViewTest extends BaseSqlIntegrationTest {
@Override
protected int initialNodes() {
return 2;
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java
index 1e8daf22c09..12a1ebf726c 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItIndexesSystemViewTest.java
@@ -27,13 +27,14 @@ import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.commands.CatalogUtils;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.Test;
/** End-to-end tests to verify indexes system view. */
-public class ItIndexesSystemViewTest extends AbstractSystemViewTest {
+public class ItIndexesSystemViewTest extends BaseSqlIntegrationTest {
private static final String TABLE_NAME = "TEST_TABLE";
private static final String COLUMNS = "ID, NAME";
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItLocksSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItLocksSystemViewTest.java
index 375711b36b2..c52f2a72a28 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItLocksSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItLocksSystemViewTest.java
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.ignite.Ignite;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.internal.tx.LockMode;
@@ -40,7 +41,7 @@ import org.junit.jupiter.api.Test;
/**
* End-to-end tests to verify {@code LOCKS} system view.
*/
-public class ItLocksSystemViewTest extends AbstractSystemViewTest {
+public class ItLocksSystemViewTest extends BaseSqlIntegrationTest {
private Set<String> nodeNames;
private Set<String> lockModes;
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSchemasSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSchemasSystemViewTest.java
index d1daff3872b..f313b82e362 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSchemasSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSchemasSystemViewTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.internal.TestWrappers;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.commands.CatalogUtils;
import org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ import org.junit.jupiter.api.Test;
/**
* End-to-end tests to verify the {@code SCHEMAS}system view.
*/
-public class ItSchemasSystemViewTest extends AbstractSystemViewTest {
+public class ItSchemasSystemViewTest extends BaseSqlIntegrationTest {
@Test
public void metadata() {
assertQuery("SELECT * FROM system.schemas")
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java
index 0ba8600c6bd..8937e4d146d 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSqlQueriesSystemViewTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.internal.hlc.ClockService;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.AsyncSqlCursor;
+import org.apache.ignite.internal.sql.engine.BaseSqlMultiStatementTest;
import org.apache.ignite.internal.sql.engine.InternalSqlRow;
import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
import org.apache.ignite.internal.sql.engine.SqlQueryType;
@@ -57,10 +58,9 @@ import org.junit.jupiter.api.Test;
/**
* End-to-end tests to verify {@code SQL_QUERIES} system view.
*/
-public class ItSqlQueriesSystemViewTest extends AbstractSystemViewTest {
+public class ItSqlQueriesSystemViewTest extends BaseSqlMultiStatementTest {
@BeforeAll
void beforeAll() {
-
sql("CREATE TABLE test(id INT PRIMARY KEY)");
}
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java
index 1ba3ce64108..8ab6e05eb24 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItSystemViewsTest.java
@@ -21,6 +21,7 @@ import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static org.apache.ignite.internal.sql.engine.systemviews.ItSystemViewsTest.KnownSystemView.SYSTEM_VIEWS;
import static org.apache.ignite.internal.sql.engine.systemviews.ItSystemViewsTest.KnownSystemView.SYSTEM_VIEW_COLUMNS;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.Test;
@@ -30,7 +31,7 @@ import org.junit.jupiter.params.provider.EnumSource;
/**
* End-to-end tests to verify system views.
*/
-public class ItSystemViewsTest extends AbstractSystemViewTest {
+public class ItSystemViewsTest extends BaseSqlIntegrationTest {
enum KnownSystemView {
SYSTEM_VIEWS("SYSTEM", "SYSTEM_VIEWS"),
SYSTEM_VIEW_COLUMNS("SYSTEM", "SYSTEM_VIEW_COLUMNS"),
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
index acffa3ec17d..6f08a7bf4a8 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTablesSystemViewTest.java
@@ -23,13 +23,14 @@ import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_V
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogManager;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.sql.ColumnType;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
/** End-to-end tests to verify tables system views. */
-public class ItTablesSystemViewTest extends AbstractSystemViewTest {
+public class ItTablesSystemViewTest extends BaseSqlIntegrationTest {
@BeforeAll
void beforeAll() {
sql("CREATE SCHEMA TEST_SCHEMA");
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTransactionsSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTransactionsSystemViewTest.java
index e3c17c232e8..188f636d1df 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTransactionsSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItTransactionsSystemViewTest.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.internal.tx.TransactionIds;
@@ -44,7 +45,7 @@ import org.junit.jupiter.api.Test;
/**
* End-to-end tests to verify {@code TRANSACTIONS} system view.
*/
-public class ItTransactionsSystemViewTest extends AbstractSystemViewTest {
+public class ItTransactionsSystemViewTest extends BaseSqlIntegrationTest {
@Override
protected int initialNodes() {
return 2;
diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java
index bf1227fefed..3848ed67079 100644
--- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java
+++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/systemviews/ItZonesSystemViewTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.commands.CatalogUtils;
import org.apache.ignite.internal.catalog.descriptors.ConsistencyMode;
+import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.engine.util.MetadataMatcher;
import org.apache.ignite.sql.ColumnType;
import org.apache.ignite.sql.SqlException;
@@ -41,7 +42,7 @@ import org.junit.jupiter.api.Test;
/**
* End-to-end tests to verify zones system view.
*/
-public class ItZonesSystemViewTest extends AbstractSystemViewTest {
+public class ItZonesSystemViewTest extends BaseSqlIntegrationTest {
private static final String ZONE_NAME = "TEST_ZONE";
private static final String ALTER_ZONE_NAME = "NEW_TEST_ZONE";
diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoverySystemViewTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoverySystemViewTest.java
index f866225eed0..75b42f92660 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoverySystemViewTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoverySystemViewTest.java
@@ -42,7 +42,6 @@ import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.table.distributed.PublicApiThreadingTable;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
/** For integration testing of disaster recovery system views. */
@@ -57,11 +56,6 @@ public class ItDisasterRecoverySystemViewTest extends BaseSqlIntegrationTest {
return 2;
}
- @BeforeAll
- void beforeAll() {
- assertThat(systemViewManager().completeRegistration(), willCompleteSuccessfully());
- }
-
@AfterEach
void tearDown() {
sql("DROP TABLE IF EXISTS " + TABLE_NAME);