Skip to content

Commit 5798413

Browse files
author
Roman Golov
committed
FIx lint again.
1 parent 3e3a2cf commit 5798413

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

internal/table/scanner/scanner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func (s *valueScanner) hasItems() bool {
297297
}
298298

299299
func (s *valueScanner) seekItemByID(id int) error {
300-
if !s.hasItems() || id >= len(s.set.Columns) {
300+
if !s.hasItems() || id >= len(s.set.GetColumns()) {
301301
return s.notFoundColumnByIndex(id)
302302
}
303303
col := s.set.GetColumns()[id]

internal/types/types.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@ func TypeToYDB(t Type, a *allocator.Allocator) *Ydb.Type {
2222
}
2323

2424
func TypeFromYDB(x *Ydb.Type) Type {
25-
switch v := x.Type.(type) {
25+
switch v := x.GetType().(type) {
2626
case *Ydb.Type_TypeId:
2727
return primitiveTypeFromYDB(v.TypeId)
2828

2929
case *Ydb.Type_OptionalType:
30-
return NewOptional(TypeFromYDB(v.OptionalType.Item))
30+
return NewOptional(TypeFromYDB(v.OptionalType.GetItem()))
3131

3232
case *Ydb.Type_ListType:
33-
return NewList(TypeFromYDB(v.ListType.Item))
33+
return NewList(TypeFromYDB(v.ListType.GetItem()))
3434

3535
case *Ydb.Type_DecimalType:
3636
d := v.DecimalType
3737

38-
return NewDecimal(d.Precision, d.Scale)
38+
return NewDecimal(d.GetPrecision(), d.GetScale())
3939

4040
case *Ydb.Type_TupleType:
4141
t := v.TupleType
4242

43-
return NewTuple(FromYDB(t.Elements)...)
43+
return NewTuple(FromYDB(t.GetElements())...)
4444

4545
case *Ydb.Type_StructType:
4646
s := v.StructType
4747

48-
return NewStruct(StructFields(s.Members)...)
48+
return NewStruct(StructFields(s.GetMembers())...)
4949

5050
case *Ydb.Type_DictType:
51-
keyType, valueType := TypeFromYDB(v.DictType.Key), TypeFromYDB(v.DictType.Payload)
51+
keyType, valueType := TypeFromYDB(v.DictType.GetKey()), TypeFromYDB(v.DictType.GetPayload())
5252
if valueType.equalsTo(NewVoid()) {
5353
return NewSet(keyType)
5454
}
@@ -57,11 +57,11 @@ func TypeFromYDB(x *Ydb.Type) Type {
5757

5858
case *Ydb.Type_VariantType:
5959
t := v.VariantType
60-
switch x := t.Type.(type) {
60+
switch x := t.GetType().(type) {
6161
case *Ydb.VariantType_TupleItems:
62-
return NewVariantTuple(FromYDB(x.TupleItems.Elements)...)
62+
return NewVariantTuple(FromYDB(x.TupleItems.GetElements())...)
6363
case *Ydb.VariantType_StructItems:
64-
return NewVariantStruct(StructFields(x.StructItems.Members)...)
64+
return NewVariantStruct(StructFields(x.StructItems.GetMembers())...)
6565
default:
6666
panic("ydb: unknown variant type")
6767
}
@@ -645,7 +645,7 @@ func (v *Struct) ToYDB(a *allocator.Allocator) *Ydb.Type {
645645
structMember.Name = v.fields[i].Name
646646
structMember.Type = v.fields[i].T.ToYDB(a)
647647
typeStruct.StructType.Members = append(
648-
typeStruct.StructType.Members,
648+
typeStruct.StructType.GetMembers(),
649649
structMember,
650650
)
651651
}
@@ -665,8 +665,8 @@ func StructFields(ms []*Ydb.StructMember) []StructField {
665665
fs := make([]StructField, len(ms))
666666
for i, m := range ms {
667667
fs[i] = StructField{
668-
Name: m.Name,
669-
T: TypeFromYDB(m.Type),
668+
Name: m.GetName(),
669+
T: TypeFromYDB(m.GetType()),
670670
}
671671
}
672672

@@ -733,7 +733,7 @@ func (v *Tuple) ToYDB(a *allocator.Allocator) *Ydb.Type {
733733
typeTuple.TupleType = a.Tuple()
734734

735735
for _, vv := range items {
736-
typeTuple.TupleType.Elements = append(typeTuple.TupleType.Elements, vv.ToYDB(a))
736+
typeTuple.TupleType.Elements = append(typeTuple.TupleType.GetElements(), vv.ToYDB(a))
737737
}
738738

739739
t.Type = typeTuple
@@ -787,7 +787,7 @@ func (v *VariantStruct) ToYDB(a *allocator.Allocator) *Ydb.Type {
787787
typeVariant.VariantType = a.Variant()
788788

789789
structItems := a.VariantStructItems()
790-
structItems.StructItems = v.Struct.ToYDB(a).Type.(*Ydb.Type_StructType).StructType
790+
structItems.StructItems = v.Struct.ToYDB(a).GetType().(*Ydb.Type_StructType).StructType
791791

792792
typeVariant.VariantType.Type = structItems
793793

@@ -840,7 +840,7 @@ func (v *VariantTuple) ToYDB(a *allocator.Allocator) *Ydb.Type {
840840
typeVariant.VariantType = a.Variant()
841841

842842
tupleItems := a.VariantTupleItems()
843-
tupleItems.TupleItems = v.Tuple.ToYDB(a).Type.(*Ydb.Type_TupleType).TupleType
843+
tupleItems.TupleItems = v.Tuple.ToYDB(a).GetType().(*Ydb.Type_TupleType).TupleType
844844

845845
typeVariant.VariantType.Type = tupleItems
846846

internal/value/value.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func fromYDB(t *Ydb.Type, v *Ydb.Value) (Value, error) {
265265
ttt.Struct.Field(int(v.GetVariantIndex())).T.ToYDB(a),
266266
v.GetValue().(*Ydb.Value_NestedValue).NestedValue,
267267
),
268-
ttt.Struct.Field(int(v.VariantIndex)).Name,
268+
ttt.Struct.Field(int(v.GetVariantIndex())).Name,
269269
ttt.Struct,
270270
), nil
271271

@@ -276,7 +276,7 @@ func fromYDB(t *Ydb.Type, v *Ydb.Value) (Value, error) {
276276
return VariantValueTuple(
277277
FromYDB(
278278
ttt.Tuple.ItemType(int(v.GetVariantIndex())).ToYDB(a),
279-
v.Value.(*Ydb.Value_NestedValue).NestedValue,
279+
v.GetValue().(*Ydb.Value_NestedValue).NestedValue,
280280
),
281281
v.GetVariantIndex(),
282282
ttt.Tuple,

table/options/options_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestSessionOptionsProfile(t *testing.T) {
7777
require.Equal(
7878
t,
7979
[]*Ydb.TypedValue{value.ToYDB(value.Int64Value(1), a)},
80-
p.PartitionAtKeys.SplitPoints,
80+
p.PartitionAtKeys.GetSplitPoints(),
8181
)
8282
}
8383
}
@@ -171,10 +171,10 @@ func TestAlterTableOptions(t *testing.T) {
171171
opt := WithAddColumnMeta(column)
172172
req := Ydb_Table.AlterTableRequest{}
173173
opt.ApplyAlterTableOption((*AlterTableDesc)(&req), a)
174-
if len(req.AddColumns) != 1 ||
175-
req.AddColumns[0].GetName() != column.Name ||
176-
req.AddColumns[0].GetType() != types.TypeToYDB(column.Type, a) ||
177-
req.AddColumns[0].GetFamily() != column.Family {
174+
if len(req.GetAddColumns()) != 1 ||
175+
req.GetAddColumns()[0].GetName() != column.Name ||
176+
req.GetAddColumns()[0].GetType() != types.TypeToYDB(column.Type, a) ||
177+
req.GetAddColumns()[0].GetFamily() != column.Family {
178178
t.Errorf("Alter table options is not as expected")
179179
}
180180
}

0 commit comments

Comments
 (0)