From 3e3397b69b54ef0cd3bc19e90526b2750139efab Mon Sep 17 00:00:00 2001 From: Aleksey Myasnikov Date: Wed, 4 Sep 2024 00:24:19 +0300 Subject: [PATCH] removed implicit Close of result --- internal/query/client.go | 2 +- internal/query/execute_query.go | 4 ---- internal/query/session.go | 2 +- internal/query/transaction.go | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/query/client.go b/internal/query/client.go index 26cdb8b9d..99b9055d9 100644 --- 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 index 74e03acfe..4ebdcced9 100644 --- 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/session.go b/internal/query/session.go index a7538d5a9..b0d41e837 100644 --- a/internal/query/session.go +++ b/internal/query/session.go @@ -2,7 +2,6 @@ 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" @@ -10,6 +9,7 @@ import ( "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 index 176a7bbb8..abcf2af44 100644 --- a/internal/query/transaction.go +++ b/internal/query/transaction.go @@ -3,7 +3,6 @@ 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" @@ -11,6 +10,7 @@ import ( "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"