enabled nlreturn (#1027)

* enabled nlreturn + partial fix * nlreturn refactoring pt.2 * fix nlreturn pt. 3 * nlreturn fixed * fixed tests * codegen fix * fixed gtrace codegen
ydb-platform · Feb 2, 2024 · c6e45cd · c6e45cd
1 parent 54823f0
commit c6e45cd
Show file tree

Hide file tree

Showing 264 changed files with 1,731 additions and 11 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -238,7 +238,6 @@ linters:
     - ireturn
     - maintidx
     - maligned
-    - nlreturn
     - nonamedreturns
     - paralleltest
     - protogetter

diff --git a/balancers/balancers.go b/balancers/balancers.go
@@ -40,6 +40,7 @@ func (filterLocalDC) String() string {
 func PreferLocalDC(balancer *balancerConfig.Config) *balancerConfig.Config {
 	balancer.Filter = filterLocalDC{}
 	balancer.DetectLocalDC = true
+
 	return balancer
 }
 
@@ -49,6 +50,7 @@ func PreferLocalDC(balancer *balancerConfig.Config) *balancerConfig.Config {
 func PreferLocalDCWithFallBack(balancer *balancerConfig.Config) *balancerConfig.Config {
 	balancer = PreferLocalDC(balancer)
 	balancer.AllowFallback = true
+
 	return balancer
 }
 
@@ -61,6 +63,7 @@ func (locations filterLocations) Allow(_ balancerConfig.Info, c conn.Conn) bool
 			return true
 		}
 	}
+
 	return false
 }
 
@@ -91,6 +94,7 @@ func PreferLocations(balancer *balancerConfig.Config, locations ...string) *bala
 	}
 	sort.Strings(locations)
 	balancer.Filter = filterLocations(locations)
+
 	return balancer
 }
 
@@ -100,6 +104,7 @@ func PreferLocations(balancer *balancerConfig.Config, locations ...string) *bala
 func PreferLocationsWithFallback(balancer *balancerConfig.Config, locations ...string) *balancerConfig.Config {
 	balancer = PreferLocations(balancer, locations...)
 	balancer.AllowFallback = true
+
 	return balancer
 }
 
@@ -129,6 +134,7 @@ func Prefer(balancer *balancerConfig.Config, filter func(endpoint Endpoint) bool
 	balancer.Filter = filterFunc(func(_ balancerConfig.Info, c conn.Conn) bool {
 		return filter(c.Endpoint())
 	})
+
 	return balancer
 }
 
@@ -138,6 +144,7 @@ func Prefer(balancer *balancerConfig.Config, filter func(endpoint Endpoint) bool
 func PreferWithFallback(balancer *balancerConfig.Config, filter func(endpoint Endpoint) bool) *balancerConfig.Config {
 	balancer = Prefer(balancer, filter)
 	balancer.AllowFallback = true
+
 	return balancer
 }
 

diff --git a/balancers/balancers_test.go b/balancers/balancers_test.go
@@ -66,5 +66,6 @@ func applyPreferFilter(info balancerConfig.Info, b *balancerConfig.Config, conns
 			res = append(res, c)
 		}
 	}
+
 	return res
 }
diff --git a/balancers/config.go b/balancers/config.go
@@ -92,6 +92,7 @@ func CreateFromConfig(s string) (*balancerConfig.Config, error) {
 		if c.Fallback {
 			return PreferLocalDCWithFallBack(b), nil
 		}
+
 		return PreferLocalDC(b), nil
 	case preferTypeLocations:
 		if len(c.Locations) == 0 {
@@ -100,6 +101,7 @@ func CreateFromConfig(s string) (*balancerConfig.Config, error) {
 		if c.Fallback {
 			return PreferLocationsWithFallback(b, c.Locations...), nil
 		}
+
 		return PreferLocations(b, c.Locations...), nil
 	default:
 		return b, nil
@@ -125,6 +127,7 @@ func FromConfig(config string, opts ...fromConfigOption) *balancerConfig.Config
 		if h.errorHandler != nil {
 			h.errorHandler(err)
 		}
+
 		return h.fallbackBalancer
 	}
 

diff --git a/config/config.go b/config/config.go
@@ -292,5 +292,6 @@ func (c *Config) With(opts ...Option) *Config {
 		c.trace,
 		c.metaOptions...,
 	)
+
 	return c
 }
diff --git a/config/defaults.go b/config/defaults.go
@@ -64,6 +64,7 @@ func defaultGrpcOptions(t *trace.Driver, secure bool, tlsConfig *tls.Config) (op
 			insecure.NewCredentials(),
 		))
 	}
+
 	return opts
 }
 
@@ -72,6 +73,7 @@ func certPool() *x509.CertPool {
 	if err == nil {
 		return certPool
 	}
+
 	return x509.NewCertPool()
 }
 

