fix conflicts

Author: 11Petrov

internal/allocator/allocator.go

@@ -394,7 +394,7 @@ type structAllocator struct {
 
 func (a *structAllocator) Struct() (v *Ydb.StructType) {
 	v = structPool.Get()
-	if cap(v.Members) <= 0 {
+	if cap(v.GetMembers()) <= 0 {
 		v.Members = make([]*Ydb.StructMember, 0, 10) //nolint:gomnd
 	}
 	a.allocations = append(a.allocations, v)

internal/cmd/gtrace/main.go

@@ -20,16 +20,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
 
-const (
-	noTags  = 0
-	oneTag  = 1
-	twoTags = 2
-)
-
-//go:linkname build_goodOSArchFile go/build.(*Context).goodOSArchFile
-//nolint:revive
-func build_goodOSArchFile(*build.Context, string, map[string]bool) bool
-
 //nolint:gocyclo
 func main() {
 	var (
@@ -318,38 +308,6 @@ func buildFunc(info *types.Info, traces map[string]*Trace, fn *ast.FuncType) (re
 	)
 }
 
-func splitOSArchTags(ctx *build.Context, name string) (base, tags, ext string) {
-	fileTags := make(map[string]bool)
-	build_goodOSArchFile(ctx, name, fileTags)
-	ext = filepath.Ext(name)
-	switch len(fileTags) {
-	case noTags: // *
-		base = strings.TrimSuffix(name, ext)
-
-	case oneTag: // *_GOOS or *_GOARCH
-		i := strings.LastIndexByte(name, '_')
-
-		base = name[:i]
-		tags = strings.TrimSuffix(name[i:], ext)
-
-	case twoTags: // *_GOOS_GOARCH
-		var i int
-		i = strings.LastIndexByte(name, '_')
-		i = strings.LastIndexByte(name[:i], '_')
-
-		base = name[:i]
-		tags = strings.TrimSuffix(name[i:], ext)
-
-	default:
-		panic(fmt.Sprintf(
-			"gtrace: internal error: unexpected number of OS/arch tags: %d",
-			len(fileTags),
-		))
-	}
-
-	return
-}
-
 type Package struct {
 	*types.Package
 

internal/conn/pool.go

@@ -246,7 +246,7 @@ func NewPool(ctx context.Context, config Config) *Pool {
 	}
 
 	if ttl := config.ConnectionTTL(); ttl > 0 {
-		go p.connParker(xcontext.WithoutDeadline(ctx), ttl, ttl/2) //nolint:gomnd
+		go p.connParker(xcontext.ValueOnly(ctx), ttl, ttl/2) //nolint:gomnd
 	}
 
 	return p

internal/coordination/client.go

@@ -336,11 +336,11 @@ func (c *Client) closeSessions(ctx context.Context) {
 func defaultCreateSessionConfig() *options.CreateSessionOptions {
 	return &options.CreateSessionOptions{
 		Description:             "YDB Go SDK",
-		SessionTimeout:          time.Second * 5,
+		SessionTimeout:          time.Second * 5, //nolint:gomnd
 		SessionStartTimeout:     time.Second * 1,
 		SessionStopTimeout:      time.Second * 1,
-		SessionKeepAliveTimeout: time.Second * 10,
-		SessionReconnectDelay:   time.Millisecond * 500,
+		SessionKeepAliveTimeout: time.Second * 10,       //nolint:gomnd
+		SessionReconnectDelay:   time.Millisecond * 500, //nolint:gomnd
 	}
 }
 

internal/coordination/session.go

@@ -73,7 +73,7 @@ func createSession(
 }
 
 func newProtectionKey() []byte {
-	key := make([]byte, 8)
+	key := make([]byte, 8)                            //nolint:gomnd
 	binary.LittleEndian.PutUint64(key, rand.Uint64()) //nolint:gosec
 
 	return key
@@ -120,7 +120,7 @@ func (s *session) newStream(
 		deadline = s.getLastGoodResponseTime().Add(s.options.SessionTimeout)
 	} else {
 		// Large enough to make the loop infinite, small enough to allow the maximum duration value (~290 years).
-		deadline = time.Now().Add(time.Hour * 24 * 365 * 100)
+		deadline = time.Now().Add(time.Hour * 24 * 365 * 100) //nolint:gomnd
 	}
 
 	lastChance := false
@@ -230,7 +230,7 @@ func (s *session) mainLoop(path string, sessionStartedChan chan struct{}) {
 
 		// Start the loops.
 		wg := sync.WaitGroup{}
-		wg.Add(2)
+		wg.Add(2) //nolint:gomnd
 		sessionStarted := make(chan *Ydb_Coordination.SessionResponse_SessionStarted, 1)
 		sessionStopped := make(chan *Ydb_Coordination.SessionResponse_SessionStopped, 1)
 		startSending := make(chan struct{})

internal/meta/context.go

@@ -40,7 +40,7 @@ func WithRequestType(ctx context.Context, requestType string) context.Context {
 }
 
 // WithAllowFeatures returns a copy of parent context with allowed client feature
-func WithAllowFeatures(ctx context.Context, features []string) context.Context {
+func WithAllowFeatures(ctx context.Context, features ...string) context.Context {
 	kv := make([]string, 0, len(features)*2) //nolint:gomnd
 	for _, feature := range features {
 		kv = append(kv, HeaderClientCapabilities, feature)

internal/topic/topicwriterinternal/writer_reconnector.go

@@ -30,11 +30,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
-const (
-	defaultMaxMessageSize = 50 * 1024 * 1024
-	defaultMaxQueueLen    = 1000
-)
-
 var (
 	errConnTimeout           = xerrors.Wrap(errors.New("ydb: connection timeout"))
 	errStopWriterReconnector = xerrors.Wrap(errors.New("ydb: stop writer reconnector"))
@@ -89,8 +84,8 @@ func newWriterReconnectorConfig(options ...PublicWriterOption) WriterReconnector
 		},
 		AutoSetSeqNo:       true,
 		AutoSetCreatedTime: true,
-		MaxMessageSize:     defaultMaxMessageSize,
-		MaxQueueLen:        defaultMaxQueueLen,
+		MaxMessageSize:     50 * 1024 * 1024, //nolint:gomnd
+		MaxQueueLen:        1000,             //nolint:gomnd
 		RetrySettings: topic.RetrySettings{
 			StartTimeout: topic.DefaultStartTimeout,
 		},

internal/value/value.go

@@ -2425,7 +2425,7 @@ func ZeroValue(t types.Type) Value {
 
 			return values
 		}()...)
-	case *DecimalType:
+	case *types.Decimal:
 		return DecimalValue([16]byte{}, decimalPrecision, decimalScale)
 
 	default:

tests/slo/native/query/storage.go

@@ -66,7 +66,7 @@ DROP TABLE %s
 `
 
 func NewStorage(ctx context.Context, cfg *config.Config, poolSize int) (*Storage, error) {
-	ctx, cancel := context.WithTimeout(ctx, time.Minute*5)
+	ctx, cancel := context.WithTimeout(ctx, time.Minute*5) //nolint:gomnd
 	defer cancel()
 
 	db, err := ydb.Open(ctx,