@@ -331,20 +331,15 @@ impl CatalogController {
331
331
}
332
332
333
333
// indexes.
334
- let ( index_ids, mut table_ids) : ( Vec < IndexId > , Vec < TableId > ) =
335
- if table. table_type == TableType :: Table {
336
- Index :: find ( )
337
- . select_only ( )
338
- . columns ( [ index:: Column :: IndexId , index:: Column :: IndexTableId ] )
339
- . filter ( index:: Column :: PrimaryTableId . eq ( object_id) )
340
- . into_tuple :: < ( IndexId , TableId ) > ( )
341
- . all ( & txn)
342
- . await ?
343
- . into_iter ( )
344
- . unzip ( )
345
- } else {
346
- ( vec ! [ ] , vec ! [ ] )
347
- } ;
334
+ let ( index_ids, mut table_ids) : ( Vec < IndexId > , Vec < TableId > ) = Index :: find ( )
335
+ . select_only ( )
336
+ . columns ( [ index:: Column :: IndexId , index:: Column :: IndexTableId ] )
337
+ . filter ( index:: Column :: PrimaryTableId . eq ( object_id) )
338
+ . into_tuple :: < ( IndexId , TableId ) > ( )
339
+ . all ( & txn)
340
+ . await ?
341
+ . into_iter ( )
342
+ . unzip ( ) ;
348
343
relations. push ( PbRelationInfo :: Table ( ObjectModel ( table, obj) . into ( ) ) ) ;
349
344
350
345
// internal tables.
@@ -501,8 +496,7 @@ impl CatalogController {
501
496
. await ?
502
497
. ok_or_else ( || MetaError :: catalog_id_not_found ( "table" , object_id) ) ?;
503
498
check_relation_name_duplicate ( & table. name , database_id, new_schema, & txn) . await ?;
504
- let ( associated_src_id, table_type) =
505
- ( table. optional_associated_source_id , table. table_type ) ;
499
+ let associated_src_id = table. optional_associated_source_id ;
506
500
507
501
let mut obj = obj. into_active_model ( ) ;
508
502
obj. schema_id = Set ( Some ( new_schema) ) ;
@@ -531,24 +525,20 @@ impl CatalogController {
531
525
let ( index_ids, ( index_names, mut table_ids) ) : (
532
526
Vec < IndexId > ,
533
527
( Vec < String > , Vec < TableId > ) ,
534
- ) = if table_type == TableType :: Table {
535
- Index :: find ( )
536
- . select_only ( )
537
- . columns ( [
538
- index:: Column :: IndexId ,
539
- index:: Column :: Name ,
540
- index:: Column :: IndexTableId ,
541
- ] )
542
- . filter ( index:: Column :: PrimaryTableId . eq ( object_id) )
543
- . into_tuple :: < ( IndexId , String , TableId ) > ( )
544
- . all ( & txn)
545
- . await ?
546
- . into_iter ( )
547
- . map ( |( id, name, t_id) | ( id, ( name, t_id) ) )
548
- . unzip ( )
549
- } else {
550
- ( vec ! [ ] , ( vec ! [ ] , vec ! [ ] ) )
551
- } ;
528
+ ) = Index :: find ( )
529
+ . select_only ( )
530
+ . columns ( [
531
+ index:: Column :: IndexId ,
532
+ index:: Column :: Name ,
533
+ index:: Column :: IndexTableId ,
534
+ ] )
535
+ . filter ( index:: Column :: PrimaryTableId . eq ( object_id) )
536
+ . into_tuple :: < ( IndexId , String , TableId ) > ( )
537
+ . all ( & txn)
538
+ . await ?
539
+ . into_iter ( )
540
+ . map ( |( id, name, t_id) | ( id, ( name, t_id) ) )
541
+ . unzip ( ) ;
552
542
553
543
// internal tables.
554
544
let internal_tables: Vec < TableId > = Table :: find ( )
0 commit comments