Merge pull request #882 from ydb-platform/LevelSerializable

* Allowed `sql.LevelSerializable` isolation level in read-write mode …
ydb-platform · Oct 26, 2023 · 5a37f51 · 5a37f51
2 parents 4ae0dcb + da83f91
commit 5a37f51
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Allowed `sql.LevelSerializable` isolation level in read-write mode in `database/sql` transactions 
 * Refactored traces and metrics
 * Added `{retry,table}.WithLabel` options for mark retriers calls
 * Added `ydb.WithTraceRetry` option

diff --git a/internal/xsql/isolation/isolation.go b/internal/xsql/isolation/isolation.go
@@ -15,11 +15,15 @@ import (
 // It returns error on unsupported options.
 func ToYDB(opts driver.TxOptions) (txcControl table.TxOption, err error) {
 	level := sql.IsolationLevel(opts.Isolation)
-	if !opts.ReadOnly && level == sql.LevelDefault {
-		return table.WithSerializableReadWrite(), nil
-	}
-	if opts.ReadOnly && level == sql.LevelSnapshot {
-		return table.WithSnapshotReadOnly(), nil
+	switch level {
+	case sql.LevelDefault, sql.LevelSerializable:
+		if !opts.ReadOnly {
+			return table.WithSerializableReadWrite(), nil
+		}
+	case sql.LevelSnapshot:
+		if opts.ReadOnly {
+			return table.WithSnapshotReadOnly(), nil
+		}
 	}
 	return nil, xerrors.WithStackTrace(fmt.Errorf(
 		"unsupported transaction options: %+v", opts,

diff --git a/internal/xsql/isolation/isolation_test.go b/internal/xsql/isolation/isolation_test.go
@@ -3,23 +3,24 @@ package isolation
 import (
 	"database/sql"
 	"database/sql/driver"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
 
 func TestToYDB(t *testing.T) {
 	for _, tt := range []struct {
+		name      string
 		txOptions driver.TxOptions
 		txControl table.TxOption
 		err       bool
 	}{
 		// read-write
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelDefault),
 				ReadOnly:  false,
@@ -28,48 +29,56 @@ func TestToYDB(t *testing.T) {
 			err:       false,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelReadUncommitted),
 				ReadOnly:  false,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelReadCommitted),
 				ReadOnly:  false,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelWriteCommitted),
 				ReadOnly:  false,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelRepeatableRead),
 				ReadOnly:  false,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelSnapshot),
 				ReadOnly:  false,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelSerializable),
 				ReadOnly:  false,
 			},
-			err: true,
+			txControl: table.WithSerializableReadWrite(),
+			err:       false,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelLinearizable),
 				ReadOnly:  false,
@@ -79,41 +88,47 @@ func TestToYDB(t *testing.T) {
 
 		// read-only
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelDefault),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelReadUncommitted),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelReadCommitted),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelWriteCommitted),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelRepeatableRead),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelSnapshot),
 				ReadOnly:  true,
@@ -122,27 +137,27 @@ func TestToYDB(t *testing.T) {
 			err:       false,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelSerializable),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 		{
+			name: xtest.CurrentFileLine(),
 			txOptions: driver.TxOptions{
 				Isolation: driver.IsolationLevel(sql.LevelLinearizable),
 				ReadOnly:  true,
 			},
 			err: true,
 		},
 	} {
-		t.Run(fmt.Sprintf("%+v", tt.txOptions), func(t *testing.T) {
+		t.Run(tt.name, func(t *testing.T) {
 			toYDB, err := ToYDB(tt.txOptions)
 			if !tt.err {
 				require.NoError(t, err)
-				if !proto.Equal(table.TxSettings(tt.txControl).Settings(), table.TxSettings(toYDB).Settings()) {
-					t.Errorf("%+v != %+v", toYDB, tt.txControl)
-				}
+				require.Equal(t, table.TxSettings(tt.txControl).Settings(), table.TxSettings(toYDB).Settings())
 			} else {
 				require.Error(t, err)
 			}