Skip to content

Commit f4f2d66

Browse files
rekbyrekby
committed
removed old aliases
1 parent 048ef9e commit f4f2d66

27 files changed

+63
-87
lines changed

‎internal/background/worker_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"context"
55
"runtime"
66
"sync"
7+
"sync/atomic"
78
"testing"
89
"time"
910

1011
"github.com/stretchr/testify/require"
1112

1213
"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
13-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
1515
)
1616

@@ -75,7 +75,7 @@ func TestWorkerClose(t *testing.T) {
7575
w := NewWorker(ctx)
7676

7777
started := make(empty.Chan)
78-
stopped := xatomic.Bool{}
78+
stopped := atomic.Bool{}
7979
w.Start("test", func(innerCtx context.Context) {
8080
close(started)
8181
<-innerCtx.Done()
@@ -101,12 +101,12 @@ func TestWorkerConcurrentStartAndClose(t *testing.T) {
101101

102102
parallel := runtime.GOMAXPROCS(0)
103103

104-
var counter xatomic.Int64
104+
var counter atomic.Int64
105105

106106
ctx := xtest.Context(t)
107107
w := NewWorker(ctx)
108108

109-
stopNewStarts := xatomic.Bool{}
109+
stopNewStarts := atomic.Bool{}
110110
var wgStarters sync.WaitGroup
111111
for i := 0; i < parallel; i++ {
112112
wgStarters.Add(1)

‎internal/conn/conn.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"sync"
7+
"sync/atomic"
78
"time"
89

910
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
@@ -16,7 +17,6 @@ import (
1617
"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
1718
"github.com/ydb-platform/ydb-go-sdk/v3/internal/response"
1819
"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
19-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
2020
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
2121
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
2222
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
@@ -54,7 +54,7 @@ type conn struct {
5454
done chan struct{}
5555
endpoint endpoint.Endpoint // ro access
5656
closed bool
57-
state xatomic.Uint32
57+
state atomic.Uint32
5858
lastUsage time.Time
5959
onClose []func(*conn)
6060
onTransportErrors []func(ctx context.Context, cc Conn, cause error)
@@ -555,7 +555,7 @@ func getContextMark(ctx context.Context) *modificationMark {
555555
}
556556

557557
type modificationMark struct {
558-
dirty xatomic.Bool
558+
dirty atomic.Bool
559559
}
560560

561561
func (m *modificationMark) canRetry() bool {

‎internal/table/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"path"
99
"runtime"
1010
"sync"
11+
"sync/atomic"
1112
"testing"
1213
"time"
1314

@@ -20,7 +21,6 @@ import (
2021

2122
"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
2223
"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
23-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
2424
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
2525
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
2626
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xrand"
@@ -678,7 +678,7 @@ func TestSessionPoolCloseIdleSessions(t *testing.T) {
678678
xtest.TestManyTimes(t, func(t testing.TB) {
679679
var (
680680
idleThreshold = 4 * time.Second
681-
closedCount xatomic.Int64
681+
closedCount atomic.Int64
682682
fakeClock = clockwork.NewFakeClock()
683683
)
684684
p := newClientWithStubBuilder(

‎internal/table/scanner/result.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55
"errors"
66
"io"
7+
"sync/atomic"
78

89
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
910
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_TableStats"
1011

11-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
1212
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1313
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/table/result"
@@ -20,11 +20,11 @@ var errAlreadyClosed = xerrors.Wrap(errors.New("result closed early"))
2020
type baseResult struct {
2121
scanner
2222

23-
nextResultSetCounter xatomic.Uint64
23+
nextResultSetCounter atomic.Uint64
2424
statsMtx xsync.RWMutex
2525
stats *Ydb_TableStats.QueryStats
2626

27-
closed xatomic.Bool
27+
closed atomic.Bool
2828
}
2929

3030
type streamResult struct {

‎internal/table/session.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"net/url"
77
"strconv"
88
"sync"
9+
"sync/atomic"
910
"time"
1011

1112
"github.com/ydb-platform/ydb-go-genproto/Ydb_Table_V1"
@@ -25,7 +26,6 @@ import (
2526
"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
2627
"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
2728
"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
28-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
2929
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
3030
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
3131
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
@@ -50,8 +50,8 @@ type session struct {
5050

5151
status table.SessionStatus
5252
statusMtx sync.RWMutex
53-
nodeID xatomic.Uint32
54-
lastUsage xatomic.Int64
53+
nodeID atomic.Uint32
54+
lastUsage atomic.Int64
5555

5656
onClose []func(s *session)
5757
closeOnce sync.Once

‎internal/table/transaction.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package table
33
import (
44
"context"
55
"fmt"
6+
"sync/atomic"
67

78
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
89

910
"github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator"
1011
"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
1112
"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
1213
"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
13-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1515
"github.com/ydb-platform/ydb-go-sdk/v3/table"
1616
"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
@@ -24,7 +24,7 @@ var (
2424
)
2525

2626
type txState struct {
27-
rawVal xatomic.Uint32
27+
rawVal atomic.Uint32
2828
}
2929

3030
func (s *txState) Load() txStateEnum {

‎internal/topic/topicreaderinternal/batcher_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package topicreaderinternal
33
import (
44
"context"
55
"errors"
6+
"sync/atomic"
67
"testing"
78
"time"
89

910
"github.com/stretchr/testify/require"
1011

1112
"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
1213
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicreader"
13-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
1515
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
1616
)
@@ -282,7 +282,7 @@ func TestBatcher_PopMinIgnored(t *testing.T) {
282282
},
283283
}}))
284284

285-
var IgnoreMinRestrictionsOnNextPopDone xatomic.Int64
285+
var IgnoreMinRestrictionsOnNextPopDone atomic.Int64
286286
go func() {
287287
defer IgnoreMinRestrictionsOnNextPopDone.Add(1)
288288

‎internal/topic/topicreaderinternal/message.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
1111
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
12-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xbytes"
1312
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1413
)
1514

@@ -145,7 +144,7 @@ func (pmb *PublicMessageBuilder) CreatedAt(createdAt time.Time) *PublicMessageBu
145144
func (pmb *PublicMessageBuilder) Metadata(metadata map[string][]byte) *PublicMessageBuilder {
146145
pmb.mess.Metadata = make(map[string][]byte, len(metadata))
147146
for key, val := range metadata {
148-
pmb.mess.Metadata[key] = xbytes.Clone(val)
147+
pmb.mess.Metadata[key] = bytes.Clone(val)
149148
}
150149

151150
return pmb

‎internal/topic/topicreaderinternal/partition_session.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"fmt"
66
"sync"
7+
"sync/atomic"
78
"time"
89

910
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicreader"
10-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
1111
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
1212
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1313
)
@@ -28,8 +28,8 @@ type partitionSession struct {
2828
ctxCancel context.CancelFunc
2929
partitionSessionID rawtopicreader.PartitionSessionID
3030

31-
lastReceivedOffsetEndVal xatomic.Int64
32-
committedOffsetVal xatomic.Int64
31+
lastReceivedOffsetEndVal atomic.Int64
32+
committedOffsetVal atomic.Int64
3333
}
3434

3535
func newPartitionSession(

‎internal/topic/topicreaderinternal/stream_reader_impl.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"math/big"
1010
"reflect"
1111
"runtime/pprof"
12+
"sync/atomic"
1213
"time"
1314

1415
"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
1516
"github.com/ydb-platform/ydb-go-sdk/v3/internal/background"
1617
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
1718
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicreader"
18-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
1919
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
2020
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
2121
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
@@ -37,7 +37,7 @@ type topicStreamReaderImpl struct {
3737
cancel context.CancelFunc
3838

3939
freeBytes chan int
40-
restBufferSizeBytes xatomic.Int64
40+
restBufferSizeBytes atomic.Int64
4141
sessionController partitionSessionStorage
4242
backgroundWorkers background.Worker
4343

0 commit comments

Comments
 (0)