fix: correct key columns order (#1478)

Author: astandrik

src/containers/Tenant/Schema/SchemaViewer/columns.tsx

@@ -8,7 +8,7 @@ export const SCHEMA_COLUMNS_WIDTH_LS_KEY = 'schemaTableColumnsWidth';
 export const SCHEMA_TABLE_COLUMS_IDS = {
     id: 'id',
     name: 'name',
-    isKeyColumn: 'isKeyColumn',
+    keyColumnIndex: 'keyColumnIndex',
     type: 'type',
     notNull: 'notNull',
     autoIncrement: 'autoIncrement',

src/containers/Tenant/Schema/SchemaViewer/prepareData.ts

@@ -48,7 +48,7 @@ function prepareRowTableSchema(data: TTableDescription = {}): SchemaData[] {
     const preparedColumns = Columns?.map((column) => {
         const {Id, Name, NotNull, Type, Family, DefaultFromSequence, DefaultFromLiteral} = column;
 
-        const isKeyColumn = Boolean(KeyColumnIds?.find((keyColumnId) => keyColumnId === Id));
+        const keyColumnIndex = KeyColumnIds?.findIndex((keyColumnId) => keyColumnId === Id) ?? -1;
 
         const familyName = Family ? families[Family].Name : undefined;
         const prefferedPoolKind = Family
@@ -59,7 +59,7 @@ function prepareRowTableSchema(data: TTableDescription = {}): SchemaData[] {
         return {
             id: Id,
             name: Name,
-            isKeyColumn,
+            keyColumnIndex,
             type: Type,
             notNull: NotNull,
             autoIncrement: Boolean(DefaultFromSequence),
@@ -69,8 +69,8 @@ function prepareRowTableSchema(data: TTableDescription = {}): SchemaData[] {
             columnCodec,
         };
     });
-    const keyColumns = preparedColumns?.filter((column) => column.isKeyColumn) || [];
-    const otherColumns = preparedColumns?.filter((column) => !column.isKeyColumn) || [];
+    const keyColumns = preparedColumns?.filter((column) => column.keyColumnIndex !== -1) || [];
+    const otherColumns = preparedColumns?.filter((column) => column.keyColumnIndex === -1) || [];
 
     return [...keyColumns, ...otherColumns];
 }
@@ -92,32 +92,31 @@ function prepareExternalTableSchema(data: TExternalTableDescription = {}): Schem
 
 function prepareColumnTableSchema(data: TColumnTableDescription = {}): SchemaData[] {
     const {Schema = {}, Sharding = {}} = data;
-    const {Columns, KeyColumnNames} = Schema;
+    const {Columns, KeyColumnIds} = Schema;
     const {HashSharding = {}} = Sharding;
     const {Columns: HashColumns = []} = HashSharding;
 
     const preparedColumns = Columns?.map((column) => {
         const {Id, Name, Type, NotNull} = column;
 
-        const isKeyColumn = Boolean(
-            KeyColumnNames?.find((keyColumnName) => keyColumnName === Name),
-        );
+        const keyColumnIndex = KeyColumnIds?.findIndex((keyColumnId) => keyColumnId === Id) ?? -1;
+
         const isPartitioningKeyColumn = Boolean(
             HashColumns?.find((hashColumnName) => hashColumnName === Name),
         );
 
         return {
             id: Id,
             name: Name,
-            isKeyColumn,
+            keyColumnIndex,
             isPartitioningKeyColumn,
             type: Type,
             notNull: NotNull,
         };
     });
 
-    const keyColumns = preparedColumns?.filter((column) => column.isKeyColumn) || [];
-    const otherColumns = preparedColumns?.filter((column) => !column.isKeyColumn) || [];
+    const keyColumns = preparedColumns?.filter((column) => column.keyColumnIndex !== -1) || [];
+    const otherColumns = preparedColumns?.filter((column) => column.keyColumnIndex === -1) || [];
 
     return [...keyColumns, ...otherColumns];
 }

src/containers/Tenant/Schema/SchemaViewer/types.ts

@@ -3,7 +3,7 @@ import type {Column} from '@gravity-ui/react-data-table';
 export interface SchemaData {
     id?: number;
     name?: string;
-    isKeyColumn?: boolean;
+    keyColumnIndex?: number;
     isPartitioningKeyColumn?: boolean;
     type?: string;
     notNull?: boolean;

src/containers/Tenant/Schema/SchemaViewer/utils.ts

@@ -7,5 +7,8 @@ export function getPartitioningKeys(tableData: SchemaData[]): string[] {
 }
 
 export function getPrimaryKeys(tableData: SchemaData[]): string[] {
-    return tableData.filter((row) => row.isKeyColumn && row.name).map((row) => row.name!);
+    return tableData
+        .filter((row) => row.keyColumnIndex !== undefined && row.keyColumnIndex !== -1 && row.name)
+        .sort((column1, column2) => column1.keyColumnIndex! - column2.keyColumnIndex!)
+        .map((row) => row.name!);
 }

src/types/api/schema/columnEntity.ts

@@ -75,6 +75,7 @@ interface TTtl {
 interface TColumnTableSchema {
     Columns?: TOlapColumnDescription[];
     KeyColumnNames?: string[];
+    KeyColumnIds?: number[];
     Engine?: EColumnTableEngine;
     NextColumnId?: number;
 

src/types/api/schema/tableIndex.ts

@@ -8,6 +8,8 @@ export interface TIndexDescription {
 
     KeyColumnNames?: string[];
 
+    KeyColumnIds?: number[];
+
     /** uint64 */
     SchemaVersion?: string;