This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-22945 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit bce196b70871d3dc796215e4b7a1c82ad6cdca11 Author: amashenkov <[email protected]> AuthorDate: Wed Aug 21 19:10:45 2024 +0300 drop redundant method. --- .../internal/catalog/descriptors/CatalogTableDescriptor.java | 12 ------------ .../org/apache/ignite/internal/catalog/CatalogTableTest.java | 2 +- .../ignite/internal/sql/engine/schema/IgniteIndex.java | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogTableDescriptor.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogTableDescriptor.java index 2efed95c55..2165ac2f5f 100644 --- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogTableDescriptor.java +++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogTableDescriptor.java @@ -165,18 +165,6 @@ public class CatalogTableDescriptor extends CatalogObjectDescriptor { ); } - /** - * Returns column descriptor for column with given name. - */ - public CatalogTableColumnDescriptor columnDescriptor(String columnName) { - Entry<Integer, CatalogTableColumnDescriptor> column = columnsMap.get(columnName); - if (column != null) { - return column.getValue(); - } else { - return null; - } - } - /** * Returns an identifier of a schema this table descriptor belongs to. */ diff --git a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java index 826057af1a..5aaa6d181e 100644 --- a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java +++ b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java @@ -167,7 +167,7 @@ public class CatalogTableTest extends BaseCatalogManagerTest { assertTrue(pkIndex.unique()); assertEquals(AVAILABLE, pkIndex.status()); - CatalogTableColumnDescriptor desc = table.columnDescriptor("key1"); + CatalogTableColumnDescriptor desc = table.column("key1"); assertNotNull(desc); // INT32 key assertThat(desc.precision(), is(DEFAULT_PRECISION)); diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java index 763820b4d0..8684e11e8f 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/IgniteIndex.java @@ -195,7 +195,7 @@ public class IgniteIndex { List<RelFieldCollation> fieldCollations = new ArrayList<>(columns.size()); for (String columnName : columns) { - CatalogTableColumnDescriptor tableColumn = tableDescriptor.columnDescriptor(columnName); + CatalogTableColumnDescriptor tableColumn = tableDescriptor.column(columnName); int fieldIndex = tableDescriptor.columns().indexOf(tableColumn); fieldCollations.add(new RelFieldCollation(fieldIndex, Direction.CLUSTERED, NullDirection.UNSPECIFIED));
