This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-25135-2 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 5527f3893687626af1b198fcef2cd89f970e6dca Author: amashenkov <[email protected]> AuthorDate: Mon Dec 15 15:22:52 2025 +0300 Avoid using deprecated methods. --- .../sql/engine/externalize/RelOptSchemaImpl.java | 4 +- .../sql/engine/prepare/PrepareServiceImpl.java | 2 +- .../sql/engine/schema/SqlSchemaManagerImpl.java | 5 ++- .../engine/exec/mapping/FragmentMappingTest.java | 2 +- .../engine/framework/PredefinedSchemaManager.java | 8 +++- .../sql/engine/planner/AbstractPlannerTest.java | 4 +- .../planner/PartitionPruningMetadataTest.java | 4 +- .../sql/engine/planner/PlannerTimeoutTest.java | 2 +- .../engine/schema/SqlSchemaManagerImplTest.java | 44 +++++++++++----------- 9 files changed, 40 insertions(+), 35 deletions(-) diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelOptSchemaImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelOptSchemaImpl.java index f402f905501..86392224cc7 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelOptSchemaImpl.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelOptSchemaImpl.java @@ -62,13 +62,13 @@ class RelOptSchemaImpl implements RelOptSchema { throw new SqlException(Common.INTERNAL_ERR, "Expected name of exactly two parts, but was " + names); } - SchemaPlus schema = root.getSubSchema(names.get(0)); + SchemaPlus schema = root.subSchemas().get(names.get(0)); if (schema == null) { throw new SqlException(Common.INTERNAL_ERR, "Schema with name \"" + names.get(0) + "\" not found"); } - Table table = schema.getTable(names.get(1)); + Table table = schema.tables().get(names.get(1)); if (table == null) { throw new SqlException(Common.INTERNAL_ERR, "Table with name " + names + " not found"); diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java index 1beaffb7784..584f3099ad8 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/PrepareServiceImpl.java @@ -400,7 +400,7 @@ public class PrepareServiceImpl implements PrepareService { assert rootSchema != null : "Root schema does not exist"; SchemaPlus schemaPlus = rootSchema.root(); - SchemaPlus defaultSchema = schemaPlus.getSubSchema(schemaName); + SchemaPlus defaultSchema = schemaPlus.subSchemas().get(schemaName); // If default schema does not exist or misconfigured, we should use the root schema as default one // because there is no other schema for the validator to use. if (defaultSchema == null) { diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java index 0f0e3c41e14..a8ce4668786 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java @@ -39,6 +39,7 @@ import org.apache.calcite.rel.core.TableScan; import org.apache.calcite.rel.hint.RelHint; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.lookup.LikePattern; import org.apache.calcite.tools.Frameworks; import org.apache.calcite.util.ImmutableIntList; import org.apache.ignite.internal.catalog.Catalog; @@ -154,8 +155,8 @@ public class SqlSchemaManagerImpl implements SqlSchemaManager { if (rootSchema != null) { SchemaPlus schemaPlus = rootSchema.root(); - for (String name : schemaPlus.getSubSchemaNames()) { - SchemaPlus subSchema = schemaPlus.getSubSchema(name); + for (String name : schemaPlus.subSchemas().getNames(LikePattern.any())) { + SchemaPlus subSchema = schemaPlus.subSchemas().get(name); assert subSchema != null : name; 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 596dfc04c38..ebb8d25d912 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 @@ -350,7 +350,7 @@ public class FragmentMappingTest extends AbstractPlannerTest { try { PlanningContext ctx = PlanningContext.builder() .frameworkConfig(newConfigBuilder(FRAMEWORK_CONFIG) - .defaultSchema(createRootSchema(List.of(schema)).getSubSchema(schema.getName())) + .defaultSchema(createRootSchema(List.of(schema)).subSchemas().get(schema.getName())) .build()) .defaultSchemaName(schema.getName()) .query(sqlStmt) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/PredefinedSchemaManager.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/PredefinedSchemaManager.java index 3d4b18406cb..9c60c249ca4 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/PredefinedSchemaManager.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/PredefinedSchemaManager.java @@ -27,6 +27,9 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.CompletableFuture; import org.apache.calcite.schema.SchemaPlus; +import org.apache.calcite.schema.Table; +import org.apache.calcite.schema.lookup.LikePattern; +import org.apache.calcite.schema.lookup.Lookup; import org.apache.calcite.tools.Frameworks; import org.apache.ignite.internal.sql.engine.schema.IgniteSchema; import org.apache.ignite.internal.sql.engine.schema.IgniteSchemas; @@ -60,9 +63,10 @@ public class PredefinedSchemaManager implements SqlSchemaManager { for (IgniteSchema schema : schemas) { schemaPlus.add(schema.getName(), schema); + Lookup<Table> tables = schema.tables(); tableById.putAll( - schema.getTableNames().stream() - .map(schema::getTable) + tables.getNames(LikePattern.any()).stream() + .map(tables::get) .map(IgniteTable.class::cast) .collect(toIntMapCollector(IgniteTable::id, identity())) ); 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 5bb7e3869d7..088861ee786 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 @@ -277,10 +277,10 @@ public abstract class AbstractPlannerTest extends IgniteAbstractTest { } SchemaPlus rootSchema = createRootSchema(schemas); - SchemaPlus defaultSchema = rootSchema.getSubSchema(DEFAULT_SCHEMA); + SchemaPlus defaultSchema = rootSchema.subSchemas().get(DEFAULT_SCHEMA); if (defaultSchema == null && !schemas.isEmpty()) { - defaultSchema = rootSchema.getSubSchema(schemas.iterator().next().getName()); + defaultSchema = rootSchema.subSchemas().get(schemas.iterator().next().getName()); } assertNotNull(defaultSchema); diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PartitionPruningMetadataTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PartitionPruningMetadataTest.java index d9dd7fbf256..a07e006aab9 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PartitionPruningMetadataTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PartitionPruningMetadataTest.java @@ -553,12 +553,12 @@ public class PartitionPruningMetadataTest extends AbstractPlannerTest { } List<Integer> colocationKeys() { - IgniteTable table = (IgniteTable) schema.getTable("T"); + IgniteTable table = (IgniteTable) schema.tables().get("T"); return table.distribution().getKeys(); } List<String> columnNames() { - IgniteTable table = (IgniteTable) schema.getTable("T"); + IgniteTable table = (IgniteTable) schema.tables().get("T"); List<String> names = new ArrayList<>(); TableDescriptor tableDescriptor = table.descriptor(); diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTimeoutTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTimeoutTest.java index a4c3429da5a..14d657de343 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTimeoutTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTimeoutTest.java @@ -126,7 +126,7 @@ public class PlannerTimeoutTest extends AbstractPlannerTest { PlanningContext ctx = PlanningContext.builder() .plannerTimeout(plannerTimeout) .frameworkConfig(newConfigBuilder(FRAMEWORK_CONFIG) - .defaultSchema(createRootSchema(List.of(schema)).getSubSchema(schema.getName())) + .defaultSchema(createRootSchema(List.of(schema)).subSchemas().get(schema.getName())) .build()) .defaultSchemaName(schema.getName()) .query(sql) diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImplTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImplTest.java index 06c88c389f0..5ad8adcf213 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImplTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImplTest.java @@ -167,8 +167,8 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - assertNotNull(rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME)); - assertNotNull(rootSchema.getSubSchema(SYSTEM_SCHEMA_NAME)); + assertNotNull(rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME)); + assertNotNull(rootSchema.subSchemas().get(SYSTEM_SCHEMA_NAME)); } /** Basic schema with several tables. */ @@ -187,7 +187,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteSchema schema = unwrapSchema(schemaPlus); @@ -204,7 +204,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { CatalogZoneDescriptor zoneDescriptor = catalogManager.catalog(versionAfter).zone(zoneId); assertNotNull(zoneDescriptor, "Zone does not exist: " + zoneId); - Table table = schema.getTable(tableDescriptor.name()); + Table table = schema.tables().get(tableDescriptor.name()); assertThat(table, notNullValue()); IgniteTable igniteTable = assertInstanceOf(IgniteTable.class, table); @@ -246,11 +246,11 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteSchema schema = unwrapSchema(schemaPlus); - Table table = schema.getTable("T"); + Table table = schema.tables().get("T"); assertNotNull(table); IgniteTable igniteTable = assertInstanceOf(IgniteTable.class, table); @@ -284,7 +284,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteTable table = getTable(unwrapSchema(schemaPlus), "TEST"); @@ -353,7 +353,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteTable table = getTable(unwrapSchema(schemaPlus), "TEST"); @@ -405,7 +405,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteTable table = getTable(unwrapSchema(schemaPlus), "TEST"); @@ -466,7 +466,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); { @@ -517,7 +517,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index = findIndex(unwrapSchema(schemaPlus), "T1", "VAL1_IDX"); @@ -537,7 +537,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index = findIndex(unwrapSchema(schemaPlus), "T1", "VAL1_IDX"); @@ -571,7 +571,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index = findIndex(unwrapSchema(schemaPlus), "T1", "VAL1_IDX"); @@ -607,7 +607,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index1 = findIndex(unwrapSchema(schemaPlus), "T1", "IDX1"); @@ -630,7 +630,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index = findIndex(unwrapSchema(schemaPlus), "T1", "IDX1"); @@ -658,7 +658,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index = findIndex(unwrapSchema(schemaPlus), "T1", "IDX2"); @@ -696,7 +696,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(PUBLIC_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(PUBLIC_SCHEMA_NAME); assertNotNull(schemaPlus); IgniteIndex index1 = findIndex(unwrapSchema(schemaPlus), "T1", "IDX1"); @@ -763,7 +763,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(SYSTEM_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(SYSTEM_SCHEMA_NAME); assertNotNull(schemaPlus); { @@ -804,7 +804,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { assertNotNull(schemas); SchemaPlus rootSchema = schemas.root(); - SchemaPlus schemaPlus = rootSchema.getSubSchema(SYSTEM_SCHEMA_NAME); + SchemaPlus schemaPlus = rootSchema.subSchemas().get(SYSTEM_SCHEMA_NAME); assertNotNull(schemaPlus); CatalogSchemaDescriptor schemaDescriptor = catalogManager.catalog(versionAfter).schema(SYSTEM_SCHEMA_NAME); @@ -853,7 +853,7 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { } private static IgniteSystemView getSystemView(IgniteSchema schema, String name) { - Table systemViewTable = schema.getTable(name); + Table systemViewTable = schema.tables().get(name); assertNotNull(systemViewTable); IgniteSystemView systemView = assertInstanceOf(IgniteSystemView.class, systemViewTable); @@ -869,13 +869,13 @@ public class SqlSchemaManagerImplTest extends BaseIgniteAbstractTest { } private static IgniteTable getTable(IgniteSchema schema, String name) { - IgniteTable table = (IgniteTable) schema.getTable(name); + IgniteTable table = (IgniteTable) schema.tables().get(name); assertNotNull(table); return table; } private static @Nullable IgniteIndex findIndex(IgniteSchema schema, String tableName, String indexName) { - IgniteTable table = (IgniteTable) schema.getTable(tableName); + IgniteTable table = (IgniteTable) schema.tables().get(tableName); assertNotNull(table); return table.indexes().get(indexName); }
