Skip to content

Commit c6e45cd

Browse files
size12size12
authored
enabled nlreturn (#1027)
* enabled nlreturn + partial fix * nlreturn refactoring pt.2 * fix nlreturn pt. 3 * nlreturn fixed * fixed tests * codegen fix * fixed gtrace codegen
1 parent 54823f0 commit c6e45cd

File tree

264 files changed

+1731
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+1731
-11
lines changed

‎.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ linters:
238238
- ireturn
239239
- maintidx
240240
- maligned
241-
- nlreturn
242241
- nonamedreturns
243242
- paralleltest
244243
- protogetter

‎balancers/balancers.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func (filterLocalDC) String() string {
4040
func PreferLocalDC(balancer *balancerConfig.Config) *balancerConfig.Config {
4141
balancer.Filter = filterLocalDC{}
4242
balancer.DetectLocalDC = true
43+
4344
return balancer
4445
}
4546

@@ -49,6 +50,7 @@ func PreferLocalDC(balancer *balancerConfig.Config) *balancerConfig.Config {
4950
func PreferLocalDCWithFallBack(balancer *balancerConfig.Config) *balancerConfig.Config {
5051
balancer = PreferLocalDC(balancer)
5152
balancer.AllowFallback = true
53+
5254
return balancer
5355
}
5456

@@ -61,6 +63,7 @@ func (locations filterLocations) Allow(_ balancerConfig.Info, c conn.Conn) bool
6163
return true
6264
}
6365
}
66+
6467
return false
6568
}
6669

@@ -91,6 +94,7 @@ func PreferLocations(balancer *balancerConfig.Config, locations ...string) *bala
9194
}
9295
sort.Strings(locations)
9396
balancer.Filter = filterLocations(locations)
97+
9498
return balancer
9599
}
96100

@@ -100,6 +104,7 @@ func PreferLocations(balancer *balancerConfig.Config, locations ...string) *bala
100104
func PreferLocationsWithFallback(balancer *balancerConfig.Config, locations ...string) *balancerConfig.Config {
101105
balancer = PreferLocations(balancer, locations...)
102106
balancer.AllowFallback = true
107+
103108
return balancer
104109
}
105110

@@ -129,6 +134,7 @@ func Prefer(balancer *balancerConfig.Config, filter func(endpoint Endpoint) bool
129134
balancer.Filter = filterFunc(func(_ balancerConfig.Info, c conn.Conn) bool {
130135
return filter(c.Endpoint())
131136
})
137+
132138
return balancer
133139
}
134140

@@ -138,6 +144,7 @@ func Prefer(balancer *balancerConfig.Config, filter func(endpoint Endpoint) bool
138144
func PreferWithFallback(balancer *balancerConfig.Config, filter func(endpoint Endpoint) bool) *balancerConfig.Config {
139145
balancer = Prefer(balancer, filter)
140146
balancer.AllowFallback = true
147+
141148
return balancer
142149
}
143150

‎balancers/balancers_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,6 @@ func applyPreferFilter(info balancerConfig.Info, b *balancerConfig.Config, conns
6666
res = append(res, c)
6767
}
6868
}
69+
6970
return res
7071
}

‎balancers/config.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ func CreateFromConfig(s string) (*balancerConfig.Config, error) {
9292
if c.Fallback {
9393
return PreferLocalDCWithFallBack(b), nil
9494
}
95+
9596
return PreferLocalDC(b), nil
9697
case preferTypeLocations:
9798
if len(c.Locations) == 0 {
@@ -100,6 +101,7 @@ func CreateFromConfig(s string) (*balancerConfig.Config, error) {
100101
if c.Fallback {
101102
return PreferLocationsWithFallback(b, c.Locations...), nil
102103
}
104+
103105
return PreferLocations(b, c.Locations...), nil
104106
default:
105107
return b, nil
@@ -125,6 +127,7 @@ func FromConfig(config string, opts ...fromConfigOption) *balancerConfig.Config
125127
if h.errorHandler != nil {
126128
h.errorHandler(err)
127129
}
130+
128131
return h.fallbackBalancer
129132
}
130133

‎config/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,5 +292,6 @@ func (c *Config) With(opts ...Option) *Config {
292292
c.trace,
293293
c.metaOptions...,
294294
)
295+
295296
return c
296297
}

‎config/defaults.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func defaultGrpcOptions(t *trace.Driver, secure bool, tlsConfig *tls.Config) (op
6464
insecure.NewCredentials(),
6565
))
6666
}
67+
6768
return opts
6869
}
6970

@@ -72,6 +73,7 @@ func certPool() *x509.CertPool {
7273
if err == nil {
7374
return certPool
7475
}
76+
7577
return x509.NewCertPool()
7678
}
7779

