Skip to content

Commit f34fc4c

Browse files
committed
fixed SLO
1 parent 87e21ab commit f34fc4c

File tree

3 files changed

+5
-33
lines changed

3 files changed

+5
-33
lines changed

tests/slo/gorm/query/storage.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
environ "github.com/ydb-platform/ydb-go-sdk-auth-environ"
1111
ydbSDK "github.com/ydb-platform/ydb-go-sdk/v3"
1212
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
13-
"github.com/ydb-platform/ydb-go-sdk/v3/table"
1413
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
1514
"gorm.io/gorm"
1615
"gorm.io/gorm/clause"
@@ -30,19 +29,6 @@ WITH (
3029
UNIFORM_PARTITIONS = %d
3130
)`
3231

33-
var (
34-
readTx = table.TxControl(
35-
table.BeginTx(
36-
table.WithOnlineReadOnly(),
37-
),
38-
table.CommitTx(),
39-
)
40-
41-
writeTx = table.SerializableReadWriteTxControl(
42-
table.CommitTx(),
43-
)
44-
)
45-
4632
type Storage struct {
4733
db *gorm.DB
4834
cfg *config.Config
@@ -91,7 +77,7 @@ func (s *Storage) Read(ctx context.Context, id generator.RowID) (r generator.Row
9177
return generator.Row{}, attempts, err
9278
}
9379

94-
err = retry.Do(ydbSDK.WithTxControl(ctx, readTx), db,
80+
err = retry.Do(ctx, db,
9581
func(ctx context.Context, cc *sql.Conn) (err error) {
9682
if err = ctx.Err(); err != nil {
9783
return err
@@ -139,7 +125,7 @@ func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, e
139125
return attempts, err
140126
}
141127

142-
err = retry.Do(ydbSDK.WithTxControl(ctx, writeTx), db,
128+
err = retry.Do(ctx, db,
143129
func(ctx context.Context, cc *sql.Conn) (err error) {
144130
if err = ctx.Err(); err != nil {
145131
return err

tests/slo/native/query/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (s *Storage) Read(ctx context.Context, entryID generator.RowID) (_ generato
120120
Build(),
121121
),
122122
query.WithTxControl(query.TxControl(
123-
query.BeginTx(query.WithOnlineReadOnly()),
123+
query.BeginTx(query.WithSnapshotReadOnly()),
124124
query.CommitTx(),
125125
)),
126126
)

tests/slo/xorm/query/storage.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
"github.com/ydb-platform/ydb-go-sdk/v3"
1313
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
14-
"github.com/ydb-platform/ydb-go-sdk/v3/table"
1514
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
1615
"xorm.io/xorm"
1716
"xorm.io/xorm/core"
@@ -21,19 +20,6 @@ import (
2120
"slo/internal/generator"
2221
)
2322

24-
var (
25-
readTx = table.TxControl(
26-
table.BeginTx(
27-
table.WithOnlineReadOnly(),
28-
),
29-
table.CommitTx(),
30-
)
31-
32-
writeTx = table.SerializableReadWriteTxControl(
33-
table.CommitTx(),
34-
)
35-
)
36-
3723
type mapper struct {
3824
tableName string
3925
objectName string
@@ -126,7 +112,7 @@ func (s *Storage) Read(ctx context.Context, id generator.RowID) (row generator.R
126112

127113
row.ID = id
128114

129-
err = retry.Do(ydb.WithTxControl(ctx, readTx), s.x.DB().DB,
115+
err = retry.Do(ctx, s.x.DB().DB,
130116
func(ctx context.Context, _ *sql.Conn) (err error) {
131117
has, err := s.x.Context(ctx).Where("hash = Digest::NumericHash(?)", id).Get(&row)
132118
if err != nil {
@@ -161,7 +147,7 @@ func (s *Storage) Write(ctx context.Context, row generator.Row) (attempts int, e
161147
ctx, cancel := context.WithTimeout(ctx, time.Duration(s.cfg.WriteTimeout)*time.Millisecond)
162148
defer cancel()
163149

164-
err = retry.Do(ydb.WithTxControl(ctx, writeTx), s.x.DB().DB,
150+
err = retry.Do(ctx, s.x.DB().DB,
165151
func(ctx context.Context, _ *sql.Conn) (err error) {
166152
if err = ctx.Err(); err != nil {
167153
return err

0 commit comments

Comments
 (0)