This is an automated email from the ASF dual-hosted git repository.
ptupitsyn 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 bd4574da15 IGNITE-22208 Deduplicate DEFAULT_SCHEMA_NAME (#3758)
bd4574da15 is described below
commit bd4574da15154fb17c258c42f479b7ec1bc154a6
Author: Pavel Tupitsyn <[email protected]>
AuthorDate: Wed May 15 15:40:27 2024 +0300
IGNITE-22208 Deduplicate DEFAULT_SCHEMA_NAME (#3758)
---
.../ignite/internal/catalog/CatalogManagerImpl.java | 15 ++++++++-------
.../apache/ignite/internal/catalog/CatalogService.java | 3 ---
.../CatalogManagerDescriptorCausalityTokenTest.java | 8 ++++----
.../internal/catalog/CatalogManagerSelfTest.java | 14 +++++++-------
.../internal/catalog/commands/CatalogUtilsTest.java | 16 ++++++++--------
.../internal/catalog/BaseCatalogManagerTest.java | 12 ++++++------
.../ignite/internal/catalog/CatalogTestUtils.java | 16 ++++++++++++----
.../handler/requests/jdbc/JdbcMetadataCatalog.java | 18 ++++++++----------
.../ignite/internal/client/compute/ClientCompute.java | 5 ++---
.../ignite/internal/compute/IgniteComputeImpl.java | 5 ++---
.../rebalance/DistributionZoneRebalanceEngineTest.java | 4 ++--
.../ignite/internal/index/ItBuildIndexOneNodeTest.java | 18 +++++++++---------
.../ignite/internal/index/ItIndexAndRebalanceTest.java | 4 ++--
.../index/IndexAvailabilityControllerTest.java | 6 +++---
.../internal/index/IndexBuildControllerTest.java | 6 +++---
.../apache/ignite/internal/index/IndexManagerTest.java | 8 ++++----
.../internal/index/TestIndexManagementUtils.java | 8 ++++----
.../apache/ignite/internal/jdbc/JdbcConnection.java | 7 +++----
.../internal/runner/app/PlatformTestNodeRunner.java | 12 ++++++------
.../internal/sql/engine/ItIndexAvailabilityTest.java | 4 ++--
.../ignite/internal/sql/engine/ItIndexDdlTest.java | 6 +++---
.../internal/sql/engine/ItIndexesSystemViewTest.java | 4 ++--
.../ignite/internal/sql/engine/SqlQueryProcessor.java | 6 ++----
.../internal/sql/api/StatementBuilderImplTest.java | 9 ++++-----
.../sql/engine/exec/ExecutionServiceImplTest.java | 4 ++--
.../sql/engine/exec/mapping/FragmentMappingTest.java | 4 ++--
.../internal/sql/engine/framework/TestBuilders.java | 3 ++-
.../ignite/internal/sql/engine/framework/TestNode.java | 4 ++--
.../sql/engine/planner/AbstractPlannerTest.java | 4 ++--
.../sql/engine/planner/KeyValueModifyPlannerTest.java | 4 ++--
.../engine/planner/PrimaryKeyLookupPlannerTest.java | 4 ++--
.../ddl/AbstractDdlSqlToCommandConverterTest.java | 4 ++--
.../internal/sql/engine/util/StatementChecker.java | 4 ++--
.../disaster/ItDisasterRecoveryManagerTest.java | 4 ++--
.../internal/rebalance/ItRebalanceDistributedTest.java | 4 ++--
.../CatalogStorageIndexDescriptorSupplierTest.java | 10 +++++-----
.../table/distributed/TableManagerRecoveryTest.java | 10 +++++-----
.../internal/table/distributed/TableManagerTest.java | 6 +++---
.../internal/table/distributed/TableUtilsTest.java | 4 ++--
.../snapshot/FullStateTransferIndexChooserTest.java | 8 ++++----
.../apache/ignite/internal/table/TableTestUtils.java | 12 ++++++------
41 files changed, 153 insertions(+), 154 deletions(-)
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
index 070c7a81a0..eacb159c1c 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
@@ -75,6 +75,7 @@ import
org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.lang.NodeStoppingException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.systemview.api.SystemView;
import org.apache.ignite.internal.systemview.api.SystemViewProvider;
import org.apache.ignite.internal.systemview.api.SystemViews;
@@ -194,7 +195,7 @@ public class CatalogManagerImpl extends
AbstractEventProducer<CatalogEvent, Cata
@Override
public @Nullable CatalogTableDescriptor table(String tableName, long
timestamp) {
- CatalogSchemaDescriptor schema =
catalogAt(timestamp).schema(DEFAULT_SCHEMA_NAME);
+ CatalogSchemaDescriptor schema =
catalogAt(timestamp).schema(SqlCommon.DEFAULT_SCHEMA_NAME);
if (schema == null) {
return null;
}
@@ -218,7 +219,7 @@ public class CatalogManagerImpl extends
AbstractEventProducer<CatalogEvent, Cata
@Override
public @Nullable CatalogIndexDescriptor aliveIndex(String indexName, long
timestamp) {
- CatalogSchemaDescriptor schema =
catalogAt(timestamp).schema(DEFAULT_SCHEMA_NAME);
+ CatalogSchemaDescriptor schema =
catalogAt(timestamp).schema(SqlCommon.DEFAULT_SCHEMA_NAME);
if (schema == null) {
return null;
}
@@ -247,7 +248,7 @@ public class CatalogManagerImpl extends
AbstractEventProducer<CatalogEvent, Cata
@Override
public @Nullable CatalogSchemaDescriptor schema(int catalogVersion) {
- return schema(DEFAULT_SCHEMA_NAME, catalogVersion);
+ return schema(SqlCommon.DEFAULT_SCHEMA_NAME, catalogVersion);
}
@Override
@@ -258,7 +259,7 @@ public class CatalogManagerImpl extends
AbstractEventProducer<CatalogEvent, Cata
return null;
}
- return catalog.schema(schemaName == null ? DEFAULT_SCHEMA_NAME :
schemaName);
+ return catalog.schema(schemaName == null ?
SqlCommon.DEFAULT_SCHEMA_NAME : schemaName);
}
@Override
@@ -290,12 +291,12 @@ public class CatalogManagerImpl extends
AbstractEventProducer<CatalogEvent, Cata
@Override
public @Nullable CatalogSchemaDescriptor activeSchema(long timestamp) {
- return catalogAt(timestamp).schema(DEFAULT_SCHEMA_NAME);
+ return catalogAt(timestamp).schema(SqlCommon.DEFAULT_SCHEMA_NAME);
}
@Override
public @Nullable CatalogSchemaDescriptor activeSchema(String schemaName,
long timestamp) {
- return catalogAt(timestamp).schema(schemaName == null ?
DEFAULT_SCHEMA_NAME : schemaName);
+ return catalogAt(timestamp).schema(schemaName == null ?
SqlCommon.DEFAULT_SCHEMA_NAME : schemaName);
}
@Override
@@ -383,7 +384,7 @@ public class CatalogManagerImpl extends
AbstractEventProducer<CatalogEvent, Cata
.zoneName(DEFAULT_ZONE_NAME)
.build(),
// Add schemas
-
CreateSchemaCommand.builder().name(DEFAULT_SCHEMA_NAME).build(),
+
CreateSchemaCommand.builder().name(SqlCommon.DEFAULT_SCHEMA_NAME).build(),
CreateSchemaCommand.builder().name(SYSTEM_SCHEMA_NAME).build()
);
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogService.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogService.java
index cc1c65de89..ecdb478974 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogService.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogService.java
@@ -45,9 +45,6 @@ import org.jetbrains.annotations.Nullable;
* <p>TBD: events
*/
public interface CatalogService extends EventProducer<CatalogEvent,
CatalogEventParameters> {
- /** Default schema name. */
- String DEFAULT_SCHEMA_NAME = "PUBLIC";
-
/** System schema name. */
String SYSTEM_SCHEMA_NAME = "SYSTEM";
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerDescriptorCausalityTokenTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerDescriptorCausalityTokenTest.java
index dbc0185482..159c910c20 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerDescriptorCausalityTokenTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerDescriptorCausalityTokenTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.catalog;
import static
org.apache.ignite.internal.catalog.CatalogManagerImpl.INITIAL_CAUSALITY_TOKEN;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.addColumnParams;
import static org.apache.ignite.internal.catalog.CatalogTestUtils.columnParams;
@@ -53,24 +52,25 @@ import
org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescript
import
org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.junit.jupiter.api.Test;
/**
* Test for checking that catalog descriptors entities' "update token" are
updated after general catalog operations.
*/
public class CatalogManagerDescriptorCausalityTokenTest extends
BaseCatalogManagerTest {
- private static final String SCHEMA_NAME = DEFAULT_SCHEMA_NAME;
+ private static final String SCHEMA_NAME = SqlCommon.DEFAULT_SCHEMA_NAME;
private static final String ZONE_NAME = "TEST_ZONE_NAME";
private static final String TABLE_NAME_2 = "myTable2";
private static final String NEW_COLUMN_NAME = "NEWCOL";
@Test
public void testEmptyCatalog() {
- CatalogSchemaDescriptor defaultSchema =
manager.schema(DEFAULT_SCHEMA_NAME, 1);
+ CatalogSchemaDescriptor defaultSchema =
manager.schema(SqlCommon.DEFAULT_SCHEMA_NAME, 1);
assertNotNull(defaultSchema);
assertNull(manager.catalog(0).defaultZone());
- assertSame(defaultSchema, manager.activeSchema(DEFAULT_SCHEMA_NAME,
clock.nowLong()));
+ assertSame(defaultSchema,
manager.activeSchema(SqlCommon.DEFAULT_SCHEMA_NAME, clock.nowLong()));
assertSame(defaultSchema, manager.schema(1));
assertSame(defaultSchema, manager.activeSchema(clock.nowLong()));
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
index d15c5ff889..5469c6a7ca 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.catalog;
import static java.util.stream.Collectors.toList;
import static
org.apache.ignite.internal.catalog.CatalogManagerImpl.DEFAULT_ZONE_NAME;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.catalog.CatalogService.SYSTEM_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.addColumnParams;
@@ -150,6 +149,7 @@ import
org.apache.ignite.internal.catalog.storage.VersionedUpdate;
import org.apache.ignite.internal.event.EventListener;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lang.IgniteInternalException;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.sql.ColumnType;
import org.hamcrest.TypeSafeMatcher;
import org.jetbrains.annotations.Nullable;
@@ -166,7 +166,7 @@ import org.mockito.ArgumentCaptor;
* Catalog manager self test.
*/
public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
- private static final String SCHEMA_NAME = DEFAULT_SCHEMA_NAME;
+ private static final String SCHEMA_NAME = SqlCommon.DEFAULT_SCHEMA_NAME;
private static final String TEST_ZONE_NAME = "TEST_ZONE_NAME";
private static final String NEW_COLUMN_NAME = "NEWCOL";
private static final String NEW_COLUMN_NAME_2 = "NEWCOL2";
@@ -174,10 +174,10 @@ public class CatalogManagerSelfTest extends
BaseCatalogManagerTest {
@Test
public void testEmptyCatalog() {
- CatalogSchemaDescriptor defaultSchema =
manager.schema(DEFAULT_SCHEMA_NAME, 1);
+ CatalogSchemaDescriptor defaultSchema =
manager.schema(SqlCommon.DEFAULT_SCHEMA_NAME, 1);
assertNotNull(defaultSchema);
- assertSame(defaultSchema, manager.activeSchema(DEFAULT_SCHEMA_NAME,
clock.nowLong()));
+ assertSame(defaultSchema,
manager.activeSchema(SqlCommon.DEFAULT_SCHEMA_NAME, clock.nowLong()));
assertSame(defaultSchema, manager.schema(1));
assertSame(defaultSchema, manager.schema(defaultSchema.id(), 1));
assertSame(defaultSchema, manager.activeSchema(clock.nowLong()));
@@ -189,7 +189,7 @@ public class CatalogManagerSelfTest extends
BaseCatalogManagerTest {
assertThrows(IllegalStateException.class, () ->
manager.activeSchema(-1L));
// Validate default schema.
- assertEquals(DEFAULT_SCHEMA_NAME, defaultSchema.name());
+ assertEquals(SqlCommon.DEFAULT_SCHEMA_NAME, defaultSchema.name());
assertEquals(1, defaultSchema.id());
assertEquals(0, defaultSchema.tables().length);
assertEquals(0, defaultSchema.indexes().length);
@@ -2196,7 +2196,7 @@ public class CatalogManagerSelfTest extends
BaseCatalogManagerTest {
private void dropIndex(String indexName) {
assertThat(
-
manager.execute(DropIndexCommand.builder().indexName(indexName).schemaName(DEFAULT_SCHEMA_NAME).build()),
+
manager.execute(DropIndexCommand.builder().indexName(indexName).schemaName(SqlCommon.DEFAULT_SCHEMA_NAME).build()),
willCompleteSuccessfully()
);
}
@@ -2708,7 +2708,7 @@ public class CatalogManagerSelfTest extends
BaseCatalogManagerTest {
assertNotNull(latestCatalog);
assertNotNull(latestCatalog.schema(schemaName));
- assertNotNull(latestCatalog.schema(DEFAULT_SCHEMA_NAME));
+ assertNotNull(latestCatalog.schema(SqlCommon.DEFAULT_SCHEMA_NAME));
assertThat(
manager.execute(CreateSchemaCommand.builder().name(schemaName).build()),
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
index 751b5373a0..aba44cb41e 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.catalog.commands;
import static java.util.stream.Collectors.toList;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createCatalogManagerWithTestUpdateLog;
import static org.apache.ignite.internal.catalog.CatalogTestUtils.index;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.clusterWideEnsuredActivationTimestamp;
@@ -55,6 +54,7 @@ import
org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -306,7 +306,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
createTable("foo");
createTable("bar");
- CatalogSchemaDescriptor schema =
catalogManager.activeSchema(DEFAULT_SCHEMA_NAME, clock.nowLong());
+ CatalogSchemaDescriptor schema =
catalogManager.activeSchema(SqlCommon.DEFAULT_SCHEMA_NAME, clock.nowLong());
assertThat(schema, is(notNullValue()));
@@ -331,7 +331,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
@Test
void testReplaceTableMissingTable() {
- CatalogSchemaDescriptor schema =
catalogManager.activeSchema(DEFAULT_SCHEMA_NAME, clock.nowLong());
+ CatalogSchemaDescriptor schema =
catalogManager.activeSchema(SqlCommon.DEFAULT_SCHEMA_NAME, clock.nowLong());
assertThat(schema, is(notNullValue()));
@@ -352,7 +352,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
createIndex(tableName, "foo");
createIndex(tableName, "bar");
- CatalogSchemaDescriptor schema =
catalogManager.activeSchema(DEFAULT_SCHEMA_NAME, clock.nowLong());
+ CatalogSchemaDescriptor schema =
catalogManager.activeSchema(SqlCommon.DEFAULT_SCHEMA_NAME, clock.nowLong());
assertThat(schema, is(notNullValue()));
@@ -379,7 +379,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
@Test
void testReplaceIndexMissingIndex() {
- CatalogSchemaDescriptor schema =
catalogManager.activeSchema(DEFAULT_SCHEMA_NAME, clock.nowLong());
+ CatalogSchemaDescriptor schema =
catalogManager.activeSchema(SqlCommon.DEFAULT_SCHEMA_NAME, clock.nowLong());
assertThat(schema, is(notNullValue()));
@@ -407,7 +407,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
private void createTable(String tableName) {
CatalogCommand catalogCommand = CreateTableCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(tableName)
.columns(List.of(ColumnParams.builder().name(COLUMN_NAME).type(INT32).build()))
// Any type of a primary key index can be used.
@@ -423,7 +423,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
private int createIndex(String tableName, String indexName) {
CatalogCommand catalogCommand = CreateHashIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(tableName)
.indexName(indexName)
.columns(List.of(COLUMN_NAME))
@@ -449,7 +449,7 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
private void dropIndex(String indexName) {
CatalogCommand catalogCommand = DropIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.indexName(indexName)
.build();
diff --git
a/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
b/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
index 16291ec52b..2b0c8e45c2 100644
---
a/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
+++
b/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.catalog;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.awaitDefaultZoneCreation;
import static org.apache.ignite.internal.catalog.CatalogTestUtils.columnParams;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.columnParamsBuilder;
@@ -54,6 +53,7 @@ import org.apache.ignite.internal.hlc.TestClockService;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import
org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
@@ -126,7 +126,7 @@ public abstract class BaseCatalogManagerTest extends
BaseIgniteAbstractTest {
@Nullable List<String> indexColumns
) {
return CreateHashIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(tableName)
.indexName(indexName)
.unique(uniq)
@@ -166,7 +166,7 @@ public abstract class BaseCatalogManagerTest extends
BaseIgniteAbstractTest {
@Nullable List<CatalogColumnCollation> columnsCollations
) {
return CreateSortedIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(tableName)
.indexName(indexName)
.unique(unique)
@@ -202,7 +202,7 @@ public abstract class BaseCatalogManagerTest extends
BaseIgniteAbstractTest {
.build();
return CreateTableCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(tableName)
.columns(columns)
.primaryKey(primaryKey)
@@ -236,14 +236,14 @@ public abstract class BaseCatalogManagerTest extends
BaseIgniteAbstractTest {
protected static CatalogCommand dropTableCommand(String tableName) {
return DropTableCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(tableName)
.build();
}
protected static CatalogCommand dropIndexCommand(String indexName) {
return DropIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.indexName(indexName)
.build();
}
diff --git
a/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/CatalogTestUtils.java
b/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/CatalogTestUtils.java
index 60525e9351..753a5af430 100644
---
a/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/CatalogTestUtils.java
+++
b/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/CatalogTestUtils.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.catalog;
import static java.util.concurrent.CompletableFuture.allOf;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
@@ -58,6 +57,7 @@ import
org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import
org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.lang.ErrorGroups.Common;
import org.apache.ignite.sql.ColumnType;
@@ -323,15 +323,23 @@ public class CatalogTestUtils {
}
static CatalogCommand dropTableCommand(String tableName) {
- return
DropTableCommand.builder().schemaName(DEFAULT_SCHEMA_NAME).tableName(tableName).build();
+ return
DropTableCommand.builder().schemaName(SqlCommon.DEFAULT_SCHEMA_NAME).tableName(tableName).build();
}
static CatalogCommand dropColumnParams(String tableName, String...
columns) {
- return
AlterTableDropColumnCommand.builder().schemaName(DEFAULT_SCHEMA_NAME).tableName(tableName).columns(Set.of(columns)).build();
+ return AlterTableDropColumnCommand.builder()
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
+ .tableName(tableName)
+ .columns(Set.of(columns))
+ .build();
}
static CatalogCommand addColumnParams(String tableName, ColumnParams...
columns) {
- return
AlterTableAddColumnCommand.builder().schemaName(DEFAULT_SCHEMA_NAME).tableName(tableName).columns(List.of(columns)).build();
+ return AlterTableAddColumnCommand.builder()
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
+ .tableName(tableName)
+ .columns(List.of(columns))
+ .build();
}
/**
diff --git
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/jdbc/JdbcMetadataCatalog.java
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/jdbc/JdbcMetadataCatalog.java
index d118d37a9c..bc3ebba12f 100644
---
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/jdbc/JdbcMetadataCatalog.java
+++
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/jdbc/JdbcMetadataCatalog.java
@@ -40,6 +40,7 @@ import
org.apache.ignite.internal.jdbc.proto.event.JdbcTableMeta;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import
org.apache.ignite.internal.schema.catalog.CatalogToSchemaDescriptorConverter;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.util.Commons;
import org.apache.ignite.internal.table.distributed.schema.SchemaSyncService;
import org.apache.ignite.internal.type.NativeType;
@@ -59,9 +60,6 @@ public class JdbcMetadataCatalog {
/** Table type. */
private static final String TBL_TYPE = "TABLE";
- /** Default schema name. */
- private static final String DEFAULT_SCHEMA_NAME = "PUBLIC";
-
private final ClockService clockService;
private final SchemaSyncService schemaSyncService;
@@ -139,7 +137,7 @@ public class JdbcMetadataCatalog {
return tables.stream()
.filter(t -> tableNameAndSchemaMatches(t, schemaNameRegex,
tlbNameRegex))
.sorted(byTblTypeThenSchemaThenTblName)
- .map(t -> new JdbcTableMeta(DEFAULT_SCHEMA_NAME, t.name(),
TBL_TYPE))
+ .map(t -> new JdbcTableMeta(SqlCommon.DEFAULT_SCHEMA_NAME,
t.name(), TBL_TYPE))
.collect(toList());
});
}
@@ -149,7 +147,7 @@ public class JdbcMetadataCatalog {
@Nullable String schemaNameRegex,
@Nullable String tlbNameRegex
) {
- return matches(DEFAULT_SCHEMA_NAME, schemaNameRegex) &&
matches(table.name(), tlbNameRegex);
+ return matches(SqlCommon.DEFAULT_SCHEMA_NAME, schemaNameRegex) &&
matches(table.name(), tlbNameRegex);
}
/**
@@ -195,13 +193,13 @@ public class JdbcMetadataCatalog {
String schemaNameRegex = translateSqlWildcardsToRegex(schemaNamePtrn);
- if (matches(DEFAULT_SCHEMA_NAME, schemaNameRegex)) {
- schemas.add(DEFAULT_SCHEMA_NAME);
+ if (matches(SqlCommon.DEFAULT_SCHEMA_NAME, schemaNameRegex)) {
+ schemas.add(SqlCommon.DEFAULT_SCHEMA_NAME);
}
return tablesAtNow().thenApply(tables ->
tables.stream()
- .map(tbl -> DEFAULT_SCHEMA_NAME)
+ .map(tbl -> SqlCommon.DEFAULT_SCHEMA_NAME)
.filter(schema -> matches(schema, schemaNameRegex))
.collect(toCollection(() -> schemas))
);
@@ -218,7 +216,7 @@ public class JdbcMetadataCatalog {
List<String> keyColNames = List.copyOf(tbl.primaryKeyColumns());
- return new JdbcPrimaryKeyMeta(DEFAULT_SCHEMA_NAME, tbl.name(),
keyName, keyColNames);
+ return new JdbcPrimaryKeyMeta(SqlCommon.DEFAULT_SCHEMA_NAME,
tbl.name(), keyName, keyColNames);
}
/**
@@ -233,7 +231,7 @@ public class JdbcMetadataCatalog {
return new JdbcColumnMeta(
col.name(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
tblName,
col.name(),
Commons.nativeTypeToJdbcClass(colType),
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
index 847a297506..63507b113a 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/compute/ClientCompute.java
@@ -51,6 +51,7 @@ import org.apache.ignite.internal.client.table.ClientTable;
import org.apache.ignite.internal.client.table.ClientTables;
import org.apache.ignite.internal.client.table.ClientTupleSerializer;
import org.apache.ignite.internal.client.table.PartitionAwarenessProvider;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.util.ExceptionUtils;
import org.apache.ignite.lang.IgniteException;
import org.apache.ignite.lang.TableNotFoundException;
@@ -62,8 +63,6 @@ import org.apache.ignite.table.mapper.Mapper;
* Client compute implementation.
*/
public class ClientCompute implements IgniteCompute {
- private static final String DEFAULT_SCHEMA_NAME = "PUBLIC";
-
/** Channel. */
private final ReliableChannel ch;
@@ -369,7 +368,7 @@ public class ClientCompute implements IgniteCompute {
return tables.tableAsync(tableName).thenApply(t -> {
if (t == null) {
- throw new TableNotFoundException(DEFAULT_SCHEMA_NAME,
tableName);
+ throw new
TableNotFoundException(SqlCommon.DEFAULT_SCHEMA_NAME, tableName);
}
ClientTable clientTable = (ClientTable) t;
diff --git
a/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java
b/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java
index 0bd0d64e36..32ce5dc151 100644
---
a/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java
+++
b/modules/compute/src/main/java/org/apache/ignite/internal/compute/IgniteComputeImpl.java
@@ -51,6 +51,7 @@ import org.apache.ignite.compute.task.ComputeJobRunner;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.placementdriver.PlacementDriver;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.table.IgniteTablesInternal;
import org.apache.ignite.internal.table.TableViewInternal;
import org.apache.ignite.internal.util.CompletableFutures;
@@ -69,8 +70,6 @@ import org.jetbrains.annotations.TestOnly;
* Implementation of {@link IgniteCompute}.
*/
public class IgniteComputeImpl implements IgniteComputeInternal {
- private static final String DEFAULT_SCHEMA_NAME = "PUBLIC";
-
private final TopologyService topologyService;
private final IgniteTablesInternal tables;
@@ -304,7 +303,7 @@ public class IgniteComputeImpl implements
IgniteComputeInternal {
return tables.tableViewAsync(parsedName)
.thenApply(table -> {
if (table == null) {
- throw new TableNotFoundException(DEFAULT_SCHEMA_NAME,
parsedName);
+ throw new
TableNotFoundException(SqlCommon.DEFAULT_SCHEMA_NAME, parsedName);
}
return table;
});
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineTest.java
index 8578154dbb..d729aa0777 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngineTest.java
@@ -22,7 +22,6 @@ import static java.util.Collections.emptySet;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.stream.Collectors.toSet;
import static
org.apache.ignite.internal.affinity.AffinityUtils.calculateAssignmentForPartition;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createTestCatalogManager;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.getDefaultZone;
@@ -103,6 +102,7 @@ import org.apache.ignite.internal.raft.WriteCommand;
import org.apache.ignite.internal.raft.service.CommandClosure;
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.table.TableTestUtils;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.apache.ignite.internal.thread.NamedThreadFactory;
@@ -551,7 +551,7 @@ public class DistributionZoneRebalanceEngineTest extends
IgniteAbstractTest {
private void createTable(String zoneName, String tableName) {
TableTestUtils.createTable(
catalogManager,
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
zoneName,
tableName,
List.of(ColumnParams.builder().name("k1").type(STRING).length(100).build()),
diff --git
a/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexOneNodeTest.java
b/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexOneNodeTest.java
index 460feaaf47..8f08a50df5 100644
---
a/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexOneNodeTest.java
+++
b/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItBuildIndexOneNodeTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.index;
import static java.util.concurrent.CompletableFuture.failedFuture;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static
org.apache.ignite.internal.sql.engine.util.QueryChecker.containsIndexScan;
@@ -50,6 +49,7 @@ import
org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import org.apache.ignite.internal.catalog.events.CatalogEvent;
import
org.apache.ignite.internal.catalog.events.MakeIndexAvailableEventParameters;
import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.util.QueryChecker;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
@@ -129,7 +129,7 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
// Now let's check the data itself.
assertQuery(format("SELECT * FROM {} WHERE salary > 0.0", TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.returns(0, "0", 10.0)
.check();
}
@@ -162,7 +162,7 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
// Now let's check the data itself.
assertQuery(format("SELECT * FROM {} WHERE salary > 0.0", TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.returnRowCount(nextPersonId.get())
.check();
}
@@ -202,7 +202,7 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
// Now let's check the data itself.
QueryChecker queryChecker = assertQuery(format("SELECT NAME FROM {}
WHERE salary > 0.0 ORDER BY ID ASC", TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.ordered();
int updatedRowCount = updateIntoTableFuture.join();
@@ -248,7 +248,7 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
// Now let's check the data itself.
assertQuery(format("SELECT NAME FROM {} WHERE salary > 0.0",
TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.returnRowCount(nextPersonId.get() -
deleteFromTableFuture.join())
.check();
}
@@ -274,12 +274,12 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
waitForReadTimestampThatObservesMostRecentCatalog();
assertQuery(format("SELECT * FROM {} WHERE salary > 0.0", TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
indexName0))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, indexName0))
.returns(0, "0", 10.0, "foo")
.check();
assertQuery(format("SELECT * FROM {} WHERE SURNAME = 'foo'",
TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
indexName1))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, indexName1))
.returns(0, "0", 10.0, "foo")
.check();
}
@@ -309,7 +309,7 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
assertThat(createIndexFuture, willCompleteSuccessfully());
assertQuery(format("SELECT * FROM {} WHERE SURNAME = 'foo'",
TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.returns(0, "0", 10.0, "foo")
.check();
}
@@ -333,7 +333,7 @@ public class ItBuildIndexOneNodeTest extends
BaseSqlIntegrationTest {
// Now let's check the data itself.
assertQuery(format("SELECT * FROM {} WHERE salary > 0.0", TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.returns(0, "0", 10.0)
.check();
}
diff --git
a/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItIndexAndRebalanceTest.java
b/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItIndexAndRebalanceTest.java
index 332eb53db0..c6e83b3d35 100644
---
a/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItIndexAndRebalanceTest.java
+++
b/modules/index/src/integrationTest/java/org/apache/ignite/internal/index/ItIndexAndRebalanceTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.index;
import static java.util.stream.Collectors.toList;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.partitionAssignments;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static
org.apache.ignite.internal.sql.engine.util.QueryChecker.containsIndexScan;
@@ -33,6 +32,7 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.affinity.Assignment;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -78,7 +78,7 @@ public class ItIndexAndRebalanceTest extends
BaseSqlIntegrationTest {
for (IgniteImpl node : CLUSTER.runningNodes().collect(toList())) {
// TODO: IGNITE-21710 Understand why the check fails and returns 2
rows instead of 3 from the rebalancing node
assertQuery(node, format("SELECT * FROM {} WHERE {} > 0.0",
TABLE_NAME, COLUMN_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.returnRowCount(3)
.check();
}
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
index d756c938a4..40f347c1ea 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.index;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.awaitDefaultZoneCreation;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createTestCatalogManager;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.pkIndexName;
@@ -59,6 +58,7 @@ import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import org.apache.ignite.internal.replicator.ReplicaService;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexStorage;
@@ -332,7 +332,7 @@ public class IndexAvailabilityControllerTest extends
BaseIgniteAbstractTest {
}
private void createIndex(String indexName) {
- TableTestUtils.createHashIndex(catalogManager, DEFAULT_SCHEMA_NAME,
TABLE_NAME, indexName, List.of(COLUMN_NAME), false);
+ TableTestUtils.createHashIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, TABLE_NAME, indexName, List.of(COLUMN_NAME),
false);
}
private void startBuildIndex(int indexId) {
@@ -340,7 +340,7 @@ public class IndexAvailabilityControllerTest extends
BaseIgniteAbstractTest {
}
private void dropIndex(String indexName) {
- TableTestUtils.dropIndex(catalogManager, DEFAULT_SCHEMA_NAME,
indexName);
+ TableTestUtils.dropIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
}
private int indexId(String indexName) {
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuildControllerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuildControllerTest.java
index 6a23070f4b..c7bd4f4e02 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuildControllerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuildControllerTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.index;
import static java.util.concurrent.CompletableFuture.completedFuture;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createCatalogManagerWithTestUpdateLog;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.pkIndexName;
import static
org.apache.ignite.internal.index.TestIndexManagementUtils.COLUMN_NAME;
@@ -64,6 +63,7 @@ import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.placementdriver.leases.Lease;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.index.IndexStorage;
@@ -343,7 +343,7 @@ public class IndexBuildControllerTest extends
BaseIgniteAbstractTest {
}
private void createIndex(String indexName) {
- createHashIndex(catalogManager, DEFAULT_SCHEMA_NAME, TABLE_NAME,
indexName, List.of(COLUMN_NAME), false);
+ createHashIndex(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, indexName, List.of(COLUMN_NAME), false);
}
private void startBuildingIndex(int indexId) {
@@ -355,7 +355,7 @@ public class IndexBuildControllerTest extends
BaseIgniteAbstractTest {
}
private void dropIndex(String indexName) {
- TableTestUtils.dropIndex(catalogManager, DEFAULT_SCHEMA_NAME,
indexName);
+ TableTestUtils.dropIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
}
private void setPrimaryReplicaWhichExpiresInOneSecond(
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
index 20e3438543..6303a2fcff 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.index;
import static java.util.concurrent.CompletableFuture.completedFuture;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.awaitDefaultZoneCreation;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createTestCatalogManager;
@@ -63,6 +62,7 @@ import
org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import
org.apache.ignite.internal.metastorage.server.TestRocksDbKeyValueStorage;
import org.apache.ignite.internal.schema.SchemaManager;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.engine.MvTableStorage;
import org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.table.InternalTable;
@@ -243,15 +243,15 @@ public class IndexManagerTest extends
BaseIgniteAbstractTest {
}
private void dropTable(String tableName) {
- TableTestUtils.dropTable(catalogManager, DEFAULT_SCHEMA_NAME,
tableName);
+ TableTestUtils.dropTable(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, tableName);
}
private void createIndex(String tableName, String indexName) {
- createHashIndex(catalogManager, DEFAULT_SCHEMA_NAME, tableName,
indexName, List.of(COLUMN_NAME), false);
+ createHashIndex(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME,
tableName, indexName, List.of(COLUMN_NAME), false);
}
private void dropIndex(String indexName) {
- TableTestUtils.dropIndex(catalogManager, DEFAULT_SCHEMA_NAME,
indexName);
+ TableTestUtils.dropIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
}
private CompletableFuture<Void> fireDestroyEvent() {
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
index d8992a9c19..f295d831ce 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.index;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.pkIndexName;
import static
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.AVAILABLE;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
@@ -49,6 +48,7 @@ import org.apache.ignite.internal.network.ClusterNodeImpl;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.placementdriver.leases.Lease;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.table.TableTestUtils;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.NetworkAddress;
@@ -74,7 +74,7 @@ class TestIndexManagementUtils {
static void createTable(CatalogManager catalogManager, String tableName,
String columnName) {
TableTestUtils.createTable(
catalogManager,
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
null,
tableName,
List.of(ColumnParams.builder().name(columnName).type(INT32).build()),
@@ -83,11 +83,11 @@ class TestIndexManagementUtils {
}
static void createIndex(CatalogManager catalogManager, String tableName,
String indexName, String columnName) {
- TableTestUtils.createHashIndex(catalogManager, DEFAULT_SCHEMA_NAME,
tableName, indexName, List.of(columnName), false);
+ TableTestUtils.createHashIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, tableName, indexName, List.of(columnName),
false);
}
static void dropIndex(CatalogManager catalogManager, String indexName) {
- TableTestUtils.dropIndex(catalogManager, DEFAULT_SCHEMA_NAME,
indexName);
+ TableTestUtils.dropIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
}
static int indexId(CatalogService catalogService, String indexName,
HybridClock clock) {
diff --git
a/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
b/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
index daca60ff68..c316648c55 100644
---
a/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
+++
b/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcConnection.java
@@ -64,6 +64,7 @@ import org.apache.ignite.internal.jdbc.proto.SqlStateCode;
import org.apache.ignite.internal.jdbc.proto.event.JdbcConnectResult;
import org.apache.ignite.internal.jdbc.proto.event.JdbcFinishTxResult;
import org.apache.ignite.internal.jdbc.proto.event.Response;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
@@ -74,8 +75,6 @@ public class JdbcConnection implements Connection {
/** Network timeout permission. */
private static final String SET_NETWORK_TIMEOUT_PERM = "setNetworkTimeout";
- private static final String DEFAULT_SCHEMA_NAME = "PUBLIC";
-
/** Statements modification mutex. */
private final Object stmtsMux = new Object();
@@ -192,7 +191,7 @@ public class JdbcConnection implements Connection {
holdability = HOLD_CURSORS_OVER_COMMIT;
- schema = DEFAULT_SCHEMA_NAME;
+ schema = SqlCommon.DEFAULT_SCHEMA_NAME;
client = null;
connectionId = -1;
@@ -927,7 +926,7 @@ public class JdbcConnection implements Connection {
*/
public static String normalizeSchema(String schemaName) {
if (schemaName == null || schemaName.isEmpty()) {
- return DEFAULT_SCHEMA_NAME;
+ return SqlCommon.DEFAULT_SCHEMA_NAME;
}
String res;
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
index 744d90acfa..66d8ef7754 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.runner.app;
import static java.util.stream.Collectors.toList;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.MAX_TIME_PRECISION;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.createZone;
import static org.apache.ignite.internal.table.TableTestUtils.createTable;
@@ -75,6 +74,7 @@ import org.apache.ignite.internal.schema.row.Row;
import
org.apache.ignite.internal.security.authentication.basic.BasicAuthenticationProviderChange;
import org.apache.ignite.internal.security.configuration.SecurityChange;
import org.apache.ignite.internal.security.configuration.SecurityConfiguration;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.table.RecordBinaryViewImpl;
import org.apache.ignite.internal.testframework.TestIgnitionManager;
import org.apache.ignite.internal.type.NativeTypes;
@@ -290,7 +290,7 @@ public class PlatformTestNodeRunner {
createTable(
ignite.catalogManager(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
TABLE_NAME,
List.of(
@@ -304,7 +304,7 @@ public class PlatformTestNodeRunner {
createTable(
ignite.catalogManager(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
TABLE_NAME_ALL_COLUMNS,
List.of(
@@ -334,7 +334,7 @@ public class PlatformTestNodeRunner {
createTable(
ignite.catalogManager(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
TABLE_NAME_ALL_COLUMNS_NOT_NULL,
List.of(
@@ -364,7 +364,7 @@ public class PlatformTestNodeRunner {
// TODO IGNITE-18431 remove extra table, use TABLE_NAME_ALL_COLUMNS
for SQL tests.
createTable(
ignite.catalogManager(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
TABLE_NAME_ALL_COLUMNS_SQL,
List.of(
@@ -499,7 +499,7 @@ public class PlatformTestNodeRunner {
createTable(
ignite.catalogManager(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
("tbl_" + keyColumnParams.type().name()).toUpperCase(),
List.of(keyColumnParams, valueColumnParams),
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexAvailabilityTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexAvailabilityTest.java
index 74ed32da45..f3a6ec3c3c 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexAvailabilityTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexAvailabilityTest.java
@@ -17,12 +17,12 @@
package org.apache.ignite.internal.sql.engine;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static
org.apache.ignite.internal.sql.engine.util.QueryChecker.containsIndexScan;
import org.apache.ignite.InitParametersBuilder;
import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.testframework.TestIgnitionManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -56,7 +56,7 @@ class ItIndexAvailabilityTest extends BaseSqlIntegrationTest {
sql(String.format("CREATE INDEX %s ON %s (val)", INDEX_NAME,
TABLE_NAME));
assertQuery(format("SELECT * FROM {} WHERE val = 'test'", TABLE_NAME))
- .matches(containsIndexScan(DEFAULT_SCHEMA_NAME, TABLE_NAME,
INDEX_NAME))
+ .matches(containsIndexScan(SqlCommon.DEFAULT_SCHEMA_NAME,
TABLE_NAME, INDEX_NAME))
.check();
}
}
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexDdlTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexDdlTest.java
index c61b59b7a8..39a4317305 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexDdlTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexDdlTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.sql.engine;
import static java.util.concurrent.CompletableFuture.runAsync;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static
org.apache.ignite.internal.IndexTestUtils.waitForIndexToAppearInAnyState;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.assertThrowsWithCause;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willTimeoutIn;
@@ -35,6 +34,7 @@ import
org.apache.ignite.internal.ClusterPerClassIntegrationTest;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.catalog.IndexExistsValidationException;
import org.apache.ignite.internal.catalog.IndexNotFoundValidationException;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.sql.SqlException;
import org.apache.ignite.tx.Transaction;
import org.apache.ignite.tx.TransactionOptions;
@@ -68,7 +68,7 @@ public class ItIndexDdlTest extends
ClusterPerClassIntegrationTest {
assertThrowsWithCause(
() -> tryToCreateIndex(TABLE_NAME, INDEX_NAME, true),
IndexExistsValidationException.class,
- String.format("Index with name '%s.%s' already exists",
DEFAULT_SCHEMA_NAME, INDEX_NAME)
+ String.format("Index with name '%s.%s' already exists",
SqlCommon.DEFAULT_SCHEMA_NAME, INDEX_NAME)
);
tryToCreateIndex(TABLE_NAME, INDEX_NAME, false);
@@ -85,7 +85,7 @@ public class ItIndexDdlTest extends
ClusterPerClassIntegrationTest {
assertThrowsWithCause(
() -> tryToDropIndex(INDEX_NAME, true),
IndexNotFoundValidationException.class,
- String.format("Index with name '%s.%s' not found",
DEFAULT_SCHEMA_NAME, INDEX_NAME)
+ String.format("Index with name '%s.%s' not found",
SqlCommon.DEFAULT_SCHEMA_NAME, INDEX_NAME)
);
tryToCreateIndex(TABLE_NAME, INDEX_NAME, false);
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexesSystemViewTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexesSystemViewTest.java
index cde61da68a..099c8a421c 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexesSystemViewTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItIndexesSystemViewTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.sql.engine;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor.CatalogIndexDescriptorType.HASH;
import java.util.Collection;
@@ -27,6 +26,7 @@ import org.apache.ignite.internal.catalog.CatalogManager;
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.testframework.IgniteTestUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -75,7 +75,7 @@ public class ItIndexesSystemViewTest extends
BaseSqlIntegrationTest {
index.tableId(),
TABLE_NAME,
tableDescriptor.schemaId(),
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
index.unique(),
index.indexType() == HASH ? COLUMNS :
COLUMNS_COLLATIONS,
index.status().name()
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 f19fbe2609..2d5d7d7793 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
@@ -76,6 +76,7 @@ import
org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.replicator.TablePartitionId;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.sql.ResultSetMetadataImpl;
+import org.apache.ignite.internal.sql.SqlCommon;
import
org.apache.ignite.internal.sql.configuration.distributed.SqlDistributedConfiguration;
import
org.apache.ignite.internal.sql.configuration.local.SqlLocalConfiguration;
import org.apache.ignite.internal.sql.engine.exec.ExchangeServiceImpl;
@@ -158,11 +159,8 @@ public class SqlQueryProcessor implements QueryProcessor {
/** Number of the schemas in cache. */
private static final int SCHEMA_CACHE_SIZE = 128;
- /** Name of the default schema. */
- public static final String DEFAULT_SCHEMA_NAME = "PUBLIC";
-
private static final SqlProperties DEFAULT_PROPERTIES =
SqlPropertiesHelper.newBuilder()
- .set(QueryProperty.DEFAULT_SCHEMA, DEFAULT_SCHEMA_NAME)
+ .set(QueryProperty.DEFAULT_SCHEMA, SqlCommon.DEFAULT_SCHEMA_NAME)
.set(QueryProperty.ALLOWED_QUERY_TYPES, SqlQueryType.ALL)
.set(QueryProperty.TIME_ZONE_ID, DEFAULT_TIME_ZONE_ID)
.build();
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
index 38e10d7c2e..9f603e0afa 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
@@ -26,7 +26,6 @@ import java.time.ZoneId;
import java.util.concurrent.TimeUnit;
import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.StatementBuilderImpl;
-import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
import org.apache.ignite.sql.Statement;
import org.junit.jupiter.api.Test;
@@ -89,7 +88,7 @@ public class StatementBuilderImplTest {
@Test
public void checkDefaultParameters() throws Exception {
try (Statement statement = builder.query(QUERY).build()) {
- assertThat(statement.defaultSchema(),
is(SqlQueryProcessor.DEFAULT_SCHEMA_NAME));
+ assertThat(statement.defaultSchema(),
is(SqlCommon.DEFAULT_SCHEMA_NAME));
assertThat(statement.query(), is(QUERY));
assertThat(statement.timeZoneId(), is(ZoneId.systemDefault()));
assertThat(statement.pageSize(), is(SqlCommon.DEFAULT_PAGE_SIZE));
@@ -161,13 +160,13 @@ public class StatementBuilderImplTest {
.build();
assertThat(statement1.query(), is(QUERY));
- assertThat(statement1.defaultSchema(),
is(SqlQueryProcessor.DEFAULT_SCHEMA_NAME));
+ assertThat(statement1.defaultSchema(),
is(SqlCommon.DEFAULT_SCHEMA_NAME));
assertThat(statement1.queryTimeout(TimeUnit.SECONDS), is(timeout));
assertThat(statement1.pageSize(), is(pageSize - 1));
assertThat(statement1.timeZoneId(), is(ZoneId.systemDefault()));
assertThat(statement2.query(), is(QUERY));
- assertThat(statement2.defaultSchema(),
is(SqlQueryProcessor.DEFAULT_SCHEMA_NAME));
+ assertThat(statement2.defaultSchema(),
is(SqlCommon.DEFAULT_SCHEMA_NAME));
assertThat(statement2.queryTimeout(TimeUnit.MINUTES), is(timeout));
assertThat(statement2.pageSize(), is(pageSize + 1));
assertThat(statement2.timeZoneId(), is(timeZone));
@@ -189,7 +188,7 @@ public class StatementBuilderImplTest {
assertThat(statement1.query(), is(QUERY));
assertThat(statement2.query(), is(QUERY));
- assertThat(statement1.defaultSchema(),
is(SqlQueryProcessor.DEFAULT_SCHEMA_NAME));
+ assertThat(statement1.defaultSchema(),
is(SqlCommon.DEFAULT_SCHEMA_NAME));
assertThat(statement2.defaultSchema(), is("SYSTEM"));
}
}
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 98a3de4d51..c21a5778b2 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
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.sql.engine.exec;
import static java.util.concurrent.CompletableFuture.allOf;
import static java.util.concurrent.CompletableFuture.completedFuture;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static
org.apache.ignite.internal.sql.engine.util.Commons.FRAMEWORK_CONFIG;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
@@ -84,6 +83,7 @@ import org.apache.ignite.internal.lang.RunnableX;
import org.apache.ignite.internal.metrics.MetricManagerImpl;
import org.apache.ignite.internal.network.ClusterNodeImpl;
import org.apache.ignite.internal.network.NetworkMessage;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.InternalSqlRow;
import org.apache.ignite.internal.sql.engine.NodeLeftException;
import org.apache.ignite.internal.sql.engine.QueryCancel;
@@ -175,7 +175,7 @@ public class ExecutionServiceImplTest extends
BaseIgniteAbstractTest {
.size(1_000_000)
.build();
- private final IgniteSchema schema = new IgniteSchema(DEFAULT_SCHEMA_NAME,
SCHEMA_VERSION, List.of(table));
+ private final IgniteSchema schema = new
IgniteSchema(SqlCommon.DEFAULT_SCHEMA_NAME, SCHEMA_VERSION, List.of(table));
private final List<CapturingMailboxRegistry> mailboxes = new ArrayList<>();
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/mapping/FragmentMappingTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/mapping/FragmentMappingTest.java
index 3e32ab8ba7..1ddbcc924b 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/mapping/FragmentMappingTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/mapping/FragmentMappingTest.java
@@ -30,9 +30,9 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
-import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
+import org.apache.ignite.internal.sql.SqlCommon;
import
org.apache.ignite.internal.sql.engine.exec.mapping.MappingTestRunner.TestSetup;
import org.apache.ignite.internal.sql.engine.framework.TestBuilders;
import
org.apache.ignite.internal.sql.engine.framework.TestBuilders.TableBuilder;
@@ -367,7 +367,7 @@ public class FragmentMappingTest extends
AbstractPlannerTest {
objectId += 1;
}
- IgniteSchema schema = new
IgniteSchema(CatalogManager.DEFAULT_SCHEMA_NAME, 1, dataSources);
+ IgniteSchema schema = new IgniteSchema(SqlCommon.DEFAULT_SCHEMA_NAME,
1, dataSources);
ExecutionTargetProvider executionTargetProvider =
TestBuilders.executionTargetProviderBuilder()
.useTablePartitions(true)
.addTables(table2NodeNames)
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
index 4194a187f1..edc55cd842 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestBuilders.java
@@ -77,6 +77,7 @@ import org.apache.ignite.internal.hlc.TestClockService;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.metrics.MetricManagerImpl;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
import org.apache.ignite.internal.sql.engine.exec.ExecutableTable;
import org.apache.ignite.internal.sql.engine.exec.ExecutableTableRegistry;
@@ -962,7 +963,7 @@ public class TestBuilders {
private final ClusterBuilderImpl parent;
- private final String schemaName = CatalogManager.DEFAULT_SCHEMA_NAME;
+ private final String schemaName = SqlCommon.DEFAULT_SCHEMA_NAME;
private String name;
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 77652b2df4..245df30048 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
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.sql.engine.framework;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.sql.engine.util.Commons.FRAMEWORK_CONFIG;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
@@ -37,6 +36,7 @@ import org.apache.ignite.internal.hlc.TestClockService;
import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.network.MessagingService;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.InternalSqlRow;
import org.apache.ignite.internal.sql.engine.QueryCancel;
import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
@@ -285,7 +285,7 @@ public class TestNode implements LifecycleAware {
.cancel(new QueryCancel())
.frameworkConfig(
Frameworks.newConfigBuilder(FRAMEWORK_CONFIG)
-
.defaultSchema(schemaManager.schema(Long.MAX_VALUE).getSubSchema(DEFAULT_SCHEMA_NAME))
+
.defaultSchema(schemaManager.schema(Long.MAX_VALUE).getSubSchema(SqlCommon.DEFAULT_SCHEMA_NAME))
.build()
)
.timeZoneId(SqlQueryProcessor.DEFAULT_TIME_ZONE_ID)
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 6acddeed67..d044c18473 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
@@ -75,8 +75,8 @@ import org.apache.calcite.sql2rel.InitializerContext;
import org.apache.calcite.sql2rel.SqlToRelConverter;
import org.apache.calcite.util.ImmutableBitSet;
import org.apache.calcite.util.Util;
-import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.lang.IgniteStringBuilder;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.exec.mapping.IdGenerator;
import org.apache.ignite.internal.sql.engine.exec.mapping.QuerySplitter;
import org.apache.ignite.internal.sql.engine.externalize.RelJsonReader;
@@ -680,7 +680,7 @@ public abstract class AbstractPlannerTest extends
IgniteAbstractTest {
* @return Public schema.
*/
protected static IgniteSchema createSchema(IgniteTable... tbls) {
- return createSchema(CatalogService.DEFAULT_SCHEMA_NAME, tbls);
+ return createSchema(SqlCommon.DEFAULT_SCHEMA_NAME, tbls);
}
/**
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/KeyValueModifyPlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/KeyValueModifyPlannerTest.java
index 08c79c5796..77546787d9 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/KeyValueModifyPlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/KeyValueModifyPlannerTest.java
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.calcite.rex.RexNode;
import org.apache.ignite.internal.catalog.CatalogCommand;
-import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.commands.DropTableCommand;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.framework.TestBuilders;
import org.apache.ignite.internal.sql.engine.framework.TestCluster;
import org.apache.ignite.internal.sql.engine.framework.TestNode;
@@ -73,7 +73,7 @@ public class KeyValueModifyPlannerTest extends
AbstractPlannerTest {
for (CatalogTableDescriptor table :
CLUSTER.catalogManager().tables(version)) {
commands.add(
DropTableCommand.builder()
- .schemaName(CatalogService.DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(table.name())
.build()
);
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyLookupPlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyLookupPlannerTest.java
index 843a5f1bbf..00f7bfcbc9 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyLookupPlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyLookupPlannerTest.java
@@ -29,9 +29,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.calcite.rex.RexNode;
import org.apache.ignite.internal.catalog.CatalogCommand;
-import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.commands.DropTableCommand;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.framework.TestBuilders;
import org.apache.ignite.internal.sql.engine.framework.TestCluster;
import org.apache.ignite.internal.sql.engine.framework.TestNode;
@@ -72,7 +72,7 @@ public class PrimaryKeyLookupPlannerTest extends
AbstractPlannerTest {
for (CatalogTableDescriptor table :
CLUSTER.catalogManager().tables(version)) {
commands.add(
DropTableCommand.builder()
- .schemaName(CatalogService.DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(table.name())
.build()
);
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/AbstractDdlSqlToCommandConverterTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/AbstractDdlSqlToCommandConverterTest.java
index 191503d0ef..9831167e26 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/AbstractDdlSqlToCommandConverterTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/AbstractDdlSqlToCommandConverterTest.java
@@ -32,9 +32,9 @@ import org.apache.calcite.sql.parser.SqlParser;
import org.apache.calcite.tools.Frameworks;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogCommand;
-import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.storage.UpdateEntry;
import
org.apache.ignite.internal.generated.query.calcite.sql.IgniteSqlParserImpl;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.prepare.PlanningContext;
import org.apache.ignite.internal.sql.engine.schema.IgniteSchema;
import org.apache.ignite.internal.sql.engine.util.BaseQueryContext;
@@ -63,7 +63,7 @@ class AbstractDdlSqlToCommandConverterTest extends
BaseIgniteAbstractTest {
}
static PlanningContext createContext() {
- var schemaName = CatalogService.DEFAULT_SCHEMA_NAME;
+ var schemaName = SqlCommon.DEFAULT_SCHEMA_NAME;
IgniteSchema publicSchema = new IgniteSchema(schemaName, 1, List.of());
var schema = Frameworks.createRootSchema(false).add(schemaName,
publicSchema);
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
index 0aa6f4b464..f4d8ec71ef 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.sql.engine.util;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,6 +39,7 @@ import org.apache.calcite.rex.RexNode;
import org.apache.calcite.sql.SqlExplainFormat;
import org.apache.calcite.sql.SqlExplainLevel;
import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.sql.engine.framework.TestBuilders;
import
org.apache.ignite.internal.sql.engine.framework.TestBuilders.TableBuilder;
import org.apache.ignite.internal.sql.engine.prepare.IgnitePlanner;
@@ -420,7 +420,7 @@ public class StatementChecker {
tables.add(table);
}
- return new IgniteSchema(DEFAULT_SCHEMA_NAME, 0, tables);
+ return new IgniteSchema(SqlCommon.DEFAULT_SCHEMA_NAME, 0, tables);
}
private DynamicTest shouldPass(String name, Throwable exception,
Consumer<IgniteRel> check, boolean relCheck) {
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
index 83d3577864..3d8bc388eb 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.disaster;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static org.apache.ignite.internal.table.TableTestUtils.TABLE_NAME;
import static org.apache.ignite.internal.table.TableTestUtils.getTableIdStrict;
@@ -33,6 +32,7 @@ import
org.apache.ignite.internal.ClusterPerTestIntegrationTest;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.sql.SqlCommon;
import
org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -72,7 +72,7 @@ public class ItDisasterRecoveryManagerTest extends
ClusterPerTestIntegrationTest
CompletableFuture<Void> restartPartitionsFuture =
node.disasterRecoveryManager().restartPartitions(
Set.of(node.name()),
ZONE_NAME,
- DEFAULT_SCHEMA_NAME + "." + TABLE_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME + "." + TABLE_NAME,
Set.of(partitionId)
);
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 0633e3f5be..8e963c6e34 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -23,7 +23,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toSet;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_TEST_PROFILE_NAME;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.REBALANCE_SCHEDULER_POOL_SIZE;
import static
org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.STABLE_ASSIGNMENTS_PREFIX;
@@ -167,6 +166,7 @@ import
org.apache.ignite.internal.rest.configuration.RestConfiguration;
import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModules;
import org.apache.ignite.internal.storage.StorageException;
@@ -1552,7 +1552,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
TableTestUtils.createTable(
node.catalogManager,
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
zoneName,
tableName,
List.of(
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/CatalogStorageIndexDescriptorSupplierTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/CatalogStorageIndexDescriptorSupplierTest.java
index 0c267ac611..53578a6925 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/CatalogStorageIndexDescriptorSupplierTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/CatalogStorageIndexDescriptorSupplierTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.table.distributed;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createCatalogManagerWithTestUpdateLog;
import static
org.apache.ignite.internal.hlc.TestClockService.TEST_MAX_CLOCK_SKEW_MILLIS;
import static
org.apache.ignite.internal.replicator.ReplicatorConstants.DEFAULT_IDLE_SAFE_TIME_PROPAGATION_PERIOD_MILLISECONDS;
@@ -46,6 +45,7 @@ import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lowwatermark.TestLowWatermark;
import
org.apache.ignite.internal.schema.configuration.LowWatermarkConfiguration;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
@@ -122,7 +122,7 @@ class CatalogStorageIndexDescriptorSupplierTest extends
BaseIgniteAbstractTest {
int indexId = createIndex();
CatalogCommand dropIndexCommand = DropIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.indexName(INDEX_NAME)
.build();
@@ -160,7 +160,7 @@ class CatalogStorageIndexDescriptorSupplierTest extends
BaseIgniteAbstractTest {
int indexId = createIndex();
CatalogCommand dropIndexCommand = DropIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.indexName(INDEX_NAME)
.build();
@@ -187,13 +187,13 @@ class CatalogStorageIndexDescriptorSupplierTest extends
BaseIgniteAbstractTest {
List<CatalogCommand> commands = List.of(
CreateTableCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(TABLE_NAME)
.columns(List.of(ColumnParams.builder().name("foo").type(ColumnType.INT32).build()))
.primaryKey(primaryKey)
.build(),
CreateHashIndexCommand.builder()
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.tableName(TABLE_NAME)
.indexName(INDEX_NAME)
.columns(List.of("foo"))
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
index 3cd7d40b15..29c997c860 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.table.distributed;
import static java.util.concurrent.CompletableFuture.completedFuture;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createTestCatalogManager;
import static org.apache.ignite.internal.table.TableTestUtils.createHashIndex;
@@ -96,6 +95,7 @@ import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaUtils;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModule;
import org.apache.ignite.internal.storage.DataStorageModules;
@@ -418,7 +418,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
private void createTable(String tableName) {
TableTestUtils.createTable(
catalogManager,
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
tableName,
List.of(
@@ -434,15 +434,15 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
}
private void dropTable(String tableName) {
- TableTestUtils.dropTable(catalogManager, DEFAULT_SCHEMA_NAME,
tableName);
+ TableTestUtils.dropTable(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, tableName);
}
private void createIndex(String tableName, String indexName) {
- createHashIndex(catalogManager, DEFAULT_SCHEMA_NAME, tableName,
indexName, List.of(INDEXED_COLUMN_NAME), false);
+ createHashIndex(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME,
tableName, indexName, List.of(INDEXED_COLUMN_NAME), false);
}
private void dropIndex(String indexName) {
- TableTestUtils.dropIndex(catalogManager, DEFAULT_SCHEMA_NAME,
indexName);
+ TableTestUtils.dropIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
}
private static PersistentPageMemoryDataStorageModule
createDataStorageModule() {
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 ac04b091cd..7a28e3af90 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
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.table.distributed;
import static java.util.concurrent.CompletableFuture.completedFuture;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_CREATE;
import static
org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_DROP;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.assertThrowsWithCause;
@@ -115,6 +114,7 @@ import org.apache.ignite.internal.schema.SchemaManager;
import org.apache.ignite.internal.schema.SchemaUtils;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import
org.apache.ignite.internal.schema.configuration.StorageUpdateConfiguration;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModules;
import org.apache.ignite.internal.storage.MvPartitionStorage;
@@ -888,7 +888,7 @@ public class TableManagerTest extends IgniteAbstractTest {
private void createTable(String tableName) {
TableTestUtils.createTable(
catalogManager,
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
ZONE_NAME,
tableName,
List.of(
@@ -900,7 +900,7 @@ public class TableManagerTest extends IgniteAbstractTest {
}
private void dropTable(String tableName) {
- TableTestUtils.dropTable(catalogManager, DEFAULT_SCHEMA_NAME,
tableName);
+ TableTestUtils.dropTable(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, tableName);
}
private Collection<CatalogTableDescriptor> allTableDescriptors() {
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableUtilsTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableUtilsTest.java
index 414dc14731..5f350065a7 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableUtilsTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableUtilsTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.table.distributed;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.pkIndexName;
import static org.apache.ignite.internal.hlc.HybridTimestamp.hybridTimestamp;
import static org.apache.ignite.internal.table.TableTestUtils.COLUMN_NAME;
@@ -52,6 +51,7 @@ import org.apache.ignite.internal.catalog.CatalogTestUtils;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
@@ -106,7 +106,7 @@ public class TableUtilsTest extends IgniteAbstractTest {
}
for (String indexName : List.of(indexName3, indexName4)) {
- dropIndex(catalogManager, DEFAULT_SCHEMA_NAME, indexName);
+ dropIndex(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME,
indexName);
}
removeIndex(catalogManager, indexId4);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooserTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooserTest.java
index 4af51985c2..35acee97de 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooserTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooserTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.table.distributed.raft.snapshot;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.AVAILABLE;
import static
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.BUILDING;
import static
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.REGISTERED;
@@ -55,6 +54,7 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lowwatermark.TestLowWatermark;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.internal.table.TableTestUtils;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.junit.jupiter.api.AfterEach;
@@ -443,7 +443,7 @@ public class FullStateTransferIndexChooserTest extends
BaseIgniteAbstractTest {
}
private void dropIndex(String indexName) {
- TableTestUtils.dropIndex(catalogManager, DEFAULT_SCHEMA_NAME,
indexName);
+ TableTestUtils.dropIndex(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, indexName);
}
private int latestCatalogVersion() {
@@ -475,7 +475,7 @@ public class FullStateTransferIndexChooserTest extends
BaseIgniteAbstractTest {
}
private void dropTable() {
- TableTestUtils.dropTable(catalogManager, DEFAULT_SCHEMA_NAME,
TABLE_NAME);
+ TableTestUtils.dropTable(catalogManager,
SqlCommon.DEFAULT_SCHEMA_NAME, TABLE_NAME);
}
private static List<Integer> indexIds(List<IndexIdAndTableVersion>
indexIdAndTableVersionList) {
@@ -491,7 +491,7 @@ public class FullStateTransferIndexChooserTest extends
BaseIgniteAbstractTest {
CatalogCommand command = AlterTableAddColumnCommand.builder()
.tableName(TABLE_NAME)
- .schemaName(DEFAULT_SCHEMA_NAME)
+ .schemaName(SqlCommon.DEFAULT_SCHEMA_NAME)
.columns(List.of(columnParams))
.build();
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java
index 8093736cb7..daa0ca1ba5 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/TableTestUtils.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.table;
-import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.pkIndexName;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.apache.ignite.sql.ColumnType.INT32;
@@ -41,6 +40,7 @@ import
org.apache.ignite.internal.catalog.commands.TableHashPrimaryKey;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
+import org.apache.ignite.internal.sql.SqlCommon;
import org.apache.ignite.sql.ColumnType;
import org.jetbrains.annotations.Nullable;
@@ -112,7 +112,7 @@ public class TableTestUtils {
* @param tableName Table name.
*/
public static void dropSimpleTable(CatalogManager catalogManager, String
tableName) {
- dropTable(catalogManager, DEFAULT_SCHEMA_NAME, tableName);
+ dropTable(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME, tableName);
}
/**
@@ -292,7 +292,7 @@ public class TableTestUtils {
}
/**
- * Creates a simple table in {@link CatalogService#DEFAULT_SCHEMA_NAME}
and single
+ * Creates a simple table in {@link SqlCommon#DEFAULT_SCHEMA_NAME} and
single
* {@link #COLUMN_NAME column} of type {@link ColumnType#INT32} in default
distribution zone.
*
* @param catalogManager Catalog name.
@@ -301,7 +301,7 @@ public class TableTestUtils {
public static void createSimpleTable(CatalogManager catalogManager, String
tableName) {
createTable(
catalogManager,
- DEFAULT_SCHEMA_NAME,
+ SqlCommon.DEFAULT_SCHEMA_NAME,
null,
tableName,
List.of(ColumnParams.builder().name(COLUMN_NAME).type(INT32).build()),
@@ -317,7 +317,7 @@ public class TableTestUtils {
* @param indexName Index name.
*/
public static void createSimpleHashIndex(CatalogManager catalogManager,
String tableName, String indexName) {
- createHashIndex(catalogManager, DEFAULT_SCHEMA_NAME, tableName,
indexName, List.of(COLUMN_NAME), false);
+ createHashIndex(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME,
tableName, indexName, List.of(COLUMN_NAME), false);
}
/**
@@ -374,6 +374,6 @@ public class TableTestUtils {
* @param columnType Column type.
*/
public static void addColumnToSimpleTable(CatalogManager catalogManager,
String tableName, String columnName, ColumnType columnType) {
- addColumnToTable(catalogManager, DEFAULT_SCHEMA_NAME, tableName,
columnName, columnType);
+ addColumnToTable(catalogManager, SqlCommon.DEFAULT_SCHEMA_NAME,
tableName, columnName, columnType);
}
}
