* Removed public query.Identifier interface for discard any external implementations for use with YDB

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Removed public `query.Identifier` interface for exclude any external implementations for use with YDB
+
 ## v3.74.0
 * Added experimental range functions to the `query.Result` and `query.ResultSet` types, available as for-range loops starting with Go version 1.22. These features can be enabled by setting the environment variable `GOEXPERIMENT=rangefunc`.
 * Added public types for `tx.Option`, `options.DoOption` and `options.DoTxOption`

internal/query/execute_query_test.go

@@ -359,7 +359,7 @@ func TestExecute(t *testing.T) {
 		tx, r, err := execute(ctx, newTestSession("123"), client, "", options.ExecuteSettings())
 		require.NoError(t, err)
 		defer r.Close(ctx)
-		require.EqualValues(t, "456", tx.id)
+		require.EqualValues(t, "456", tx.ID())
 		require.EqualValues(t, "123", tx.s.id)
 		require.EqualValues(t, -1, r.resultSetIndex)
 		{
@@ -576,7 +576,7 @@ func TestExecute(t *testing.T) {
 			tx, r, err := execute(ctx, newTestSession("123"), client, "", options.ExecuteSettings())
 			require.NoError(t, err)
 			defer r.Close(ctx)
-			require.EqualValues(t, "456", tx.id)
+			require.EqualValues(t, "456", tx.ID())
 			require.EqualValues(t, "123", tx.s.id)
 			require.EqualValues(t, -1, r.resultSetIndex)
 			{
@@ -716,7 +716,7 @@ func TestExecute(t *testing.T) {
 			tx, r, err := execute(ctx, newTestSession("123"), client, "", options.ExecuteSettings())
 			require.NoError(t, err)
 			defer r.Close(ctx)
-			require.EqualValues(t, "456", tx.id)
+			require.EqualValues(t, "456", tx.ID())
 			require.EqualValues(t, "123", tx.s.id)
 			require.EqualValues(t, -1, r.resultSetIndex)
 			{

internal/query/session_test.go

@@ -29,7 +29,7 @@ func TestBegin(t *testing.T) {
 		t.Log("begin")
 		tx, err := begin(ctx, service, &Session{id: "123"}, query.TxSettings())
 		require.NoError(t, err)
-		require.Equal(t, "123", tx.id)
+		require.Equal(t, "123", tx.ID())
 	})
 	t.Run("TransportError", func(t *testing.T) {
 		ctx := xtest.Context(t)

internal/query/transaction.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Query"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/query/tx"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/query"
@@ -16,8 +17,9 @@ import (
 var _ query.Transaction = (*transaction)(nil)
 
 type transaction struct {
-	id string
-	s  *Session
+	tx.Parent
+
+	s *Session
 }
 
 func (tx transaction) ReadRow(ctx context.Context, q string, opts ...options.TxExecuteOption) (row query.Row, _ error) {
@@ -62,15 +64,11 @@ func (tx transaction) ReadResultSet(ctx context.Context, q string, opts ...optio
 
 func newTransaction(id string, s *Session) *transaction {
 	return &transaction{
-		id: id,
-		s:  s,
+		Parent: tx.Parent(id),
+		s:      s,
 	}
 }
 
-func (tx transaction) ID() string {
-	return tx.id
-}
-
 func (tx transaction) Execute(ctx context.Context, q string, opts ...options.TxExecuteOption) (
 	r query.Result, finalErr error,
 ) {
@@ -80,7 +78,7 @@ func (tx transaction) Execute(ctx context.Context, q string, opts ...options.TxE
 		onDone(finalErr)
 	}()
 
-	_, res, err := execute(ctx, tx.s, tx.s.grpcClient, q, options.TxExecuteSettings(tx.id, opts...).ExecuteSettings)
+	_, res, err := execute(ctx, tx.s, tx.s.grpcClient, q, options.TxExecuteSettings(tx.ID(), opts...).ExecuteSettings)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
@@ -101,7 +99,7 @@ func commitTx(ctx context.Context, client Ydb_Query_V1.QueryServiceClient, sessi
 }
 
 func (tx transaction) CommitTx(ctx context.Context) (err error) {
-	return commitTx(ctx, tx.s.grpcClient, tx.s.id, tx.id)
+	return commitTx(ctx, tx.s.grpcClient, tx.s.id, tx.ID())
 }
 
 func rollback(ctx context.Context, client Ydb_Query_V1.QueryServiceClient, sessionID, txID string) error {
@@ -117,5 +115,5 @@ func rollback(ctx context.Context, client Ydb_Query_V1.QueryServiceClient, sessi
 }
 
 func (tx transaction) Rollback(ctx context.Context) (err error) {
-	return rollback(ctx, tx.s.grpcClient, tx.s.id, tx.id)
+	return rollback(ctx, tx.s.grpcClient, tx.s.id, tx.ID())
 }

internal/query/tx/control.go

@@ -26,6 +26,7 @@ type (
 	}
 	Identifier interface {
 		ID() string
+		isYdbTx()
 	}
 )
 

internal/query/tx/id.go

@@ -0,0 +1,11 @@
+package tx
+
+var _ Identifier = (*Parent)(nil)
+
+type Parent string
+
+func (id Parent) ID() string {
+	return string(id)
+}
+
+func (id Parent) isYdbTx() {}

query/transaction.go

@@ -8,11 +8,8 @@ import (
 )
 
 type (
-	TxIdentifier interface {
-		ID() string
-	}
 	TxActor interface {
-		TxIdentifier
+		tx.Identifier
 
 		// Execute executes query.
 		//