Merge pull request #1266 from ydb-platform/make-some-options-public

Added public types for `tx.Option` and `options.DoOption`

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Added public types for `tx.Option`, `options.DoOption` and `options.DoTxOption`
+
 ## v3.73.1
 * Changed `query.DefaultTxControl()` from `query.SerializableReadWrite()` with commit to `query.NoTx()`
 

query/client.go

@@ -17,7 +17,7 @@ type Client interface {
 	// - retry operation returned nil as error
 	//
 	// Warning: if context without deadline or cancellation func than Do can run indefinitely.
-	Do(ctx context.Context, op Operation, opts ...options.DoOption) error
+	Do(ctx context.Context, op Operation, opts ...DoOption) error
 
 	// DoTx provide the best effort for execute transaction.
 	//
@@ -31,7 +31,7 @@ type Client interface {
 	// If op TxOperation returns nil - transaction will be committed
 	// If op TxOperation return non nil - transaction will be rollback
 	// Warning: if context without deadline or cancellation func than DoTx can run indefinitely
-	DoTx(ctx context.Context, op TxOperation, opts ...options.DoTxOption) error
+	DoTx(ctx context.Context, op TxOperation, opts ...DoTxOption) error
 
 	// Execute is a simple executor with retries
 	//
@@ -73,6 +73,8 @@ type (
 
 		Session
 	}
+	DoOption   = options.DoOption
+	DoTxOption = options.DoTxOption
 )
 
 func WithIdempotent() options.RetryOptionsOption {

query/transaction.go

@@ -43,10 +43,11 @@ type (
 	}
 	TransactionControl  = tx.Control
 	TransactionSettings = tx.Settings
+	TransactionOption   = tx.Option
 )
 
 // BeginTx returns selector transaction control option
-func BeginTx(opts ...tx.Option) tx.ControlOption {
+func BeginTx(opts ...TransactionOption) tx.ControlOption {
 	return tx.BeginTx(opts...)
 }
 
@@ -111,26 +112,26 @@ func TxSettings(opts ...tx.Option) TransactionSettings {
 	return opts
 }
 
-func WithDefaultTxMode() tx.Option {
+func WithDefaultTxMode() TransactionOption {
 	return tx.WithDefaultTxMode()
 }
 
-func WithSerializableReadWrite() tx.Option {
+func WithSerializableReadWrite() TransactionOption {
 	return tx.WithSerializableReadWrite()
 }
 
-func WithSnapshotReadOnly() tx.Option {
+func WithSnapshotReadOnly() TransactionOption {
 	return tx.WithSnapshotReadOnly()
 }
 
-func WithStaleReadOnly() tx.Option {
+func WithStaleReadOnly() TransactionOption {
 	return tx.WithStaleReadOnly()
 }
 
 func WithInconsistentReads() tx.OnlineReadOnlyOption {
 	return tx.WithInconsistentReads()
 }
 
-func WithOnlineReadOnly(opts ...tx.OnlineReadOnlyOption) tx.Option {
+func WithOnlineReadOnly(opts ...tx.OnlineReadOnlyOption) TransactionOption {
 	return tx.WithOnlineReadOnly(opts...)
 }