‎coordination/example_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ func Example() {
1414
db, err := ydb.Open(ctx, "grpc://localhost:2136/local")
1515
if err != nil {
1616
fmt.Printf("failed to connect: %v", err)
17+
1718
return
1819
}
1920
defer db.Close(ctx) // cleanup resources
@@ -28,12 +29,14 @@ func Example() {
2829
})
2930
if err != nil {
3031
fmt.Printf("failed to create node: %v", err)
32+
3133
return
3234
}
3335
defer db.Coordination().DropNode(ctx, "/local/test")
3436
e, c, err := db.Coordination().DescribeNode(ctx, "/local/test")
3537
if err != nil {
3638
fmt.Printf("failed to describe node: %v", err)
39+
3740
return
3841
}
3942
fmt.Printf("node description: %+v\nnode config: %+v\n", e, c)

‎discovery/example_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ func Example_discoverCluster() {
1212
db, err := ydb.Open(ctx, "grpc://localhost:2136/local")
1313
if err != nil {
1414
fmt.Printf("failed to connect: %v", err)
15+
1516
return
1617
}
1718
defer db.Close(ctx) // cleanup resources
1819
endpoints, err := db.Discovery().Discover(ctx)
1920
if err != nil {
2021
fmt.Printf("discover failed: %v", err)
22+
2123
return
2224
}
2325
fmt.Printf("%s endpoints:\n", db.Name())
@@ -31,12 +33,14 @@ func Example_whoAmI() {
3133
db, err := ydb.Open(ctx, "grpc://localhost:2136/local")
3234
if err != nil {
3335
fmt.Printf("failed to connect: %v", err)
36+
3437
return
3538
}
3639
defer db.Close(ctx) // cleanup resources
3740
whoAmI, err := db.Discovery().WhoAmI(ctx)
3841
if err != nil {
3942
fmt.Printf("discover failed: %v", err)
43+
4044
return
4145
}
4246
fmt.Printf("%s whoAmI: %s\n", db.Name(), whoAmI.String())

‎driver_string.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ func (d *Driver) String() string {
1818
fmt.Fprintf(buffer, ",Credentials:%v", c.String())
1919
}
2020
buffer.WriteByte('}')
21+
2122
return buffer.String()
2223
}

‎driver_string_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestDriver_String(t *testing.T) {
2323
config.WithDatabase("local"),
2424
config.WithSecure(false),
2525
)},
26-
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
26+
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
2727
},
2828
{
2929
name: xtest.CurrentFileLine(),
@@ -32,7 +32,7 @@ func TestDriver_String(t *testing.T) {
3232
config.WithDatabase("local"),
3333
config.WithSecure(true),
3434
)},
35-
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
35+
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
3636
},
3737
{
3838
name: xtest.CurrentFileLine(),

‎examples/basic/database_sql/data.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func seriesData(id string, released time.Time, title, info, comment string) type
1818
} else {
1919
commentv = types.OptionalValue(types.TextValue(comment))
2020
}
21+
2122
return types.StructValue(
2223
types.StructFieldValue("series_id", types.BytesValueFromString(id)),
2324
types.StructFieldValue("release_date", types.DateValueFromTime(released)),
@@ -59,6 +60,7 @@ func getData() (series, seasons, episodes []types.Value) {
5960
seasons = append(seasons, seasonsData...)
6061
episodes = append(episodes, episodesData...)
6162
}
63+
6264
return
6365
}
6466

@@ -114,6 +116,7 @@ func getDataForITCrowd(seriesID string) (series types.Value, seasons, episodes [
114116
episodes = append(episodes, episodeData(seriesID, seasonID, uuid.New().String(), title, date))
115117
}
116118
}
119+
117120
return series, seasons, episodes
118121
}
119122

@@ -193,6 +196,7 @@ func getDataForSiliconValley(seriesID string) (series types.Value, seasons, epis
193196
episodes = append(episodes, episodeData(seriesID, seasonID, uuid.New().String(), title, date))
194197
}
195198
}
199+
196200
return series, seasons, episodes
197201
}
198202

@@ -203,5 +207,6 @@ func date(date string) time.Time {
203207
if err != nil {
204208
panic(err)
205209
}
210+
206211
return t
207212
}

‎examples/basic/database_sql/series.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func selectDefault(ctx context.Context, db *sql.DB) (err error) {
3030
return err
3131
}
3232
log.Printf("AST = %s\n\nPlan = %s", ast, plan)
33+
3334
return nil
3435
}, retry.WithIdempotent(true))
3536
if err != nil {
@@ -61,11 +62,13 @@ func selectDefault(ctx context.Context, db *sql.DB) (err error) {
6162
*id, *title, releaseDate.Format("2006-01-02"),
6263
)
6364
}
65+
6466
return rows.Err()
6567
}, retry.WithIdempotent(true))
6668
if err != nil {
6769
return fmt.Errorf("execute data query failed: %w", err)
6870
}
71+
6972
return nil
7073
}
7174

