refactoring

Author: asmyasnikov

internal/node/id.go

@@ -0,0 +1,5 @@
+package node
+
+type ID interface {
+	NodeID() uint32
+}

internal/pool/pool.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/node"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
@@ -22,9 +23,9 @@ import (
 type (
 	Item interface {
 		closer.Closer
+		node.ID
 
 		IsAlive() bool
-		NodeID() uint32
 	}
 	ItemConstraint[T any] interface {
 		*T

internal/table/session.go

@@ -77,7 +77,7 @@ func statsModeToStatsMode(src Ydb_Table.QueryStatsCollection_Mode) (dst Ydb_Quer
 	}
 }
 
-func TableTxControlToQueryTxControl(src *Ydb_Table.TransactionControl) (dst *Ydb_Query.TransactionControl) {
+func txControlToQueryTxControl(src *Ydb_Table.TransactionControl) (dst *Ydb_Query.TransactionControl) {
 	dst = &Ydb_Query.TransactionControl{
 		CommitTx: src.GetCommitTx(),
 	}
@@ -196,7 +196,7 @@ func (e queryClientExecutor) execute(
 
 	request.SessionId = executeDataQueryRequest.GetSessionId()
 	request.ExecMode = Ydb_Query.ExecMode_EXEC_MODE_EXECUTE
-	request.TxControl = TableTxControlToQueryTxControl(executeDataQueryRequest.GetTxControl())
+	request.TxControl = txControlToQueryTxControl(executeDataQueryRequest.GetTxControl())
 	request.Query = &Ydb_Query.ExecuteQueryRequest_QueryContent{
 		QueryContent: &Ydb_Query.QueryContent{
 			Syntax: Ydb_Query.Syntax_SYNTAX_YQL_V1,

internal/xsql/common/context.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"context"
+
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
 

internal/xsql/connector.go

@@ -18,7 +18,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/legacy"
-	propose "github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/propose"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/propose"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry/budget"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"

query/session.go

@@ -3,13 +3,15 @@ package query
 import (
 	"context"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/node"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stats"
 )
 
 type (
 	SessionInfo interface {
+		node.ID
+
 		ID() string
-		NodeID() uint32
 		Status() string
 	}
 	Session interface {

sql.go

@@ -5,11 +5,11 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/common"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/bind"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/common"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/legacy"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/propose"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"

tests/integration/database_sql_with_tx_control_test.go

@@ -6,13 +6,13 @@ package integration
 import (
 	"context"
 	"database/sql"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/common"
 	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql/common"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"