This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-26840 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit e456fe65c11fb992eae679d14f34963419a402e8 Author: AMashenkov <[email protected]> AuthorDate: Thu Jan 22 19:33:30 2026 +0300 wip --- .../catalog/systemviews/TablesSystemViewProvider.java | 6 +++--- .../prepare/ddl/DdlSqlToCommandConverterTest.java | 17 +++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java index 25088dc1f98..be21817ab9b 100644 --- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java +++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/systemviews/TablesSystemViewProvider.java @@ -162,16 +162,16 @@ public class TablesSystemViewProvider implements CatalogSystemViewProvider { } int columnOrdinal() { - return tableDescriptor.columnIndex(columnDescriptor.name()); + return tableDescriptor.columnIndexById(columnDescriptor.id()); } @Nullable Integer pkColumnOrdinal() { - int idx = tableDescriptor.primaryKeyColumnNames().indexOf(columnDescriptor.name()); + int idx = tableDescriptor.primaryKeyColumns().indexOf(columnDescriptor.id()); return idx >= 0 ? idx : null; } @Nullable Integer colocationColumnOrdinal() { - int idx = tableDescriptor.colocationColumnNames().indexOf(columnDescriptor.name()); + int idx = tableDescriptor.colocationColumns().indexOf(columnDescriptor.id()); return idx >= 0 ? idx : null; } } diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverterTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverterTest.java index 5afb6934c60..ba01be975ed 100644 --- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverterTest.java +++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverterTest.java @@ -39,10 +39,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -50,6 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import it.unimi.dsi.fastutil.ints.IntList; import java.math.BigDecimal; import java.time.Duration; import java.time.LocalDate; @@ -204,15 +205,7 @@ public class DdlSqlToCommandConverterTest extends AbstractDdlSqlToCommandConvert ) ); - assertThat( - tblDesc.primaryKeyColumnNames(), - hasSize(1) - ); - - assertThat( - tblDesc.primaryKeyColumnNames(), - hasItem(Commons.IMPLICIT_PK_COL_NAME) - ); + assertThat(tblDesc.primaryKeyColumns(), contains(0)); assertThat(idxEntry.descriptor().indexType(), is(CatalogIndexDescriptorType.HASH)); } @@ -242,7 +235,7 @@ public class DdlSqlToCommandConverterTest extends AbstractDdlSqlToCommandConvert NewIndexEntry idxEntry = (NewIndexEntry) entries.get(1); assertThat(idxEntry.descriptor().indexType(), is(CatalogIndexDescriptorType.SORTED)); - assertThat(tblEntry.descriptor().primaryKeyColumnNames(), equalTo(List.of("ID"))); + assertThat(tblEntry.descriptor().primaryKeyColumns(), equalTo(IntList.of(0))); assertThat(((CatalogSortedIndexDescriptor) idxEntry.descriptor()).columns().get(0).collation(), is(collation)); } @@ -283,7 +276,7 @@ public class DdlSqlToCommandConverterTest extends AbstractDdlSqlToCommandConvert assertThat(idxEntry.descriptor().indexType(), is(CatalogIndexDescriptorType.HASH)); assertThat(idxEntry.descriptor(), Matchers.instanceOf(CatalogHashIndexDescriptor.class)); - assertThat(tblEntry.descriptor().primaryKeyColumnNames(), equalTo(List.of("ID"))); + assertThat(tblEntry.descriptor().primaryKeyColumns(), equalTo(IntList.of(0))); } @Test