diff --git a/coordination/example_test.go b/coordination/example_test.go
@@ -14,6 +14,7 @@ func Example() {
 	db, err := ydb.Open(ctx, "grpc://localhost:2136/local")
 	if err != nil {
 		fmt.Printf("failed to connect: %v", err)
+
 		return
 	}
 	defer db.Close(ctx) // cleanup resources
@@ -28,12 +29,14 @@ func Example() {
 	})
 	if err != nil {
 		fmt.Printf("failed to create node: %v", err)
+
 		return
 	}
 	defer db.Coordination().DropNode(ctx, "/local/test")
 	e, c, err := db.Coordination().DescribeNode(ctx, "/local/test")
 	if err != nil {
 		fmt.Printf("failed to describe node: %v", err)
+
 		return
 	}
 	fmt.Printf("node description: %+v\nnode config: %+v\n", e, c)

diff --git a/discovery/example_test.go b/discovery/example_test.go
@@ -12,12 +12,14 @@ func Example_discoverCluster() {
 	db, err := ydb.Open(ctx, "grpc://localhost:2136/local")
 	if err != nil {
 		fmt.Printf("failed to connect: %v", err)
+
 		return
 	}
 	defer db.Close(ctx) // cleanup resources
 	endpoints, err := db.Discovery().Discover(ctx)
 	if err != nil {
 		fmt.Printf("discover failed: %v", err)
+
 		return
 	}
 	fmt.Printf("%s endpoints:\n", db.Name())
@@ -31,12 +33,14 @@ func Example_whoAmI() {
 	db, err := ydb.Open(ctx, "grpc://localhost:2136/local")
 	if err != nil {
 		fmt.Printf("failed to connect: %v", err)
+
 		return
 	}
 	defer db.Close(ctx) // cleanup resources
 	whoAmI, err := db.Discovery().WhoAmI(ctx)
 	if err != nil {
 		fmt.Printf("discover failed: %v", err)
+
 		return
 	}
 	fmt.Printf("%s whoAmI: %s\n", db.Name(), whoAmI.String())

diff --git a/driver_string.go b/driver_string.go
@@ -18,5 +18,6 @@ func (d *Driver) String() string {
 		fmt.Fprintf(buffer, ",Credentials:%v", c.String())
 	}
 	buffer.WriteByte('}')
+
 	return buffer.String()
 }
diff --git a/driver_string_test.go b/driver_string_test.go
@@ -23,7 +23,7 @@ func TestDriver_String(t *testing.T) {
 				config.WithDatabase("local"),
 				config.WithSecure(false),
 			)},
-			s: `Driver{Endpoint:"localhost",Database:"local",Secure:false,Credentials:Anonymous{From:"github.com/ydb-platform/ydb-go-sdk/v3/config.defaultConfig(defaults.go:88)"}}`, //nolint:lll
+			s: `Driver{Endpoint:"localhost",Database:"local",Secure:false,Credentials:Anonymous{From:"github.com/ydb-platform/ydb-go-sdk/v3/config.defaultConfig(defaults.go:90)"}}`, //nolint:lll
 		},
 		{
 			name: xtest.CurrentFileLine(),
@@ -32,7 +32,7 @@ func TestDriver_String(t *testing.T) {
 				config.WithDatabase("local"),
 				config.WithSecure(true),
 			)},
-			s: `Driver{Endpoint:"localhost",Database:"local",Secure:true,Credentials:Anonymous{From:"github.com/ydb-platform/ydb-go-sdk/v3/config.defaultConfig(defaults.go:88)"}}`, //nolint:lll
+			s: `Driver{Endpoint:"localhost",Database:"local",Secure:true,Credentials:Anonymous{From:"github.com/ydb-platform/ydb-go-sdk/v3/config.defaultConfig(defaults.go:90)"}}`, //nolint:lll
 		},
 		{
 			name: xtest.CurrentFileLine(),

diff --git a/examples/basic/database_sql/data.go b/examples/basic/database_sql/data.go
@@ -18,6 +18,7 @@ func seriesData(id string, released time.Time, title, info, comment string) type
 	} else {
 		commentv = types.OptionalValue(types.TextValue(comment))
 	}
+
 	return types.StructValue(
 		types.StructFieldValue("series_id", types.BytesValueFromString(id)),
 		types.StructFieldValue("release_date", types.DateValueFromTime(released)),
@@ -59,6 +60,7 @@ func getData() (series, seasons, episodes []types.Value) {
 		seasons = append(seasons, seasonsData...)
 		episodes = append(episodes, episodesData...)
 	}
+
 	return
 }
 
@@ -114,6 +116,7 @@ func getDataForITCrowd(seriesID string) (series types.Value, seasons, episodes [
 			episodes = append(episodes, episodeData(seriesID, seasonID, uuid.New().String(), title, date))
 		}
 	}
+
 	return series, seasons, episodes
 }
 
@@ -193,6 +196,7 @@ func getDataForSiliconValley(seriesID string) (series types.Value, seasons, epis
 			episodes = append(episodes, episodeData(seriesID, seasonID, uuid.New().String(), title, date))
 		}
 	}
+
 	return series, seasons, episodes
 }
 
@@ -203,5 +207,6 @@ func date(date string) time.Time {
 	if err != nil {
 		panic(err)
 	}
+
 	return t
 }
