Merge pull request #1120 from ydb-platform/fix-nil-opts

* Fixed cases when some option is nil
ydb-platform · Mar 12, 2024 · 6e38869 · 6e38869
2 parents 441f994 + 67c9a32
commit 6e38869
Show file tree

Hide file tree

Showing 49 changed files with 187 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Fixed cases when some option is nil
+
 ## v3.57.1
 * Added logs over query service internals
 * Changed `trace.Query` events

diff --git a/balancers/config.go b/balancers/config.go
@@ -116,9 +116,9 @@ func FromConfig(config string, opts ...fromConfigOption) *balancerConfig.Config
 		b   *balancerConfig.Config
 		err error
 	)
-	for _, o := range opts {
-		if o != nil {
-			o(&h)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&h)
 		}
 	}
 

diff --git a/config/config.go b/config/config.go
@@ -268,9 +268,9 @@ func ExcludeGRPCCodesForPessimization(codes ...grpcCodes.Code) Option {
 func New(opts ...Option) *Config {
 	c := defaultConfig()
 
-	for _, o := range opts {
-		if o != nil {
-			o(c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(c)
 		}
 	}
 
@@ -281,9 +281,9 @@ func New(opts ...Option) *Config {
 
 // With makes copy of current Config with specified options
 func (c *Config) With(opts ...Option) *Config {
-	for _, o := range opts {
-		if o != nil {
-			o(c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(c)
 		}
 	}
 	c.meta = meta.New(

diff --git a/internal/backoff/backoff.go b/internal/backoff/backoff.go
@@ -86,9 +86,9 @@ func New(opts ...option) logBackoff {
 	b := logBackoff{
 		r: xrand.New(xrand.WithLock()),
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(&b)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&b)
 		}
 	}
 

diff --git a/internal/conn/conn.go b/internal/conn/conn.go
@@ -500,9 +500,9 @@ func newConn(e endpoint.Endpoint, config Config, opts ...option) *conn {
 		done:     make(chan struct{}),
 	}
 	c.state.Store(uint32(Created))
-	for _, o := range opts {
-		if o != nil {
-			o(c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(c)
 		}
 	}
 

diff --git a/internal/coordination/config/config.go b/internal/coordination/config/config.go
@@ -37,9 +37,9 @@ func New(opts ...Option) Config {
 	c := Config{
 		trace: &trace.Coordination{},
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(&c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&c)
 		}
 	}
 

diff --git a/internal/credentials/access_error.go b/internal/credentials/access_error.go
@@ -94,10 +94,12 @@ func AccessError(msg string, err error, opts ...authErrorOption) error {
 	buffer.WriteString(msg)
 	buffer.WriteString(" (")
 	for i, opt := range opts {
-		if i != 0 {
-			buffer.WriteString(",")
+		if opt != nil {
+			if i != 0 {
+				buffer.WriteString(",")
+			}
+			opt.applyAuthErrorOption(buffer)
 		}
-		opt.applyAuthErrorOption(buffer)
 	}
 	buffer.WriteString("): %w")
 

diff --git a/internal/credentials/access_token.go b/internal/credentials/access_token.go
@@ -32,7 +32,9 @@ func NewAccessTokenCredentials(token string, opts ...AccessTokenCredentialsOptio
 		sourceInfo: stack.Record(1),
 	}
 	for _, opt := range opts {
-		opt.ApplyAccessTokenCredentialsOption(c)
+		if opt != nil {
+			opt.ApplyAccessTokenCredentialsOption(c)
+		}
 	}
 
 	return c

diff --git a/internal/credentials/anonymous.go b/internal/credentials/anonymous.go
@@ -28,7 +28,9 @@ func NewAnonymousCredentials(opts ...AnonymousCredentialsOption) *Anonymous {
 		sourceInfo: stack.Record(1),
 	}
 	for _, opt := range opts {
-		opt.ApplyAnonymousCredentialsOption(c)
+		if opt != nil {
+			opt.ApplyAnonymousCredentialsOption(c)
+		}
 	}
 
 	return c

diff --git a/internal/credentials/static.go b/internal/credentials/static.go
@@ -47,7 +47,9 @@ func NewStaticCredentials(user, password, endpoint string, opts ...StaticCredent
 		sourceInfo: stack.Record(1),
 	}
 	for _, opt := range opts {
-		opt.ApplyStaticCredentialsOption(c)
+		if opt != nil {
+			opt.ApplyStaticCredentialsOption(c)
+		}
 	}
 
 	return c

diff --git a/internal/discovery/config/config.go b/internal/discovery/config/config.go
@@ -29,9 +29,9 @@ func New(opts ...Option) *Config {
 		interval: DefaultInterval,
 		trace:    &trace.Discovery{},
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(c)
 		}
 	}
 

diff --git a/internal/endpoint/endpoint.go b/internal/endpoint/endpoint.go
@@ -110,13 +110,10 @@ func (e *endpoint) LastUpdated() time.Time {
 func (e *endpoint) Touch(opts ...Option) {
 	e.mu.Lock()
 	defer e.mu.Unlock()
-	for _, o := range append(
-		[]Option{
-			withLastUpdated(time.Now()),
-		},
-		opts...,
-	) {
-		o(e)
+	for _, opt := range append([]Option{withLastUpdated(time.Now())}, opts...) {
+		if opt != nil {
+			opt(e)
+		}
 	}
 }
 
@@ -163,9 +160,9 @@ func New(address string, opts ...Option) *endpoint {
 		address:     address,
 		lastUpdated: time.Now(),
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(e)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(e)
 		}
 	}
 

diff --git a/internal/meta/meta.go b/internal/meta/meta.go
@@ -24,9 +24,9 @@ func New(
 		credentials: credentials,
 		database:    database,
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(m)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(m)
 		}
 	}
 

diff --git a/internal/meta/trace_id.go b/internal/meta/trace_id.go
@@ -19,7 +19,9 @@ func TraceID(ctx context.Context, opts ...func(opts *newTraceIDOpts)) (context.C
 	}
 	options := newTraceIDOpts{newRandom: uuid.NewRandom}
 	for _, opt := range opts {
-		opt(&options)
+		if opt != nil {
+			opt(&options)
+		}
 	}
 	uuid, err := options.newRandom()
 	if err != nil {

diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -66,7 +66,9 @@ func New[T any](
 		done: make(chan struct{}),
 	}
 	for _, opt := range opts {
-		opt(p)
+		if opt != nil {
+			opt(p)
+		}
 	}
 
 	return p

diff --git a/internal/query/config/config.go b/internal/query/config/config.go
@@ -30,9 +30,9 @@ type Config struct {
 
 func New(opts ...Option) *Config {
 	c := defaults()
-	for _, o := range opts {
-		if o != nil {
-			o(c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(c)
 		}
 	}
 

diff --git a/internal/query/options/execute.go b/internal/query/options/execute.go
@@ -125,7 +125,9 @@ func ExecuteSettings(opts ...ExecuteOption) (settings *Execute) {
 	settings.commonExecuteSettings = defaultCommonExecuteSettings()
 	settings.txControl = tx.DefaultTxControl()
 	for _, opt := range opts {
-		opt.applyExecuteOption(settings)
+		if opt != nil {
+			opt.applyExecuteOption(settings)
+		}
 	}
 
 	return settings
@@ -168,7 +170,9 @@ func TxExecuteSettings(id string, opts ...TxExecuteOption) (settings *txExecuteS
 		ExecuteSettings: ExecuteSettings(WithTxControl(tx.NewControl(tx.WithTxID(id)))),
 	}
 	for _, opt := range opts {
-		opt.applyTxExecuteOption(settings)
+		if opt != nil {
+			opt.applyTxExecuteOption(settings)
+		}
 	}
 
 	return settings

diff --git a/internal/query/options/retry.go b/internal/query/options/retry.go
@@ -112,7 +112,9 @@ func ParseDoOpts(t *trace.Query, opts ...DoOption) (s *doSettings) {
 	}
 
 	for _, opt := range opts {
-		opt.applyDoOption(s)
+		if opt != nil {
+			opt.applyDoOption(s)
+		}
 	}
 
 	return s
@@ -127,7 +129,9 @@ func ParseDoTxOpts(t *trace.Query, opts ...DoTxOption) (s *doTxSettings) {
 	}
 
 	for _, opt := range opts {
-		opt.applyDoTxOption(s)
+		if opt != nil {
+			opt.applyDoTxOption(s)
+		}
 	}
 
 	return s

diff --git a/internal/query/scanner/struct.go b/internal/query/scanner/struct.go
@@ -40,7 +40,9 @@ func (s StructScanner) ScanStruct(dst interface{}, opts ...ScanStructOption) err
 		AllowMissingFieldsInStruct:    false,
 	}
 	for _, opt := range opts {
-		opt.applyScanStructOption(&settings)
+		if opt != nil {
+			opt.applyScanStructOption(&settings)
+		}
 	}
 	ptr := reflect.ValueOf(dst)
 	if ptr.Kind() != reflect.Pointer {

diff --git a/internal/query/tx/control.go b/internal/query/tx/control.go
@@ -56,7 +56,9 @@ func (opts beginTxOptions) applyTxSelector(a *allocator.Allocator, txControl *Yd
 	selector := a.QueryTransactionControlBeginTx()
 	selector.BeginTx = a.QueryTransactionSettings()
 	for _, opt := range opts {
-		opt.ApplyTxSettingsOption(a, selector.BeginTx)
+		if opt != nil {
+			opt.ApplyTxSettingsOption(a, selector.BeginTx)
+		}
 	}
 	txControl.TxSelector = selector
 }

diff --git a/internal/query/tx/settings.go b/internal/query/tx/settings.go
@@ -36,15 +36,19 @@ func (opts Settings) applyTxSelector(a *allocator.Allocator, txControl *Ydb_Quer
 	beginTx := a.QueryTransactionControlBeginTx()
 	beginTx.BeginTx = a.QueryTransactionSettings()
 	for _, opt := range opts {
-		opt.ApplyTxSettingsOption(a, beginTx.BeginTx)
+		if opt != nil {
+			opt.ApplyTxSettingsOption(a, beginTx.BeginTx)
+		}
 	}
 	txControl.TxSelector = beginTx
 }
 
 func (opts Settings) ToYDB(a *allocator.Allocator) *Ydb_Query.TransactionSettings {
 	txSettings := a.QueryTransactionSettings()
 	for _, opt := range opts {
-		opt.ApplyTxSettingsOption(a, txSettings)
+		if opt != nil {
+			opt.ApplyTxSettingsOption(a, txSettings)
+		}
 	}
 
 	return txSettings

diff --git a/internal/ratelimiter/config/config.go b/internal/ratelimiter/config/config.go
@@ -37,9 +37,9 @@ func New(opts ...Option) Config {
 	c := Config{
 		trace: &trace.Ratelimiter{},
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(&c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&c)
 		}
 	}
 

diff --git a/internal/ratelimiter/options/acquire.go b/internal/ratelimiter/options/acquire.go
@@ -74,9 +74,9 @@ func NewAcquire(opts ...AcquireOption) Acquire {
 	h := &acquireOptionsHolder{
 		acquireType: AcquireTypeDefault,
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(h)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(h)
 		}
 	}
 

diff --git a/internal/repeater/repeater.go b/internal/repeater/repeater.go
@@ -108,9 +108,9 @@ func New(
 		trace:    &trace.Driver{},
 	}
 
-	for _, o := range opts {
-		if o != nil {
-			o(r)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(r)
 		}
 	}
 

diff --git a/internal/scheme/client.go b/internal/scheme/client.go
@@ -250,9 +250,9 @@ func (c *Client) ModifyPermissions(
 		onDone(finalErr)
 	}()
 	var desc permissionsDesc
-	for _, o := range opts {
-		if o != nil {
-			o(&desc)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&desc)
 		}
 	}
 	call := func(ctx context.Context) error {

diff --git a/internal/scheme/config/config.go b/internal/scheme/config/config.go
@@ -50,9 +50,9 @@ func New(opts ...Option) Config {
 	c := Config{
 		trace: &trace.Scheme{},
 	}
-	for _, o := range opts {
-		if o != nil {
-			o(&c)
+	for _, opt := range opts {
+		if opt != nil {
+			opt(&c)
 		}
 	}
 

diff --git a/internal/scheme/options_test.go b/internal/scheme/options_test.go
@@ -28,9 +28,9 @@ func TestSchemeOptions(t *testing.T) {
 		}
 
 		var desc permissionsDesc
-		for _, o := range opts {
-			if o != nil {
-				o(&desc)
+		for _, opt := range opts {
+			if opt != nil {
+				opt(&desc)
 			}
 		}