Skip to content

Commit 50911d5

Browse files
asmyasnikovasmyasnikov
committed
* Renamed internal packages errors, net and resolver to xerrors, xnet and xresolver for exclude ambiguous interpretation
1 parent cfa1099 commit 50911d5

Some content is hidden

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

70 files changed

+613
-611
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* Renamed internal packages `errors`, `net` and `resolver` to `xerrors`, `xnet` and `xresolver` for exclude ambiguous interpretation
2+
13
## v3.18.3
24
* Added `WithPanicCallback` option to all service configs (discovery, coordination, ratelimiter, scheme, scripting, table) and auto-applying from `ydb.WithPanicCallback`
35
* Added panic recovering (if defined `ydb.WithPanicCallback` option) which thrown from retry operation

‎balancers/config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
8-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
8+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
99
)
1010

1111
type balancerType string
@@ -57,7 +57,7 @@ func CreateFromConfig(config string) (balancer.Balancer, error) {
5757
)
5858

5959
if err = json.Unmarshal([]byte(config), &c); err != nil {
60-
return nil, errors.WithStackTrace(err)
60+
return nil, xerrors.WithStackTrace(err)
6161
}
6262

6363
switch c.Type {
@@ -68,7 +68,7 @@ func CreateFromConfig(config string) (balancer.Balancer, error) {
6868
case typeRoundRobin:
6969
b = RoundRobin()
7070
default:
71-
return nil, errors.WithStackTrace(fmt.Errorf("unknown type of balancer: %s", c.Type))
71+
return nil, xerrors.WithStackTrace(fmt.Errorf("unknown type of balancer: %s", c.Type))
7272
}
7373

7474
switch c.Prefer {
@@ -79,7 +79,7 @@ func CreateFromConfig(config string) (balancer.Balancer, error) {
7979
return PreferLocalDC(b), nil
8080
case preferLocations:
8181
if len(c.Locations) == 0 {
82-
return nil, errors.WithStackTrace(fmt.Errorf("empty locations list in balancer '%s' config", c.Type))
82+
return nil, xerrors.WithStackTrace(fmt.Errorf("empty locations list in balancer '%s' config", c.Type))
8383
}
8484
if c.Fallback {
8585
return PreferLocationsWithFallback(b, c.Locations...), nil

‎config/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
1515
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
1616
"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
17-
builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/net"
18-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/resolver"
17+
builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/xnet"
18+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xresolver"
1919
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
2020
)
2121

@@ -299,7 +299,7 @@ func New(opts ...Option) Config {
299299
c.grpcOptions = append(
300300
c.grpcOptions,
301301
grpc.WithResolvers(
302-
resolver.New("ydb", c.trace),
302+
xresolver.New("ydb", c.trace),
303303
),
304304
)
305305
}

‎connection.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
1717
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
1818
"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
19-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
2019
"github.com/ydb-platform/ydb-go-sdk/v3/internal/lazy"
20+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
2121
"github.com/ydb-platform/ydb-go-sdk/v3/log"
2222
"github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
2323
ratelimiterConfig "github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter/config"
@@ -151,7 +151,7 @@ func (c *connection) Close(ctx context.Context) error {
151151
}
152152

153153
if len(issues) > 0 {
154-
return errors.WithStackTrace(errors.NewWithIssues("close failed", issues...))
154+
return xerrors.WithStackTrace(xerrors.NewWithIssues("close failed", issues...))
155155
}
156156

157157
return nil
@@ -248,7 +248,7 @@ func New(ctx context.Context, opts ...Option) (_ Connection, err error) {
248248
for _, opt := range opts {
249249
err = opt(ctx, c)
250250
if err != nil {
251-
return nil, errors.WithStackTrace(err)
251+
return nil, xerrors.WithStackTrace(err)
252252
}
253253
}
254254
c.config = config.New(c.options...)
@@ -292,7 +292,7 @@ func New(ctx context.Context, opts ...Option) (_ Connection, err error) {
292292
)...,
293293
)
294294
if err != nil {
295-
return nil, errors.WithStackTrace(err)
295+
return nil, xerrors.WithStackTrace(err)
296296
}
297297

298298
c.table = lazy.Table(

‎errors.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@ import (
55

66
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
77

8-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
98
ratelimiterErrors "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/errors"
9+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1010
"github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
1111
)
1212

1313
func IterateByIssues(err error, it func(message string, code Ydb.StatusIds_StatusCode, severity uint32)) {
14-
errors.IterateByIssues(err, it)
14+
xerrors.IterateByIssues(err, it)
1515
}
1616

1717
func IsTimeoutError(err error) bool {
18-
return errors.IsTimeoutError(err)
18+
return xerrors.IsTimeoutError(err)
1919
}
2020

2121
func IsTransportError(err error, codes ...grpcCodes.Code) bool {
22-
return errors.IsTransportError(err, codes...)
22+
return xerrors.IsTransportError(err, codes...)
2323
}
2424

25-
type Error errors.Error
25+
type Error xerrors.Error
2626

2727
func TransportError(err error) Error {
28-
return errors.TransportError(err)
28+
return xerrors.TransportError(err)
2929
}
3030

3131
func IsYdbError(err error) bool {
32-
return errors.IsYdb(err)
32+
return xerrors.IsYdb(err)
3333
}
3434

3535
func IsOperationError(err error, codes ...Ydb.StatusIds_StatusCode) bool {
36-
return errors.IsOperationError(err, codes...)
36+
return xerrors.IsOperationError(err, codes...)
3737
}
3838

3939
func OperationError(err error) Error {
40-
return errors.OperationError(err)
40+
return xerrors.OperationError(err)
4141
}
4242

4343
func IsOperationErrorOverloaded(err error) bool {

‎internal/balancer/rr/rr.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
1010
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/list"
1111
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
12-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/rand"
12+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xrand"
1313
)
1414

1515
// roundRobin is an implementation of weighted round-robin balancing algorithm.
@@ -24,7 +24,7 @@ type roundRobin struct {
2424
belt []int
2525
next int32
2626
conns list.List
27-
r rand.Rand
27+
r xrand.Rand
2828
}
2929

3030
func (r *roundRobin) Create() balancer.Balancer {
@@ -33,14 +33,14 @@ func (r *roundRobin) Create() balancer.Balancer {
3333

3434
func RoundRobin() balancer.Balancer {
3535
return &roundRobin{
36-
r: rand.New(rand.WithLock()),
36+
r: xrand.New(xrand.WithLock()),
3737
}
3838
}
3939

4040
func RandomChoice() balancer.Balancer {
4141
return &randomChoice{
4242
roundRobin: roundRobin{
43-
r: rand.New(rand.WithLock()),
43+
r: xrand.New(xrand.WithLock()),
4444
},
4545
}
4646
}

‎internal/cluster/cluster.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/ydb-platform/ydb-go-sdk/v3/internal/cluster/entry"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
1515
"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
16-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
1716
"github.com/ydb-platform/ydb-go-sdk/v3/internal/repeater"
17+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1818
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
1919
)
2020

@@ -24,10 +24,10 @@ const (
2424

2525
var (
2626
// ErrClusterClosed returned when requested on a closed cluster.
27-
ErrClusterClosed = errors.New(fmt.Errorf("cluster closed"))
27+
ErrClusterClosed = xerrors.Wrap(fmt.Errorf("cluster closed"))
2828

2929
// ErrClusterEmpty returned when no connections left in cluster.
30-
ErrClusterEmpty = errors.New(fmt.Errorf("cluster empty"))
30+
ErrClusterEmpty = xerrors.Wrap(fmt.Errorf("cluster empty"))
3131
)
3232

3333
type cluster struct {
@@ -239,7 +239,7 @@ func (c *cluster) Close(ctx context.Context) (err error) {
239239
}
240240

241241
if len(issues) > 0 {
242-
return errors.WithStackTrace(errors.NewWithIssues("cluster closed with issues", issues...))
242+
return xerrors.WithStackTrace(xerrors.NewWithIssues("cluster closed with issues", issues...))
243243
}
244244

245245
return nil
@@ -249,13 +249,13 @@ func (c *cluster) get(ctx context.Context) (cc conn.Conn, err error) {
249249
for {
250250
select {
251251
case <-c.done:
252-
return nil, errors.WithStackTrace(ErrClusterClosed)
252+
return nil, xerrors.WithStackTrace(ErrClusterClosed)
253253
case <-ctx.Done():
254-
return nil, errors.WithStackTrace(ctx.Err())
254+
return nil, xerrors.WithStackTrace(ctx.Err())
255255
default:
256256
cc = c.config.Balancer().Next()
257257
if cc == nil {
258-
return nil, errors.WithStackTrace(ErrClusterEmpty)
258+
return nil, xerrors.WithStackTrace(ErrClusterEmpty)
259259
}
260260
if err = cc.Ping(ctx); err == nil {
261261
return cc, nil
@@ -272,7 +272,7 @@ func (c *cluster) Get(ctx context.Context) (cc conn.Conn, err error) {
272272
defer cancel()
273273

274274
if c.isClosed() {
275-
return nil, errors.WithStackTrace(ErrClusterClosed)
275+
return nil, xerrors.WithStackTrace(ErrClusterClosed)
276276
}
277277

278278
onDone := trace.DriverOnClusterGet(c.config.Trace(), &ctx)

‎internal/cmd/gtrace/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"strings"
1919
_ "unsafe" // For go:linkname.
2020

21-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
21+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
2222
)
2323

2424
//go:linkname build_goodOSArchFile go/build.(*Context).goodOSArchFile
@@ -287,7 +287,7 @@ func buildFunc(info types.Info, traces map[string]*Trace, fn *ast.FuncType) (ret
287287
case *ast.FuncType:
288288
result, err := buildFunc(info, traces, x)
289289
if err != nil {
290-
return nil, errors.WithStackTrace(err)
290+
return nil, xerrors.WithStackTrace(err)
291291
}
292292
ret.Result = append(ret.Result, result)
293293
return ret, nil
@@ -405,7 +405,7 @@ func scanBuildConstraints(r io.Reader) (cs []string, err error) {
405405
for {
406406
line, err := br.ReadBytes('\n')
407407
if err != nil {
408-
return nil, errors.WithStackTrace(err)
408+
return nil, xerrors.WithStackTrace(err)
409409
}
410410
line = bytes.TrimSpace(line)
411411
if comm := bytes.TrimPrefix(line, []byte("//")); !bytes.Equal(comm, line) {

0 commit comments

Comments
 (0)