ydb-platform · hrapovd1 · Feb 5, 2024 · Feb 12, 2024 · Feb 13, 2024 · Feb 13, 2024
diff --git a/.golangci.yml b/.golangci.yml
@@ -238,7 +238,6 @@ linters:
     - ireturn
     - maintidx
     - maligned
-    - nonamedreturns
     - paralleltest
     - protogetter
     - scopelint

diff --git a/config/defaults.go b/config/defaults.go
@@ -30,7 +30,8 @@ var (
 	}
 )
 
-func defaultGrpcOptions(t *trace.Driver, secure bool, tlsConfig *tls.Config) (opts []grpc.DialOption) {
+func defaultGrpcOptions(t *trace.Driver, secure bool, tlsConfig *tls.Config) []grpc.DialOption {
+	var opts []grpc.DialOption
 	opts = append(opts,
 		// keep-aliving all connections
 		grpc.WithKeepaliveParams(
@@ -84,7 +85,7 @@ func defaultTLSConfig() *tls.Config {
 	}
 }
 
-func defaultConfig() (c *Config) {
+func defaultConfig() *Config {
 	return &Config{
 		credentials: credentials.NewAnonymousCredentials(
 			credentials.WithSourceInfo(stack.Record(0)),

diff --git a/examples/basic/database_sql/data.go b/examples/basic/database_sql/data.go
@@ -48,7 +48,12 @@ func episodeData(seriesID, seasonID, episodeID, title string, date time.Time) ty
 	)
 }
 
-func getData() (series, seasons, episodes []types.Value) {
+func getData() ([]types.Value, []types.Value, []types.Value) {
+	var (
+		series   = make([]types.Value, 0)
+		seasons  = make([]types.Value, 0)
+		episodes = make([]types.Value, 0)
+	)
 	for seriesID, fill := range map[string]func(seriesID string) (
 		seriesData types.Value, seasons []types.Value, episodes []types.Value,
 	){
@@ -61,15 +66,19 @@ func getData() (series, seasons, episodes []types.Value) {
 		episodes = append(episodes, episodesData...)
 	}
 
-	return
+	return series, seasons, episodes
 }
 
-func getDataForITCrowd(seriesID string) (series types.Value, seasons, episodes []types.Value) {
-	series = seriesData(
-		seriesID, date("2006-02-03"), "IT Crowd", ""+
-			"The IT Crowd is a British sitcom produced by Channel 4, written by Graham Linehan, produced by "+
-			"Ash Atalla and starring Chris O'Dowd, Richard Ayoade, Katherine Parkinson, and Matt Berry.",
-		"", // NULL comment.
+func getDataForITCrowd(seriesID string) (types.Value, []types.Value, []types.Value) {
+	var (
+		series = seriesData(
+			seriesID, date("2006-02-03"), "IT Crowd", ""+
+				"The IT Crowd is a British sitcom produced by Channel 4, written by Graham Linehan, produced by "+
+				"Ash Atalla and starring Chris O'Dowd, Richard Ayoade, Katherine Parkinson, and Matt Berry.",
+			"", // NULL comment.
+		)
+		seasons  = make([]types.Value, 0)
+		episodes = make([]types.Value, 0)
 	)
 	for _, season := range []struct { //nolint:gocritic
 		title    string
@@ -120,12 +129,16 @@ func getDataForITCrowd(seriesID string) (series types.Value, seasons, episodes [
 	return series, seasons, episodes
 }
 
-func getDataForSiliconValley(seriesID string) (series types.Value, seasons, episodes []types.Value) {
-	series = seriesData(
-		seriesID, date("2014-04-06"), "Silicon Valley", ""+
-			"Silicon Valley is an American comedy television series created by Mike Judge, John Altschuler and "+
-			"Dave Krinsky. The series focuses on five young men who founded a startup company in Silicon Valley.",
-		"Some comment here",
+func getDataForSiliconValley(seriesID string) (types.Value, []types.Value, []types.Value) {
+	var (
+		series = seriesData(
+			seriesID, date("2014-04-06"), "Silicon Valley", ""+
+				"Silicon Valley is an American comedy television series created by Mike Judge, John Altschuler and "+
+				"Dave Krinsky. The series focuses on five young men who founded a startup company in Silicon Valley.",
+			"Some comment here",
+		)
+		seasons  = make([]types.Value, 0)
+		episodes = make([]types.Value, 0)
 	)
 	for _, season := range []struct { //nolint:gocritic
 		title    string

diff --git a/examples/basic/database_sql/series.go b/examples/basic/database_sql/series.go
@@ -16,17 +16,17 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/types"
 )
 
-func selectDefault(ctx context.Context, db *sql.DB) (err error) {
+func selectDefault(ctx context.Context, db *sql.DB) error {
 	// explain of query
-	err = retry.Do(ctx, db, func(ctx context.Context, cc *sql.Conn) (err error) {
+	err := retry.Do(ctx, db, func(ctx context.Context, cc *sql.Conn) error {
 		row := cc.QueryRowContext(ydb.WithQueryMode(ctx, ydb.ExplainQueryMode),
 			`SELECT series_id, title, release_date FROM series;`,
 		)
 		var (
 			ast  string
 			plan string
 		)
-		if err = row.Scan(&ast, &plan); err != nil {
+		if err := row.Scan(&ast, &plan); err != nil {
 			return err
 		}
 		log.Printf("AST = %s\n\nPlan = %s", ast, plan)
@@ -39,10 +39,10 @@ func selectDefault(ctx context.Context, db *sql.DB) (err error) {
 	err = retry.Do(
 		ydb.WithTxControl(ctx, table.OnlineReadOnlyTxControl()),
 		db,
-		func(ctx context.Context, cc *sql.Conn) (err error) {
-			rows, err := cc.QueryContext(ctx, `SELECT series_id, title, release_date FROM series;`)
-			if err != nil {
-				return err
+		func(ctx context.Context, cc *sql.Conn) error {
+			rows, errIn := cc.QueryContext(ctx, `SELECT series_id, title, release_date FROM series;`)
+			if errIn != nil {
+				return errIn
 			}
 			defer func() {
 				_ = rows.Close()
@@ -72,12 +72,12 @@ func selectDefault(ctx context.Context, db *sql.DB) (err error) {
 	return nil
 }
 
-func selectScan(ctx context.Context, db *sql.DB) (err error) {
+func selectScan(ctx context.Context, db *sql.DB) error {
 	// scan query
-	err = retry.Do(
+	err := retry.Do(
 		ydb.WithTxControl(ctx, table.StaleReadOnlyTxControl()),
 		db,
-		func(ctx context.Context, cc *sql.Conn) (err error) {
+		func(ctx context.Context, cc *sql.Conn) error {
 			var (
 				id        string
 				seriesIDs []types.Value
@@ -92,11 +92,11 @@ func selectScan(ctx context.Context, db *sql.DB) (err error) {
 					table.ValueParam("$seriesTitle", types.TextValue("%IT Crowd%")),
 				),
 			)
-			if err = row.Scan(&id); err != nil {
+			if err := row.Scan(&id); err != nil {
 				return err
 			}
 			seriesIDs = append(seriesIDs, types.BytesValueFromString(id))
-			if err = row.Err(); err != nil {
+			if err := row.Err(); err != nil {
 				return err
 			}
 
@@ -167,15 +167,15 @@ func selectScan(ctx context.Context, db *sql.DB) (err error) {
 	return nil
 }
 
-func fillTablesWithData(ctx context.Context, db *sql.DB) (err error) {
+func fillTablesWithData(ctx context.Context, db *sql.DB) error {
 	series, seasonsData, episodesData := getData()
 	args := []interface{}{
 		sql.Named("seriesData", types.ListValue(series...)),
 		sql.Named("seasonsData", types.ListValue(seasonsData...)),
 		sql.Named("episodesData", types.ListValue(episodesData...)),
 	}
-	err = retry.DoTx(ctx, db, func(ctx context.Context, tx *sql.Tx) error {
-		if _, err = tx.ExecContext(ctx, `
+	err := retry.DoTx(ctx, db, func(ctx context.Context, tx *sql.Tx) error {
+		if _, err := tx.ExecContext(ctx, `
 			REPLACE INTO series
 			SELECT
 				series_id,
@@ -216,9 +216,9 @@ func fillTablesWithData(ctx context.Context, db *sql.DB) (err error) {
 	return nil
 }
 
-func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
-	err = retry.Do(ctx, db, func(ctx context.Context, cc *sql.Conn) error {
-		err = dropTableIfExists(ctx, cc, "series")
+func prepareSchema(ctx context.Context, db *sql.DB) error {
+	err := retry.Do(ctx, db, func(ctx context.Context, cc *sql.Conn) error {
+		err := dropTableIfExists(ctx, cc, "series")
 		if err != nil {
 			_, _ = fmt.Fprintf(os.Stdout, "warn: drop series table failed: %v\n", err)
 		}

diff --git a/examples/basic/gorm/models.go b/examples/basic/gorm/models.go
@@ -17,7 +17,7 @@ type Series struct {
 	Seasons []Season
 }
 
-func (s *Series) BeforeCreate(_ *gorm.DB) (err error) {
+func (s *Series) BeforeCreate(_ *gorm.DB) error {
 	id, err := uuid.NewUUID()
 	if err != nil {
 		return err
@@ -27,7 +27,7 @@ func (s *Series) BeforeCreate(_ *gorm.DB) (err error) {
 		s.Seasons[i].SeriesID = s.ID
 	}
 
-	return
+	return err
 }
 
 type Season struct {
@@ -40,7 +40,7 @@ type Season struct {
 	Episodes []Episode
 }
 
-func (s *Season) BeforeCreate(_ *gorm.DB) (err error) {
+func (s *Season) BeforeCreate(_ *gorm.DB) error {
 	id, err := uuid.NewUUID()
 	if err != nil {
 		return err
@@ -50,7 +50,7 @@ func (s *Season) BeforeCreate(_ *gorm.DB) (err error) {
 		s.Episodes[i].SeasonID = s.ID
 	}
 
-	return
+	return err
 }
 
 type Episode struct {
@@ -60,12 +60,12 @@ type Episode struct {
 	AirDate  time.Time `gorm:"column:air_date"`
 }
 
-func (e *Episode) BeforeCreate(_ *gorm.DB) (err error) {
+func (e *Episode) BeforeCreate(_ *gorm.DB) error {
 	id, err := uuid.NewUUID()
 	if err != nil {
 		return err
 	}
 	e.ID = id.String()
 
-	return
+	return err
 }
diff --git a/examples/basic/native/series.go b/examples/basic/native/series.go
@@ -70,18 +70,21 @@ SELECT
 FROM AS_TABLE($episodesData);
 `))
 
-func readTable(ctx context.Context, c table.Client, path string) (err error) {
-	var res result.StreamResult
+func readTable(ctx context.Context, c table.Client, path string) error {
+	var (
+		res result.StreamResult
+		err error
+	)
 	err = c.Do(ctx,
-		func(ctx context.Context, s table.Session) (err error) {
+		func(ctx context.Context, s table.Session) error {
 			res, err = s.StreamReadTable(ctx, path,
 				options.ReadOrdered(),
 				options.ReadColumn("series_id"),
 				options.ReadColumn("title"),
 				options.ReadColumn("release_date"),
 			)
 
-			return
+			return err
 		},
 	)
 	if err != nil {
@@ -138,13 +141,16 @@ func readTable(ctx context.Context, c table.Client, path string) (err error) {
 	return res.Err()
 }
 
-func describeTableOptions(ctx context.Context, c table.Client) (err error) {
-	var desc options.TableOptionsDescription
+func describeTableOptions(ctx context.Context, c table.Client) error {
+	var (
+		desc options.TableOptionsDescription
+		err  error
+	)
 	err = c.Do(ctx,
-		func(ctx context.Context, s table.Session) (err error) {
+		func(ctx context.Context, s table.Session) error {
 			desc, err = s.DescribeTableOptions(ctx)
 
-			return
+			return err
 		},
 	)
 	if err != nil {
@@ -191,7 +197,7 @@ func describeTableOptions(ctx context.Context, c table.Client) (err error) {
 	return nil
 }
 
-func selectSimple(ctx context.Context, c table.Client, prefix string) (err error) {
+func selectSimple(ctx context.Context, c table.Client, prefix string) error {
 	query := render(
 		template.Must(template.New("").Parse(`
 			PRAGMA TablePathPrefix("{{ .TablePathPrefix }}");
@@ -220,17 +226,20 @@ func selectSimple(ctx context.Context, c table.Client, prefix string) (err error
 		),
 		table.CommitTx(),
 	)
-	var res result.Result
+	var (
+		res result.Result
+		err error
+	)
 	err = c.Do(ctx,
-		func(ctx context.Context, s table.Session) (err error) {
+		func(ctx context.Context, s table.Session) error {
 			_, res, err = s.Execute(ctx, readTx, query,
 				table.NewQueryParameters(
 					table.ValueParam("$seriesID", types.Uint64Value(1)),
 				),
 				options.WithCollectStatsModeBasic(),
 			)
 
-			return
+			return err
 		},
 	)
 	if err != nil {
@@ -266,7 +275,7 @@ func selectSimple(ctx context.Context, c table.Client, prefix string) (err error
 	return res.Err()
 }
 
-func scanQuerySelect(ctx context.Context, c table.Client, prefix string) (err error) {
+func scanQuerySelect(ctx context.Context, c table.Client, prefix string) error {
 	query := render(
 		template.Must(template.New("").Parse(`
 			PRAGMA TablePathPrefix("{{ .TablePathPrefix }}");
@@ -327,15 +336,16 @@ func scanQuerySelect(ctx context.Context, c table.Client, prefix string) (err er
 	)
 }
 
-func fillTablesWithData(ctx context.Context, c table.Client, prefix string) (err error) {
+func fillTablesWithData(ctx context.Context, c table.Client, prefix string) error {
+	var err error
 	writeTx := table.TxControl(
 		table.BeginTx(
 			table.WithSerializableReadWrite(),
 		),
 		table.CommitTx(),
 	)
 	err = c.Do(ctx,
-		func(ctx context.Context, s table.Session) (err error) {
+		func(ctx context.Context, s table.Session) error {
 			_, _, err = s.Execute(ctx, writeTx, render(fill, templateConfig{
 				TablePathPrefix: prefix,
 			}), table.NewQueryParameters(
@@ -351,8 +361,8 @@ func fillTablesWithData(ctx context.Context, c table.Client, prefix string) (err
 	return err
 }
 
-func createTables(ctx context.Context, c table.Client, prefix string) (err error) {
-	err = c.Do(ctx,
+func createTables(ctx context.Context, c table.Client, prefix string) error {
+	err := c.Do(ctx,
 		func(ctx context.Context, s table.Session) error {
 			return s.CreateTable(ctx, path.Join(prefix, "series"),
 				options.WithColumn("series_id", types.Optional(types.TypeUint64)),
@@ -403,8 +413,8 @@ func createTables(ctx context.Context, c table.Client, prefix string) (err error
 	return nil
 }
 
-func describeTable(ctx context.Context, c table.Client, path string) (err error) {
-	err = c.Do(ctx,
+func describeTable(ctx context.Context, c table.Client, path string) error {
+	err := c.Do(ctx,
 		func(ctx context.Context, s table.Session) error {
 			desc, err := s.DescribeTable(ctx, path)
 			if err != nil {
@@ -419,7 +429,7 @@ func describeTable(ctx context.Context, c table.Client, path string) (err error)
 		},
 	)
 
-	return
+	return err
 }
 
 func render(t *template.Template, data interface{}) string {