@@ -154,11 +157,13 @@ func selectScan(ctx context.Context, db *sql.DB) (err error) {
154157
episodeID, title, firstAired.Format("2006-01-02"),
155158
)
156159
}
160+
157161
return rows.Err()
158162
}, retry.WithIdempotent(true))
159163
if err != nil {
160164
return fmt.Errorf("scan query failed: %w", err)
161165
}
166+
162167
return nil
163168
}
164169

@@ -201,11 +206,13 @@ func fillTablesWithData(ctx context.Context, db *sql.DB) (err error) {
201206
); err != nil {
202207
return err
203208
}
209+
204210
return nil
205211
}, retry.WithIdempotent(true))
206212
if err != nil {
207213
return fmt.Errorf("upsert query failed: %w", err)
208214
}
215+
209216
return nil
210217
}
211218

@@ -232,8 +239,10 @@ func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
232239
)
233240
if err != nil {
234241
_, _ = fmt.Fprintf(os.Stderr, "create series table failed: %v", err)
242+
235243
return err
236244
}
245+
237246
return nil
238247
}, retry.WithIdempotent(true))
239248
if err != nil {
@@ -263,8 +272,10 @@ func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
263272
)
264273
if err != nil {
265274
_, _ = fmt.Fprintf(os.Stderr, "create seasons table failed: %v\n", err)
275+
266276
return err
267277
}
278+
268279
return nil
269280
}, retry.WithIdempotent(true))
270281
if err != nil {
@@ -296,13 +307,16 @@ func prepareSchema(ctx context.Context, db *sql.DB) (err error) {
296307
)
297308
if err != nil {
298309
_, _ = fmt.Fprintf(os.Stderr, "create episodes table failed: %v\n", err)
310+
299311
return err
300312
}
313+
301314
return nil
302315
}, retry.WithIdempotent(true))
303316
if err != nil {
304317
return fmt.Errorf("create table failed: %w", err)
305318
}
319+
306320
return nil
307321
}
308322

@@ -326,5 +340,6 @@ func dropTableIfExists(ctx context.Context, cc *sql.Conn, tableName string) erro
326340
if err != nil {
327341
return fmt.Errorf("drop table failed: %w", err)
328342
}
343+
329344
return nil
330345
}

‎examples/basic/gorm/data.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,5 +373,6 @@ func date(date string) time.Time {
373373
if err != nil {
374374
panic(err)
375375
}
376+
376377
return t
377378
}

‎examples/basic/gorm/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ func prepareScheme(db *gorm.DB) error {
8585
); err != nil {
8686
return err
8787
}
88+
8889
return db.AutoMigrate(
8990
&Series{},
9091
&Season{},
@@ -123,6 +124,7 @@ func readAll(db *gorm.DB) error {
123124
}
124125
}
125126
}
127+
126128
return nil
127129
}
128130

@@ -161,5 +163,6 @@ func findEpisodesByTitle(db *gorm.DB, fragment string) error {
161163
episodes[i].ID, episodes[i].AirDate.Format(dateISO8601), episodes[i].Title,
162164
)
163165
}
166+
164167
return nil
165168
}

‎examples/basic/gorm/models.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func (s *Series) BeforeCreate(_ *gorm.DB) (err error) {
2626
for i := range s.Seasons {
2727
s.Seasons[i].SeriesID = s.ID
2828
}
29+
2930
return
3031
}
3132

@@ -48,6 +49,7 @@ func (s *Season) BeforeCreate(_ *gorm.DB) (err error) {
4849
for i := range s.Episodes {
4950
s.Episodes[i].SeasonID = s.ID
5051
}
52+
5153
return
5254
}
5355

@@ -64,5 +66,6 @@ func (e *Episode) BeforeCreate(_ *gorm.DB) (err error) {
6466
return err
6567
}
6668
e.ID = id.String()
69+
6770
return
6871
}

‎examples/basic/native/data.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ func seriesData(id uint64, released time.Time, title, info, comment string) type
1313
} else {
1414
commentv = types.OptionalValue(types.TextValue(comment))
1515
}
16+
1617
return types.StructValue(
1718
types.StructFieldValue("series_id", types.Uint64Value(id)),
1819
types.StructFieldValue("release_date", types.DateValueFromTime(released)),
@@ -155,5 +156,6 @@ func days(date string) time.Time {
155156
if err != nil {
156157
panic(err)
157158
}
159+
158160
return t
159161
}

0 commit comments

Comments
 (0)