fix

Author: asmyasnikov

internal/table/session.go

@@ -413,9 +413,9 @@ func (s *session) DescribeTable(
 		var typ options.IndexType
 		switch idx.Type.(type) {
 		case *Ydb_Table.TableIndexDescription_GlobalAsyncIndex:
-			typ = options.GlobalAsyncIndex()
+			typ = options.IndexTypeGlobalAsync
 		case *Ydb_Table.TableIndexDescription_GlobalIndex:
-			typ = options.GlobalIndex()
+			typ = options.IndexTypeGlobal
 		}
 		indexes[i] = options.IndexDescription{
 			Name:         idx.GetName(),

table/example_test.go

@@ -80,7 +80,7 @@ func Example_createTable() {
 				),
 				options.WithIndex("idx_series_title",
 					options.WithIndexColumns("title"),
-					options.WithIndexType(options.GlobalAsyncIndex()),
+					options.WithIndexType(options.IndexTypeGlobalAsync),
 				),
 			)
 		},
@@ -166,7 +166,7 @@ func Example_alterTable() {
 				options.WithAddIndex("idx_series_series_id",
 					options.WithIndexColumns("series_id"),
 					options.WithDataColumns("title"),
-					options.WithIndexType(options.GlobalAsyncIndex()),
+					options.WithIndexType(options.IndexTypeGlobalAsync),
 				),
 				options.WithDropIndex("idx_series_title"),
 				options.WithAlterAttribute("hello", "world"),

table/options/models.go

@@ -45,17 +45,11 @@ type IndexDescription struct {
 
 //nolint:unused
 func (i IndexDescription) toYDB() *Ydb_Table.TableIndexDescription {
-	res := &Ydb_Table.TableIndexDescription{
+	return &Ydb_Table.TableIndexDescription{
 		Name:         i.Name,
 		IndexColumns: i.IndexColumns,
 		Status:       i.Status,
 	}
-	if i.Type.Type() == IndexTypeGlobal {
-		res.Type = &Ydb_Table.TableIndexDescription_GlobalIndex{}
-	} else {
-		res.Type = &Ydb_Table.TableIndexDescription_GlobalAsyncIndex{}
-	}
-	return res
 }
 
 type Description struct {
@@ -277,50 +271,24 @@ func NewPartitioningSettings(ps *Ydb_Table.PartitioningSettings) PartitioningSet
 	}
 }
 
-type IndexTypeValue uint8
+type (
+	IndexType uint8
+)
 
 const (
-	IndexTypeGlobal IndexTypeValue = iota
+	IndexTypeGlobal = IndexType(iota)
 	IndexTypeGlobalAsync
 )
 
-type IndexType interface {
-	setup(*indexDesc)
-	Type() IndexTypeValue
-}
-
-type globalIndex struct{}
-
-func GlobalIndex() IndexType {
-	return globalIndex{}
-}
-
-func (globalIndex) setup(d *indexDesc) {
-	d.Type = &Ydb_Table.TableIndex_GlobalIndex{
-		GlobalIndex: new(Ydb_Table.GlobalIndex),
+func (t IndexType) ApplyIndexOption(d *indexDesc) {
+	switch t {
+	case IndexTypeGlobal:
+		d.Type = &Ydb_Table.TableIndex_GlobalIndex{}
+	case IndexTypeGlobalAsync:
+		d.Type = &Ydb_Table.TableIndex_GlobalAsyncIndex{}
 	}
 }
 
-func (globalIndex) Type() IndexTypeValue {
-	return IndexTypeGlobal
-}
-
-type globalAsyncIndex struct{}
-
-func GlobalAsyncIndex() IndexType {
-	return globalAsyncIndex{}
-}
-
-func (globalAsyncIndex) setup(d *indexDesc) {
-	d.Type = &Ydb_Table.TableIndex_GlobalAsyncIndex{
-		GlobalAsyncIndex: new(Ydb_Table.GlobalAsyncIndex),
-	}
-}
-
-func (globalAsyncIndex) Type() IndexTypeValue {
-	return IndexTypeGlobalAsync
-}
-
 type PartitioningMode byte
 
 const (

table/options/options.go

@@ -219,16 +219,8 @@ func WithDataColumns(columns ...string) IndexOption {
 	return dataColumns(columns)
 }
 
-type indexType struct {
-	t IndexType
-}
-
-func (i indexType) ApplyIndexOption(d *indexDesc) {
-	i.t.setup(d)
-}
-
 func WithIndexType(t IndexType) IndexOption {
-	return indexType{t: t}
+	return t
 }
 
 type columnFamilies []ColumnFamily