Merge pull request #1222 from brojeg/master

Enable funlen linter (part 3)

Author: asmyasnikov

internal/query/result.go

@@ -130,40 +130,10 @@ func (r *result) nextResultSet(ctx context.Context) (_ *resultSet, err error) {
 		case <-ctx.Done():
 			return nil, xerrors.WithStackTrace(ctx.Err())
 		default:
-			if resultSetIndex := r.lastPart.GetResultSetIndex(); resultSetIndex >= nextResultSetIndex { //nolint:nestif
+			if resultSetIndex := r.lastPart.GetResultSetIndex(); resultSetIndex >= nextResultSetIndex {
 				r.resultSetIndex = resultSetIndex
 
-				return newResultSet(func() (_ *Ydb_Query.ExecuteQueryResponsePart, err error) {
-					defer func() {
-						if err != nil && !xerrors.Is(err,
-							io.EOF, context.Canceled,
-						) {
-							r.errs = append(r.errs, err)
-						}
-					}()
-					select {
-					case <-r.closed:
-						return nil, errClosedResult
-					default:
-						part, err := nextPart(ctx, r.stream, r.trace)
-						if err != nil {
-							if xerrors.Is(err, io.EOF) {
-								_ = r.closeOnce(ctx)
-							}
-
-							return nil, xerrors.WithStackTrace(err)
-						}
-						r.lastPart = part
-						if part.GetResultSetIndex() > nextResultSetIndex {
-							return nil, xerrors.WithStackTrace(fmt.Errorf(
-								"result set (index=%d) receive part (index=%d) for next result set: %w",
-								nextResultSetIndex, part.GetResultSetIndex(), io.EOF,
-							))
-						}
-
-						return part, nil
-					}
-				}, r.lastPart, r.trace), nil
+				return newResultSet(r.getNextResultSetPart(ctx, nextResultSetIndex), r.lastPart, r.trace), nil
 			}
 			part, err := nextPart(ctx, r.stream, r.trace)
 			if err != nil {
@@ -181,6 +151,43 @@ func (r *result) nextResultSet(ctx context.Context) (_ *resultSet, err error) {
 	}
 }
 
+func (r *result) getNextResultSetPart(
+	ctx context.Context,
+	nextResultSetIndex int64,
+) func() (_ *Ydb_Query.ExecuteQueryResponsePart, err error) {
+	return func() (_ *Ydb_Query.ExecuteQueryResponsePart, err error) {
+		defer func() {
+			if err != nil && !xerrors.Is(err,
+				io.EOF, context.Canceled,
+			) {
+				r.errs = append(r.errs, err)
+			}
+		}()
+		select {
+		case <-r.closed:
+			return nil, errClosedResult
+		default:
+			part, err := nextPart(ctx, r.stream, r.trace)
+			if err != nil {
+				if xerrors.Is(err, io.EOF) {
+					_ = r.closeOnce(ctx)
+				}
+
+				return nil, xerrors.WithStackTrace(err)
+			}
+			r.lastPart = part
+			if part.GetResultSetIndex() > nextResultSetIndex {
+				return nil, xerrors.WithStackTrace(fmt.Errorf(
+					"result set (index=%d) receive part (index=%d) for next result set: %w",
+					nextResultSetIndex, part.GetResultSetIndex(), io.EOF,
+				))
+			}
+
+			return part, nil
+		}
+	}
+}
+
 func (r *result) NextResultSet(ctx context.Context) (_ query.ResultSet, err error) {
 	onDone := trace.QueryOnResultNextResultSet(r.trace, &ctx,
 		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/3/internal/query.(*result).NextResultSet"),

internal/query/session.go

@@ -122,26 +122,7 @@ func (s *Session) attach(ctx context.Context) (finalErr error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	s.closeOnce = xsync.OnceFunc(func(ctx context.Context) (err error) {
-		defer cancelAttach()
-
-		s.setStatus(statusClosing)
-		defer s.setStatus(statusClosed)
-
-		var cancel context.CancelFunc
-		if d := s.cfg.SessionDeleteTimeout(); d > 0 {
-			ctx, cancel = xcontext.WithTimeout(ctx, d)
-		} else {
-			ctx, cancel = xcontext.WithCancel(ctx)
-		}
-		defer cancel()
-
-		if err = deleteSession(ctx, s.grpcClient, s.id); err != nil {
-			return xerrors.WithStackTrace(err)
-		}
-
-		return nil
-	})
+	s.closeOnce = xsync.OnceFunc(s.closeAndDeleteSession(cancelAttach))
 
 	go func() {
 		defer func() {
@@ -168,6 +149,29 @@ func (s *Session) attach(ctx context.Context) (finalErr error) {
 	return nil
 }
 
+func (s *Session) closeAndDeleteSession(cancelAttach context.CancelFunc) func(ctx context.Context) (err error) {
+	return func(ctx context.Context) (err error) {
+		defer cancelAttach()
+
+		s.setStatus(statusClosing)
+		defer s.setStatus(statusClosed)
+
+		var cancel context.CancelFunc
+		if d := s.cfg.SessionDeleteTimeout(); d > 0 {
+			ctx, cancel = xcontext.WithTimeout(ctx, d)
+		} else {
+			ctx, cancel = xcontext.WithCancel(ctx)
+		}
+		defer cancel()
+
+		if err = deleteSession(ctx, s.grpcClient, s.id); err != nil {
+			return xerrors.WithStackTrace(err)
+		}
+
+		return nil
+	}
+}
+
 func deleteSession(ctx context.Context, client Ydb_Query_V1.QueryServiceClient, sessionID string) error {
 	_, err := client.DeleteSession(ctx,
 		&Ydb_Query.DeleteSessionRequest{

internal/table/scanner/scanner.go

@@ -369,7 +369,7 @@ func (s *valueScanner) setColumnIndexes(columns []string) {
 //	string
 //	[16]byte
 //
-//nolint:gocyclo
+//nolint:gocyclo,funlen
 func (s *valueScanner) any() interface{} {
 	x := s.stack.current()
 	if s.Err() != nil || x.isEmpty() {
@@ -809,7 +809,7 @@ func (s *valueScanner) trySetByteArray(v interface{}, optional, def bool) bool {
 	return true
 }
 
-//nolint:gocyclo
+//nolint:gocyclo,funlen
 func (s *valueScanner) scanRequired(v interface{}) {
 	switch v := v.(type) {
 	case *bool:
@@ -885,7 +885,7 @@ func (s *valueScanner) scanRequired(v interface{}) {
 	}
 }
 
-//nolint:gocyclo
+//nolint:gocyclo, funlen
 func (s *valueScanner) scanOptional(v interface{}, defaultValueForOptional bool) {
 	if defaultValueForOptional {
 		if s.isNull() {
@@ -1092,6 +1092,7 @@ func (s *valueScanner) scanOptional(v interface{}, defaultValueForOptional bool)
 	}
 }
 
+//nolint:funlen
 func (s *valueScanner) setDefaultValue(dst interface{}) {
 	switch v := dst.(type) {
 	case *bool: