removed implicit Close of result

ydb-platform · Sep 3, 2024 · 6eb9e4d · 6eb9e4d
1 parent eaa96e5
commit 6eb9e4d
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 53 deletions.
diff --git a/internal/query/client.go b/internal/query/client.go
@@ -2,7 +2,6 @@ package query
 
 import (
 	"context"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 	"time"
 
 	"github.com/ydb-platform/ydb-go-genproto/Ydb_Query_V1"
@@ -16,6 +15,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/pool"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/types"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"

diff --git a/internal/query/execute_query.go b/internal/query/execute_query.go
@@ -144,10 +144,6 @@ func readAll(ctx context.Context, r *streamResult) error {
 }
 
 func readResultSet(ctx context.Context, r *streamResult) (_ *resultSetWithClose, finalErr error) {
-	defer func() {
-		_ = r.Close(ctx)
-	}()
-
 	rs, err := r.nextResultSet(ctx)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)

diff --git a/internal/query/range_experiment.go b/internal/query/range_experiment.go
diff --git a/internal/query/result.go b/internal/query/result.go
@@ -42,6 +42,23 @@ type (
 	resultOption func(s *streamResult)
 )
 
+func rangeResultSets(ctx context.Context, r result.Result) xiter.Seq2[result.Set, error] {
+	return func(yield func(result.Set, error) bool) {
+		for {
+			rs, err := r.NextResultSet(ctx)
+			if err != nil {
+				if xerrors.Is(err, io.EOF) {
+					return
+				}
+			}
+			cont := yield(rs, err)
+			if !cont || err != nil {
+				return
+			}
+		}
+	}
+}
+
 func (r *materializedResult) ResultSets(ctx context.Context) xiter.Seq2[result.Set, error] {
 	return rangeResultSets(ctx, r)
 }

diff --git a/internal/query/result_set.go b/internal/query/result_set.go
@@ -8,6 +8,7 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Query"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/types"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xiter"
@@ -41,6 +42,23 @@ type (
 	}
 )
 
+func rangeRows(ctx context.Context, rs result.Set) xiter.Seq2[result.Row, error] {
+	return func(yield func(result.Row, error) bool) {
+		for {
+			rs, err := rs.NextRow(ctx)
+			if err != nil {
+				if xerrors.Is(err, io.EOF) {
+					return
+				}
+			}
+			cont := yield(rs, err)
+			if !cont || err != nil {
+				return
+			}
+		}
+	}
+}
+
 func (*materializedResultSet) Close(context.Context) error {
 	return nil
 }
@@ -49,11 +67,11 @@ func (rs *resultSetWithClose) Close(ctx context.Context) error {
 	return rs.close(ctx)
 }
 
-func (rs *materializedResultSet) Rows(ctx context.Context) xiter.Seq2[query.Row, error] {
+func (rs *materializedResultSet) Rows(ctx context.Context) xiter.Seq2[result.Row, error] {
 	return rangeRows(ctx, rs)
 }
 
-func (rs *resultSet) Rows(ctx context.Context) xiter.Seq2[query.Row, error] {
+func (rs *resultSet) Rows(ctx context.Context) xiter.Seq2[result.Row, error] {
 	return rangeRows(ctx, rs)
 }
 

diff --git a/internal/query/session.go b/internal/query/session.go
@@ -2,14 +2,14 @@ package query
 
 import (
 	"context"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 	"sync/atomic"
 
 	"github.com/ydb-platform/ydb-go-genproto/Ydb_Query_V1"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Query"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/tx"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"

diff --git a/internal/query/transaction.go b/internal/query/transaction.go
@@ -3,14 +3,14 @@ package query
 import (
 	"context"
 	"fmt"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 
 	"github.com/ydb-platform/ydb-go-genproto/Ydb_Query_V1"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Query"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/result"
 	queryTx "github.com/ydb-platform/ydb-go-sdk/v3/internal/query/tx"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	baseTx "github.com/ydb-platform/ydb-go-sdk/v3/internal/tx"