fixed linter issues

Author: asmyasnikov

internal/query/conn/conn.go

@@ -26,7 +26,7 @@ type (
 		Rollback() error
 	}
 	conn struct {
-		ctx         context.Context
+		ctx         context.Context //nolint:containedctx
 		parent      Parent
 		trace       *trace.DatabaseSQL
 		traceRetry  *trace.Retry

internal/query/conn/errors.go

@@ -2,6 +2,4 @@ package conn
 
 import "errors"
 
-var (
-	errConnClosedEarly = errors.New("conn closed early")
-)
+var errConnClosedEarly = errors.New("conn closed early")

internal/table/conn/conn.go

@@ -99,7 +99,7 @@ var (
 )
 
 func New(ctx context.Context, parent Parent, opts ...Option) (*conn, error) {
-	s, err := parent.Table().CreateSession(ctx)
+	s, err := parent.Table().CreateSession(ctx) //nolint:staticcheck
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
@@ -471,12 +471,11 @@ func (c *conn) BeginTx(ctx context.Context, txOptions driver.TxOptions) (_ drive
 	}()
 
 	if c.currentTx != nil {
-		return nil, xerrors.WithStackTrace(
-			xerrors.Retryable(
-				&ConnAlreadyHaveTxError{
-					currentTx: c.currentTx.ID(),
-				},
-				xerrors.InvalidObject(),
+		return nil, badconn.Map(
+			xerrors.WithStackTrace(
+				fmt.Errorf("broken conn state: conn=%q already have current tx=%q",
+					c.ID(), c.currentTx.ID(),
+				),
 			),
 		)
 	}

internal/table/conn/errors.go

@@ -14,17 +14,17 @@ var (
 	errNotReadyConn    = xerrors.Retryable(errors.New("conn not ready"), xerrors.InvalidObject())
 )
 
-type ConnAlreadyHaveTxError struct {
+type AlreadyHaveTxError struct {
 	currentTx string
 }
 
-func (err *ConnAlreadyHaveTxError) Error() string {
+func (err *AlreadyHaveTxError) Error() string {
 	return "conn already have an open currentTx: " + err.currentTx
 }
 
-func (err *ConnAlreadyHaveTxError) As(target interface{}) bool {
+func (err *AlreadyHaveTxError) As(target interface{}) bool {
 	switch t := target.(type) {
-	case *ConnAlreadyHaveTxError:
+	case *AlreadyHaveTxError:
 		t.currentTx = err.currentTx
 
 		return true

internal/table/conn/tx.go

@@ -30,15 +30,6 @@ var (
 )
 
 func beginTx(ctx context.Context, c *conn, txOptions driver.TxOptions) (currentTx, error) {
-	if c.currentTx != nil {
-		return nil, badconn.Map(
-			xerrors.WithStackTrace(
-				fmt.Errorf("broken conn state: conn=%q already have current tx=%q",
-					c.ID(), c.currentTx.ID(),
-				),
-			),
-		)
-	}
 	txc, err := isolation.ToYDB(txOptions)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
@@ -47,14 +38,13 @@ func beginTx(ctx context.Context, c *conn, txOptions driver.TxOptions) (currentT
 	if err != nil {
 		return nil, badconn.Map(xerrors.WithStackTrace(err))
 	}
+
 	return &transaction{
 		Identifier: tx.ID(nativeTx.ID()),
 		conn:       c,
 		ctx:        ctx,
 		tx:         nativeTx,
 	}, nil
-
-	return c.currentTx, nil
 }
 
 func (tx *transaction) checkTxState() error {

internal/table/conn/tx_fake.go

@@ -47,7 +47,7 @@ var (
 	_ tx.Identifier         = &txFake{}
 )
 
-func beginTxFake(ctx context.Context, c *conn, txOptions driver.TxOptions) (currentTx, error) {
+func beginTxFake(ctx context.Context, c *conn, _ driver.TxOptions) (currentTx, error) {
 	return &txFake{
 		Identifier: tx.ID("FAKE"),
 		conn:       c,

internal/xsql/conn.go

@@ -239,7 +239,7 @@ func (c *connWrapper) IsColumnExists(ctx context.Context, tableName, columnName
 
 func (c *connWrapper) IsTableExists(ctx context.Context, tableName string) (tableExists bool, finalErr error) {
 	tableName = c.normalizePath(tableName)
-	onDone := trace.DatabaseSQLOnConnIsTableExists(c.connector.traceSql, &ctx,
+	onDone := trace.DatabaseSQLOnConnIsTableExists(c.connector.trace, &ctx,
 		stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql.(*connWrapper).IsTableExists"),
 		tableName,
 	)

internal/xsql/connector.go

@@ -46,7 +46,7 @@ type (
 		idleThreshold time.Duration
 		conns         xsync.Map[uuid.UUID, *connWrapper]
 		done          chan struct{}
-		traceSql      *trace.DatabaseSQL
+		trace         *trace.DatabaseSQL
 		traceRetry    *trace.Retry
 		retryBudget   budget.Budget
 	}
@@ -80,18 +80,17 @@ func (c *Connector) Scheme() scheme.Client {
 }
 
 const (
-	queryProcessor_QueryService = iota + 1
-	queryProcessor_TableService
+	QUERY_SERVICE = iota + 1 //nolint:revive,stylecheck
+	TABLE_SERVICE            //nolint:revive,stylecheck
 )
 
 func (c *Connector) Open(name string) (driver.Conn, error) {
-	//TODO implement me
-	panic("implement me")
+	return nil, xerrors.WithStackTrace(driver.ErrSkip)
 }
 
 func (c *Connector) Connect(ctx context.Context) (driver.Conn, error) {
 	switch c.queryProcessor {
-	case queryProcessor_QueryService:
+	case QUERY_SERVICE:
 		id := uuid.New()
 		cc, err := querySql.New(ctx, c, append(
 			c.queryOpts,
@@ -114,7 +113,7 @@ func (c *Connector) Connect(ctx context.Context) (driver.Conn, error) {
 
 		return conn, nil
 
-	case queryProcessor_TableService:
+	case TABLE_SERVICE:
 		id := uuid.New()
 		cc, err := tableSql.New(ctx, c, append(
 			c.tableOpts,
@@ -168,10 +167,10 @@ func Open(parent ydbDriver, balancer grpc.ClientConnInterface, opts ...Option) (
 	c := &Connector{
 		parent:         parent,
 		balancer:       balancer,
-		queryProcessor: queryProcessor_TableService,
+		queryProcessor: TABLE_SERVICE,
 		clock:          clockwork.NewRealClock(),
 		done:           make(chan struct{}),
-		traceSql:       &trace.DatabaseSQL{},
+		trace:          &trace.DatabaseSQL{},
 		traceRetry:     &trace.Retry{},
 	}
 

internal/xsql/errors.go

@@ -7,7 +7,6 @@ import (
 
 var (
 	ErrUnsupported         = driver.ErrSkip
-	errDeprecated          = driver.ErrSkip
 	errAlreadyClosed       = errors.New("already closed")
 	errWrongQueryProcessor = errors.New("wrong query processor")
 )

internal/xsql/options.go

@@ -22,7 +22,7 @@ type (
 		tableOps  []tableSql.Option
 		queryOpts []querySql.Option
 	}
-	traceDatabaseSqlOption struct {
+	traceDatabaseSQLOption struct {
 		t    *trace.DatabaseSQL
 		opts []trace.DatabaseSQLComposeOption
 	}
@@ -81,8 +81,8 @@ func (disableServerBalancerOption) Apply(c *Connector) error {
 	return nil
 }
 
-func (opt traceDatabaseSqlOption) Apply(c *Connector) error {
-	c.traceSql = c.traceSql.Compose(opt.t, opt.opts...)
+func (opt traceDatabaseSQLOption) Apply(c *Connector) error {
+	c.trace = c.trace.Compose(opt.t, opt.opts...)
 	c.tableOpts = append(c.tableOpts, tableSql.WithTrace(opt.t, opt.opts...))
 	c.queryOpts = append(c.queryOpts, querySql.WithTrace(opt.t, opt.opts...))
 
@@ -100,7 +100,7 @@ func WithTrace(
 	t *trace.DatabaseSQL, //nolint:gocritic
 	opts ...trace.DatabaseSQLComposeOption,
 ) Option {
-	return traceDatabaseSqlOption{
+	return traceDatabaseSQLOption{
 		t:    t,
 		opts: opts,
 	}
@@ -173,9 +173,9 @@ func WithQueryOptions(opts ...querySql.Option) Option {
 }
 
 func OverQueryService() Option {
-	return queryProcessorOption(queryProcessor_QueryService)
+	return queryProcessorOption(QUERY_SERVICE)
 }
 
 func OverTableService() Option {
-	return queryProcessorOption(queryProcessor_TableService)
+	return queryProcessorOption(TABLE_SERVICE)
 }