* Improved errors.IsTransportError (check a few transport error codes instead check single transport error code)

* Improved `errors.Is` (check a few errors instead check single error)
* Refactored YDB errors checking API on client-side

Author: asmyasnikov

CHANGELOG.md

@@ -2,7 +2,10 @@
 * Improved error messages
 * Defended `cluster.balancer` with `sync.RWMutex` on `cluster.Insert`, `cluster.Update`, `cluster.Remove` and `cluster.Get`
 * Excluded `Close` and `Park` methods from `conn.Conn` interface
-* Fixed bug with `Create()` on multi-balancer 
+* Fixed bug with `Multi` balancer `Create()` 
+* Improved `errors.IsTransportError` (check a few transport error codes instead check single transport error code)
+* Improved `errors.Is` (check a few errors instead check single error)
+* Refactored YDB errors checking API on client-side
 
 ## 3.13.0
 * Refactored `Connection` interface

errors.go

@@ -28,29 +28,24 @@ func IsTimeoutError(err error) bool {
 	return errors.IsTimeoutError(err)
 }
 
-func IsTransportError(err error) bool {
-	return TransportErrorDescription(err) != nil
-}
-
-func IsTransportErrorCode(err error, codes ...int32) bool {
-	d := TransportErrorDescription(err)
-	if d == nil {
-		return false
-	}
-	for _, code := range codes {
-		if d.Code() == code {
-			return true
-		}
-	}
-	return false
+func IsTransportError(err error, codes ...int32) bool {
+	return errors.IsTransportError(
+		err,
+		func() (cc []errors.TransportErrorCode) {
+			for _, code := range codes {
+				cc = append(cc, errors.TransportErrorCode(code))
+			}
+			return cc
+		}()...,
+	)
 }
 
 func IsTransportErrorCancelled(err error) bool {
-	return IsTransportErrorCode(err, int32(errors.TransportErrorCanceled))
+	return IsTransportError(err, int32(errors.TransportErrorCanceled))
 }
 
 func IsTransportErrorResourceExhausted(err error) bool {
-	return IsTransportErrorCode(err, int32(errors.TransportErrorResourceExhausted))
+	return IsTransportError(err, int32(errors.TransportErrorResourceExhausted))
 }
 
 type Error interface {
@@ -72,21 +67,16 @@ func IsYdbError(err error) bool {
 	return IsTransportError(err) || IsOperationError(err)
 }
 
-func IsOperationError(err error) bool {
-	return OperationErrorDescription(err) != nil
-}
-
-func IsOperationErrorCode(err error, codes ...int32) bool {
-	d := OperationErrorDescription(err)
-	if d == nil {
-		return false
-	}
-	for _, code := range codes {
-		if d.Code() == code {
-			return true
-		}
-	}
-	return false
+func IsOperationError(err error, codes ...int32) bool {
+	return errors.IsOpError(
+		err,
+		func() (cc []errors.StatusCode) {
+			for _, code := range codes {
+				cc = append(cc, errors.StatusCode(code))
+			}
+			return cc
+		}()...,
+	)
 }
 
 func OperationErrorDescription(err error) Error {
@@ -98,23 +88,23 @@ func OperationErrorDescription(err error) Error {
 }
 
 func IsOperationErrorOverloaded(err error) bool {
-	return IsOperationErrorCode(err, int32(errors.StatusOverloaded))
+	return IsOperationError(err, int32(errors.StatusOverloaded))
 }
 
 func IsOperationErrorUnavailable(err error) bool {
-	return IsOperationErrorCode(err, int32(errors.StatusUnavailable))
+	return IsOperationError(err, int32(errors.StatusUnavailable))
 }
 
 func IsOperationErrorAlreadyExistsError(err error) bool {
-	return IsOperationErrorCode(err, int32(errors.StatusAlreadyExists))
+	return IsOperationError(err, int32(errors.StatusAlreadyExists))
 }
 
 func IsOperationErrorNotFoundError(err error) bool {
-	return IsOperationErrorCode(err, int32(errors.StatusNotFound))
+	return IsOperationError(err, int32(errors.StatusNotFound))
 }
 
 func IsOperationErrorSchemeError(err error) bool {
-	return IsOperationErrorCode(err, int32(errors.StatusSchemeError))
+	return IsOperationError(err, int32(errors.StatusSchemeError))
 }
 
 func IsRatelimiterAcquireError(err error) bool {

internal/errors/errors.go

@@ -14,12 +14,17 @@ import (
 func IsTimeoutError(err error) bool {
 	switch {
 	case
-		IsOpError(err, StatusTimeout),
-		IsOpError(err, StatusCancelled),
-		IsTransportError(err, TransportErrorCanceled),
-		IsTransportError(err, TransportErrorDeadlineExceeded),
-		errors.Is(err, context.DeadlineExceeded),
-		errors.Is(err, context.Canceled):
+		IsOpError(
+			err,
+			StatusTimeout,
+			StatusCancelled,
+		),
+		IsTransportError(err, TransportErrorCanceled, TransportErrorDeadlineExceeded),
+		Is(
+			err,
+			context.DeadlineExceeded,
+			context.Canceled,
+		):
 		return true
 	default:
 		return false
@@ -49,10 +54,18 @@ func As(err error, target interface{}) bool {
 	return errors.As(err, target)
 }
 
-// Is is a proxy to errors.Is
+// Is is a improved proxy to errors.Is
 // This need to single import errors
-func Is(err, target error) bool {
-	return errors.Is(err, target)
+func Is(err error, targets ...error) bool {
+	if len(targets) == 0 {
+		panic("empty targets")
+	}
+	for _, target := range targets {
+		if errors.Is(err, target) {
+			return true
+		}
+	}
+	return false
 }
 
 // New is a proxy to errors.New

internal/errors/operation.go

@@ -89,6 +89,9 @@ func IsOpError(err error, codes ...StatusCode) bool {
 	if !errors.As(err, &op) {
 		return false
 	}
+	if len(codes) == 0 {
+		return true
+	}
 	for _, code := range codes {
 		if op.Reason == code {
 			return true

internal/errors/transport.go

@@ -320,15 +320,23 @@ func transportErrorString(t TransportErrorCode) string {
 
 // IsTransportError reports whether err is TransportError with given code as
 // the Reason.
-func IsTransportError(err error, code TransportErrorCode) bool {
+func IsTransportError(err error, codes ...TransportErrorCode) bool {
 	if err == nil {
 		return false
 	}
 	var t *TransportError
 	if !errors.As(err, &t) {
 		return false
 	}
-	return t.Reason == code
+	if len(codes) == 0 {
+		return true
+	}
+	for _, code := range codes {
+		if t.Reason == code {
+			return true
+		}
+	}
+	return false
 }
 
 func MapGRPCError(err error) error {

internal/scripting/scripting.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Scripting"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_TableStats"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
@@ -134,7 +135,7 @@ func (c *client) StreamExecute(
 	)
 	defer func() {
 		if err != nil {
-			onIntermediate(err)(err)
+			onIntermediate(errors.HideEOF(err))(errors.HideEOF(err))
 		}
 	}()
 
@@ -153,7 +154,7 @@ func (c *client) StreamExecute(
 			err error,
 		) {
 			defer func() {
-				onIntermediate(err)
+				onIntermediate(errors.HideEOF(err))
 			}()
 			select {
 			case <-ctx.Done():
@@ -169,7 +170,7 @@ func (c *client) StreamExecute(
 		},
 		func(err error) error {
 			cancel()
-			onIntermediate(err)(err)
+			onIntermediate(errors.HideEOF(err))(errors.HideEOF(err))
 			return err
 		},
 	), nil

internal/table/client.go

@@ -58,7 +58,7 @@ func newClient(
 	builder SessionBuilder,
 	config config.Config,
 ) *client {
-	onDone := trace.TableOnPoolInit(config.Trace().Compose(trace.ContextTable(ctx)), &ctx)
+	onDone := trace.TableOnInit(config.Trace().Compose(trace.ContextTable(ctx)), &ctx)
 	if builder == nil {
 		builder = func(ctx context.Context) (s Session, err error) {
 			return newSession(ctx, cc, config)
@@ -128,9 +128,12 @@ func isCreateSessionErrorRetriable(err error) bool {
 	case
 		errors.Is(err, ErrSessionPoolOverflow),
 		errors.IsOpError(err, errors.StatusOverloaded),
-		errors.IsTransportError(err, errors.TransportErrorResourceExhausted),
-		errors.IsTransportError(err, errors.TransportErrorDeadlineExceeded),
-		errors.IsTransportError(err, errors.TransportErrorUnavailable):
+		errors.IsTransportError(
+			err,
+			errors.TransportErrorResourceExhausted,
+			errors.TransportErrorDeadlineExceeded,
+			errors.TransportErrorUnavailable,
+		):
 		return true
 	default:
 		return false
@@ -414,7 +417,7 @@ func (c *client) Put(ctx context.Context, s Session) (err error) {
 // It returns first error occurred during stale sessions' deletion.
 // Note that even on error it calls Close() on each session.
 func (c *client) Close(ctx context.Context) (err error) {
-	onDone := trace.TableOnPoolClose(c.config.Trace().Compose(trace.ContextTable(ctx)), &ctx)
+	onDone := trace.TableOnClose(c.config.Trace().Compose(trace.ContextTable(ctx)), &ctx)
 	defer func() {
 		onDone(err)
 	}()
@@ -573,11 +576,17 @@ func (c *client) keeper(ctx context.Context) {
 				if err != nil {
 					switch {
 					case
-						errors.Is(err, cluster.ErrClusterClosed),
-						errors.Is(err, cluster.ErrClusterEmpty),
+						errors.Is(
+							err,
+							cluster.ErrClusterClosed,
+							cluster.ErrClusterEmpty,
+						),
 						errors.IsOpError(err, errors.StatusBadSession),
-						errors.IsTransportError(err, errors.TransportErrorDeadlineExceeded),
-						errors.IsTransportError(err, errors.TransportErrorUnavailable):
+						errors.IsTransportError(
+							err,
+							errors.TransportErrorDeadlineExceeded,
+							errors.TransportErrorUnavailable,
+						):
 						toDelete = append(toDelete, s)
 					default:
 						toTryAgain = append(toTryAgain, s)

internal/table/session.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_TableStats"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/cluster"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/feature"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
@@ -960,7 +961,7 @@ func (s *session) StreamExecuteScanQuery(
 	)
 	defer func() {
 		if err != nil {
-			onIntermediate(err)(err)
+			onIntermediate(errors.HideEOF(err))(errors.HideEOF(err))
 		}
 	}()
 
@@ -987,7 +988,7 @@ func (s *session) StreamExecuteScanQuery(
 			err error,
 		) {
 			defer func() {
-				onIntermediate(err)
+				onIntermediate(errors.HideEOF(err))
 			}()
 			select {
 			case <-ctx.Done():
@@ -1003,7 +1004,7 @@ func (s *session) StreamExecuteScanQuery(
 		},
 		func(err error) error {
 			cancel()
-			onIntermediate(err)(err)
+			onIntermediate(errors.HideEOF(err))(errors.HideEOF(err))
 			if checkHintSessionClose(stream.Trailer()) {
 				s.SetStatus(options.SessionClosing)
 			}