diff --git a/examples/basic/database_sql/series.go b/examples/basic/database_sql/series.go
@@ -30,6 +30,7 @@ func selectDefault(ctx context.Context, db *sql.DB) (err error) {
 			return err
 		}
 		log.Printf("AST = %s\n\nPlan = %s", ast, plan)
+
 		return nil
 	}, retry.WithIdempotent(true))
 	if err != nil {
@@ -61,11 +62,13 @@ func selectDefault(ctx context.Context, db *sql.DB) (err error) {
 					*id, *title, releaseDate.Format("2006-01-02"),
 				)
 			}
+
 			return rows.Err()
 		}, retry.WithIdempotent(true))
 	if err != nil {
 		return fmt.Errorf("execute data query failed: %w", err)
 	}
+
 	return nil
 }
 
@@ -154,11 +157,13 @@ func selectScan(ctx context.Context, db *sql.DB) (err error) {
 					episodeID, title, firstAired.Format("2006-01-02"),
 				)
 			}
+
 			return rows.Err()
 		}, retry.WithIdempotent(true))
 	if err != nil {
 		return fmt.Errorf("scan query failed: %w", err)
 	}
+
 	return nil
 }
 
@@ -201,11 +206,13 @@ func fillTablesWithData(ctx context.Context, db *sql.DB) (err error) {
 		); err != nil {
 			return err
 		}
+
 		return nil
 	}, retry.WithIdempotent(true))
 	if err != nil {
 		return fmt.Errorf("upsert query failed: %w", err)
 	}
+
 	return nil
 }
 
@@ -232,8 +239,10 @@ func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
 		)
 		if err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "create series table failed: %v", err)
+
 			return err
 		}
+
 		return nil
 	}, retry.WithIdempotent(true))
 	if err != nil {
@@ -263,8 +272,10 @@ func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
 		)
 		if err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "create seasons table failed: %v\n", err)
+
 			return err
 		}
+
 		return nil
 	}, retry.WithIdempotent(true))
 	if err != nil {
@@ -296,13 +307,16 @@ func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
 		)
 		if err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "create episodes table failed: %v\n", err)
+
 			return err
 		}
+
 		return nil
 	}, retry.WithIdempotent(true))
 	if err != nil {
 		return fmt.Errorf("create table failed: %w", err)
 	}
+
 	return nil
 }
 
@@ -326,5 +340,6 @@ func dropTableIfExists(ctx context.Context, cc *sql.Conn, tableName string) erro
 	if err != nil {
 		return fmt.Errorf("drop table failed: %w", err)
 	}
+
 	return nil
 }
diff --git a/examples/basic/gorm/data.go b/examples/basic/gorm/data.go
@@ -373,5 +373,6 @@ func date(date string) time.Time {
 	if err != nil {
 		panic(err)
 	}
+
 	return t
 }
diff --git a/examples/basic/gorm/main.go b/examples/basic/gorm/main.go
@@ -85,6 +85,7 @@ func prepareScheme(db *gorm.DB) error {
 	); err != nil {
 		return err
 	}
+
 	return db.AutoMigrate(
 		&Series{},
 		&Season{},
@@ -123,6 +124,7 @@ func readAll(db *gorm.DB) error {
 			}
 		}
 	}
+
 	return nil
 }
 
@@ -161,5 +163,6 @@ func findEpisodesByTitle(db *gorm.DB, fragment string) error {
 			episodes[i].ID, episodes[i].AirDate.Format(dateISO8601), episodes[i].Title,
 		)
 	}
+
 	return nil
 }
diff --git a/examples/basic/gorm/models.go b/examples/basic/gorm/models.go
@@ -26,6 +26,7 @@ func (s *Series) BeforeCreate(_ *gorm.DB) (err error) {
 	for i := range s.Seasons {
 		s.Seasons[i].SeriesID = s.ID
 	}
+
 	return
 }
 
@@ -48,6 +49,7 @@ func (s *Season) BeforeCreate(_ *gorm.DB) (err error) {
 	for i := range s.Episodes {
 		s.Episodes[i].SeasonID = s.ID
 	}
+
 	return
 }
 
@@ -64,5 +66,6 @@ func (e *Episode) BeforeCreate(_ *gorm.DB) (err error) {
 		return err
 	}
 	e.ID = id.String()
+
 	return
 }
diff --git a/examples/basic/native/data.go b/examples/basic/native/data.go
@@ -13,6 +13,7 @@ func seriesData(id uint64, released time.Time, title, info, comment string) type
 	} else {
 		commentv = types.OptionalValue(types.TextValue(comment))
 	}
+
 	return types.StructValue(
 		types.StructFieldValue("series_id", types.Uint64Value(id)),
 		types.StructFieldValue("release_date", types.DateValueFromTime(released)),
@@ -155,5 +156,6 @@ func days(date string) time.Time {
 	if err != nil {
 		panic(err)
 	}
+
 	return t
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			res = append(res, c)
     		}
     	}
     	return res
     }