Merge pull request #348 from ydb-platform/prepare-nop

* Changed `database/sql` driver `prepare` behaviour to `nop` with pro…

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Changed `database/sql` driver `prepare` behaviour to `nop` with proxing call to conn exec/query with keep-in-cache flag 
+
 ## v3.34.0
 * Improved the `xsql` errors mapping to `driver.ErrBadConn` 
 * Extended `retry.DoTx` test for to achieve equivalence with `retry.Retry` behaviour

internal/table/statement.go

@@ -18,10 +18,6 @@ type statement struct {
 	params  map[string]*Ydb.Type
 }
 
-func Params(s table.Statement) map[string]*Ydb.Type {
-	return s.(*statement).params
-}
-
 // Execute executes prepared data query.
 func (s *statement) Execute(
 	ctx context.Context, tx *table.TransactionControl,

internal/xsql/conn.go

@@ -8,7 +8,6 @@ import (
 	"sync/atomic"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/retry"
-	internal "github.com/ydb-platform/ydb-go-sdk/v3/internal/table"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/badconn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/isolation"
@@ -160,16 +159,10 @@ func (c *conn) PrepareContext(ctx context.Context, query string) (_ driver.Stmt,
 	if c.isClosed() {
 		return nil, errClosedConn
 	}
-	var s table.Statement
-	s, err = c.session.Prepare(ctx, query)
-	if err != nil {
-		return nil, c.checkClosed(err)
-	}
 	return &stmt{
-		conn:   c,
-		params: internal.Params(s),
-		query:  query,
-		trace:  c.trace,
+		conn:  c,
+		query: query,
+		trace: c.trace,
 	}, nil
 }
 

internal/xsql/connector.go

@@ -103,7 +103,7 @@ var (
 
 func (c *Connector) Close() (err error) {
 	defer c.driver.Detach(c)
-	return c.connection.Close(context.Background())
+	return nil
 }
 
 func (c *Connector) Connection() connection {

internal/xsql/stmt.go

@@ -5,27 +5,20 @@ import (
 	"database/sql/driver"
 	"fmt"
 
-	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
-
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
 type stmt struct {
-	nopResult
-	namedValueChecker
-
-	conn   *conn
-	params map[string]*Ydb.Type
-	query  string
+	conn  *conn
+	query string
 
 	trace trace.DatabaseSQL
 }
 
 var (
-	_ driver.Stmt              = &stmt{}
-	_ driver.StmtQueryContext  = &stmt{}
-	_ driver.StmtExecContext   = &stmt{}
-	_ driver.NamedValueChecker = &stmt{}
+	_ driver.Stmt             = &stmt{}
+	_ driver.StmtQueryContext = &stmt{}
+	_ driver.StmtExecContext  = &stmt{}
 )
 
 func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (_ driver.Rows, err error) {
@@ -36,9 +29,9 @@ func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (_ dr
 	if s.conn.isClosed() {
 		return nil, errClosedConn
 	}
-	switch m := queryModeFromContext(withKeepInCache(ctx), s.conn.defaultQueryMode); m {
+	switch m := queryModeFromContext(ctx, s.conn.defaultQueryMode); m {
 	case DataQueryMode:
-		return s.conn.QueryContext(ctx, s.query, args)
+		return s.conn.QueryContext(withKeepInCache(ctx), s.query, args)
 	default:
 		return nil, fmt.Errorf("unsupported query mode '%s' for execute query on prepared statement", m)
 	}
@@ -52,16 +45,16 @@ func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (_ dri
 	if s.conn.isClosed() {
 		return nil, errClosedConn
 	}
-	switch m := queryModeFromContext(withKeepInCache(ctx), s.conn.defaultQueryMode); m {
+	switch m := queryModeFromContext(ctx, s.conn.defaultQueryMode); m {
 	case DataQueryMode:
-		return s.conn.ExecContext(ctx, s.query, args)
+		return s.conn.ExecContext(withKeepInCache(ctx), s.query, args)
 	default:
 		return nil, fmt.Errorf("unsupported query mode '%s' for execute query on prepared statement", m)
 	}
 }
 
 func (s *stmt) NumInput() int {
-	return len(s.params)
+	return -1
 }
 
 func (s *stmt) Close() (err error) {

log/driver.go

@@ -422,7 +422,7 @@ func Driver(l Logger, details trace.Details) (t trace.Driver) {
 	//nolint:nestif
 	if details&trace.DriverBalancerEvents != 0 {
 		//nolint:govet
-		l := l.WithName(`cluster`)
+		l := l.WithName(`balancer`)
 		t.OnBalancerInit = func(info trace.DriverBalancerInitStartInfo) func(trace.DriverBalancerInitDoneInfo) {
 			l.Tracef(`init start`)
 			start := time.Now()

retry/sql_test.go

@@ -85,6 +85,7 @@ func (m *mockConn) Close() error {
 }
 
 func (m *mockConn) Begin() (driver.Tx, error) {
+	m.t.Log(xerrors.StackRecord(0))
 	return nil, driver.ErrSkip
 }
 
@@ -141,7 +142,7 @@ func (m *mockStmt) Close() error {
 
 func (m *mockStmt) NumInput() int {
 	m.t.Log(xerrors.StackRecord(0))
-	return 0
+	return -1
 }
 
 func (m *mockStmt) Exec(args []driver.Value) (driver.Result, error) {