simplify check err is IsRetryable

Author: asmyasnikov

pkg/util/xorm/dialect_ydb.go

@@ -392,9 +392,9 @@ type inArgMap struct {
 }
 
 type inArgSegment struct {
-	singleIdx       int   // if listCount == 0: use args[singleIdx]
-	listStart       int   // if listCount > 0: use args[listStart:listStart+listCount] as one list arg
-	listCount       int
+	singleIdx int // if listCount == 0: use args[singleIdx]
+	listStart int // if listCount > 0: use args[listStart:listStart+listCount] as one list arg
+	listCount int
 }
 
 const inClauseCollapseThreshold = 50 // collapse IN (?,...,?) into IN ? (single list param) when param count >= this
@@ -426,11 +426,15 @@ func rewriteQueryInClausesNumeric(query string) (newQuery string, argMap *inArgM
 	i := 0
 	for i < len(query) {
 		j := i
-		for j < len(query) && isSpace(query[j]) { j++ }
+		for j < len(query) && isSpace(query[j]) {
+			j++
+		}
 		// Match "IN" (word boundary) then optional whitespace then "(" (so " IN (", " IN\n(", "IN(")
 		if j+2 <= len(query) && (j == 0 || !isWordChar(query[j-1])) && strings.EqualFold(query[j:j+2], "in") {
 			k := j + 2
-			for k < len(query) && isSpace(query[k]) { k++ }
+			for k < len(query) && isSpace(query[k]) {
+				k++
+			}
 			if k < len(query) && query[k] == '(' {
 				parenStart := k
 				parenEnd := findMatchingParen(query, parenStart)
@@ -573,7 +577,9 @@ func rewriteQueryInClausesQuestion(query string) (newQuery string, argMap *inArg
 	for i < len(query) {
 		if (i == 0 || !isWordChar(query[i-1])) && i+4 <= len(query) {
 			j := i
-			for j < len(query) && isSpace(query[j]) { j++ }
+			for j < len(query) && isSpace(query[j]) {
+				j++
+			}
 			if j+4 <= len(query) && strings.EqualFold(query[j:j+4], "in (") {
 				parenStart := j + 3
 				parenEnd := findMatchingParen(query, parenStart)
@@ -1834,111 +1840,8 @@ func (db *ydbDialect) Filters() []core.Filter {
 	return []core.Filter{&core.IdFilter{}, &core.SeqFilter{Prefix: "$", Start: 1}}
 }
 
-const (
-	ydb_grpc_Canceled           uint32 = 1
-	ydb_grpc_Unknown            uint32 = 2
-	ydb_grpc_InvalidArgument    uint32 = 3
-	ydb_grpc_DeadlineExceeded   uint32 = 4
-	ydb_grpc_NotFound           uint32 = 5
-	ydb_grpc_AlreadyExists      uint32 = 6
-	ydb_grpc_PermissionDenied   uint32 = 7
-	ydb_grpc_ResourceExhausted  uint32 = 8
-	ydb_grpc_FailedPrecondition uint32 = 9
-	ydb_grpc_Aborted            uint32 = 10
-	ydb_grpc_OutOfRange         uint32 = 11
-	ydb_grpc_Unimplemented      uint32 = 12
-	ydb_grpc_Internal           uint32 = 13
-	ydb_grpc_Unavailable        uint32 = 14
-	ydb_grpc_DataLoss           uint32 = 15
-	ydb_grpc_Unauthenticated    uint32 = 16
-)
-
-const (
-	ydb_STATUS_CODE_UNSPECIFIED int32 = 0
-	ydb_SUCCESS                 int32 = 400000
-	ydb_BAD_REQUEST             int32 = 400010
-	ydb_UNAUTHORIZED            int32 = 400020
-	ydb_INTERNAL_ERROR          int32 = 400030
-	ydb_ABORTED                 int32 = 400040
-	ydb_UNAVAILABLE             int32 = 400050
-	ydb_OVERLOADED              int32 = 400060
-	ydb_SCHEME_ERROR            int32 = 400070
-	ydb_GENERIC_ERROR           int32 = 400080
-	ydb_TIMEOUT                 int32 = 400090
-	ydb_BAD_SESSION             int32 = 400100
-	ydb_PRECONDITION_FAILED     int32 = 400120
-	ydb_ALREADY_EXISTS          int32 = 400130
-	ydb_NOT_FOUND               int32 = 400140
-	ydb_SESSION_EXPIRED         int32 = 400150
-	ydb_CANCELLED               int32 = 400160
-	ydb_UNDETERMINED            int32 = 400170
-	ydb_UNSUPPORTED             int32 = 400180
-	ydb_SESSION_BUSY            int32 = 400190
-)
-
-// https://github.com/ydb-platform/ydb-go-sdk/blob/ca13feb3ca560ac7385e79d4365ffe0cd8c23e21/errors.go#L27
 func (db *ydbDialect) IsRetryable(err error) bool {
-	var target interface {
-		error
-		Code() int32
-		Name() string
-	}
-	if errors.Is(err, fmt.Errorf("unknown error")) ||
-		errors.Is(err, context.DeadlineExceeded) ||
-		errors.Is(err, context.Canceled) {
-		return false
-	}
-	if !errors.As(err, &target) {
-		return false
-	}
-
-	switch target.Code() {
-	case
-		int32(ydb_grpc_Unknown),
-		int32(ydb_grpc_InvalidArgument),
-		int32(ydb_grpc_DeadlineExceeded),
-		int32(ydb_grpc_NotFound),
-		int32(ydb_grpc_AlreadyExists),
-		int32(ydb_grpc_PermissionDenied),
-		int32(ydb_grpc_FailedPrecondition),
-		int32(ydb_grpc_OutOfRange),
-		int32(ydb_grpc_Unimplemented),
-		int32(ydb_grpc_DataLoss),
-		int32(ydb_grpc_Unauthenticated):
-		return false
-	case
-		int32(ydb_grpc_Canceled),
-		int32(ydb_grpc_ResourceExhausted),
-		int32(ydb_grpc_Aborted),
-		int32(ydb_grpc_Internal),
-		int32(ydb_grpc_Unavailable):
-		return true
-	case
-		ydb_STATUS_CODE_UNSPECIFIED,
-		ydb_BAD_REQUEST,
-		ydb_UNAUTHORIZED,
-		ydb_INTERNAL_ERROR,
-		ydb_SCHEME_ERROR,
-		ydb_GENERIC_ERROR,
-		ydb_TIMEOUT,
-		ydb_PRECONDITION_FAILED,
-		ydb_ALREADY_EXISTS,
-		ydb_NOT_FOUND,
-		ydb_SESSION_EXPIRED,
-		ydb_CANCELLED,
-		ydb_UNSUPPORTED:
-		return false
-	case
-		ydb_ABORTED,
-		ydb_UNAVAILABLE,
-		ydb_OVERLOADED,
-		ydb_BAD_SESSION,
-		ydb_UNDETERMINED,
-		ydb_SESSION_BUSY:
-		return true
-	default:
-		return false
-	}
+	return retry.Check(err).MustRetry(false)
 }
 
 type ydbDriver struct {