added e2e test for index type

Author: asmyasnikov

internal/table/session.go

@@ -294,7 +294,10 @@ func (s *session) CreateTable(
 		}
 	}
 	_, err = s.tableService.CreateTable(ctx, &request)
-	return xerrors.WithStackTrace(err)
+	if err != nil {
+		return xerrors.WithStackTrace(err)
+	}
+	return nil
 }
 
 // DescribeTable describes table at given path.

table/options/models.go

@@ -283,9 +283,13 @@ const (
 func (t IndexType) ApplyIndexOption(d *indexDesc) {
 	switch t {
 	case IndexTypeGlobal:
-		d.Type = &Ydb_Table.TableIndex_GlobalIndex{}
+		d.Type = &Ydb_Table.TableIndex_GlobalIndex{
+			GlobalIndex: &Ydb_Table.GlobalIndex{},
+		}
 	case IndexTypeGlobalAsync:
-		d.Type = &Ydb_Table.TableIndex_GlobalAsyncIndex{}
+		d.Type = &Ydb_Table.TableIndex_GlobalAsyncIndex{
+			GlobalAsyncIndex: &Ydb_Table.GlobalAsyncIndex{},
+		}
 	}
 }
 

table/table_e2e_test.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
 	"golang.org/x/xerrors"
 	"google.golang.org/grpc"
 	grpcCodes "google.golang.org/grpc/codes"
@@ -2291,3 +2292,142 @@ func TestValueToYqlLiteral(t *testing.T) {
 		})
 	}
 }
+
+func TestCreateTableDescription(t *testing.T) {
+	ctx := context.Background()
+	db, err := ydb.Open(ctx, os.Getenv("YDB_CONNECTION_STRING"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() {
+		_ = db.Close(ctx)
+	}()
+	for _, tt := range []struct {
+		opts        []options.CreateTableOption
+		description options.Description
+		equal       func(t *testing.T, lhs, rhs options.Description)
+	}{
+		{
+			opts: []options.CreateTableOption{
+				options.WithColumn("a", types.TypeUint64),
+				options.WithPrimaryKeyColumn("a"),
+			},
+			description: options.Description{
+				Name: "table_0",
+				Columns: []options.Column{
+					{
+						Name: "a",
+						Type: types.TypeUint64,
+					},
+				},
+				PrimaryKey: []string{"a"},
+			},
+			equal: func(t *testing.T, lhs, rhs options.Description) {
+				require.Equal(t, lhs.Columns, rhs.Columns)
+				require.Equal(t, lhs.PrimaryKey, rhs.PrimaryKey)
+			},
+		},
+		{
+			opts: []options.CreateTableOption{
+				options.WithColumn("a", types.TypeUint64),
+				options.WithColumn("b", types.Optional(types.TypeUint64)),
+				options.WithPrimaryKeyColumn("a"),
+				options.WithIndex("idx_b",
+					options.WithIndexColumns("b"),
+					options.WithIndexType(options.GlobalIndex()),
+				),
+			},
+			description: options.Description{
+				Name: "table_1",
+				Columns: []options.Column{
+					{
+						Name: "a",
+						Type: types.TypeUint64,
+					},
+					{
+						Name: "b",
+						Type: types.Optional(types.TypeUint64),
+					},
+				},
+				PrimaryKey: []string{"a"},
+				Indexes: []options.IndexDescription{
+					{
+						Name:         "idx_b",
+						IndexColumns: []string{"b"},
+						Status:       Ydb_Table.TableIndexDescription_STATUS_READY,
+						Type:         options.IndexTypeGlobal,
+					},
+				},
+			},
+			equal: func(t *testing.T, lhs, rhs options.Description) {
+				require.Equal(t, lhs.Columns, rhs.Columns)
+				require.Equal(t, lhs.PrimaryKey, rhs.PrimaryKey)
+				require.Equal(t, lhs.Indexes, rhs.Indexes)
+			},
+		},
+		{
+			opts: []options.CreateTableOption{
+				options.WithColumn("a", types.TypeUint64),
+				options.WithColumn("b", types.Optional(types.TypeUint64)),
+				options.WithPrimaryKeyColumn("a"),
+				options.WithIndex("idx_b",
+					options.WithIndexColumns("b"),
+					options.WithIndexType(options.GlobalAsyncIndex()),
+				),
+			},
+			description: options.Description{
+				Name: "table_2",
+				Columns: []options.Column{
+					{
+						Name: "a",
+						Type: types.TypeUint64,
+					},
+					{
+						Name: "b",
+						Type: types.Optional(types.TypeUint64),
+					},
+				},
+				PrimaryKey: []string{"a"},
+				Indexes: []options.IndexDescription{
+					{
+						Name:         "idx_b",
+						IndexColumns: []string{"b"},
+						Status:       Ydb_Table.TableIndexDescription_STATUS_READY,
+						Type:         options.IndexTypeGlobalAsync,
+					},
+				},
+			},
+			equal: func(t *testing.T, lhs, rhs options.Description) {
+				require.Equal(t, lhs.Columns, rhs.Columns)
+				require.Equal(t, lhs.PrimaryKey, rhs.PrimaryKey)
+				require.Equal(t, lhs.Indexes, rhs.Indexes)
+			},
+		},
+	} {
+		t.Run(tt.description.Name, func(t *testing.T) {
+			var (
+				fullTablePath = path.Join(db.Name(), "TestCreateTableDescription", tt.description.Name)
+				description   options.Description
+			)
+			err = db.Table().Do(ctx, func(ctx context.Context, s table.Session) error {
+				var exists bool
+				if exists, err = sugar.IsTableExists(ctx, db.Scheme(), fullTablePath); err != nil {
+					return err
+				} else if exists {
+					_ = s.DropTable(ctx, fullTablePath)
+				}
+				err = s.CreateTable(ctx, fullTablePath, tt.opts...)
+				if err != nil {
+					return err
+				}
+				description, err = s.DescribeTable(ctx, fullTablePath)
+				if err != nil {
+					return err
+				}
+				return nil
+			}, table.WithIdempotent())
+			require.NoError(t, err)
+			tt.equal(t, tt.description, description)
+		})
+	}
+}