Skip to content

Commit 9d53008

Browse files
committed
* Moved internal/deadline.ContextWithoutDeadline to internal/xcontext.WithoutDeadline
1 parent 76b9c6f commit 9d53008

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* Moved `internal/deadline.ContextWithoutDeadline` to `internal/xcontext.WithoutDeadline`
12
* Supported many user-agent records
23

34
## v3.30.0

internal/table/client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
"github.com/ydb-platform/ydb-go-sdk/v3/internal/backoff"
1717
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
18-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/deadline"
1918
"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
2019
"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
20+
"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/internal/xsync"
2323
"github.com/ydb-platform/ydb-go-sdk/v3/retry"
@@ -211,7 +211,7 @@ func (c *Client) createSession(ctx context.Context) (s Session, err error) {
211211

212212
createSessionCtx, cancel := context.WithTimeout(
213213
meta.WithAllowFeatures(
214-
deadline.ContextWithoutDeadline(ctx),
214+
xcontext.WithoutDeadline(ctx),
215215
meta.HintSessionBalancer,
216216
),
217217
c.config.CreateSessionTimeout(),
@@ -450,7 +450,7 @@ func (c *Client) Put(ctx context.Context, s Session) (err error) {
450450
if err != nil {
451451
var cancel context.CancelFunc
452452
ctx, cancel = context.WithTimeout(
453-
deadline.ContextWithoutDeadline(ctx),
453+
xcontext.WithoutDeadline(ctx),
454454
c.config.DeleteTimeout(),
455455
)
456456
defer cancel()
@@ -899,7 +899,7 @@ func (c *Client) closeSession(ctx context.Context, s Session, opts ...closeSessi
899899
defer c.wgClosed.Done()
900900

901901
closeCtx, cancel := context.WithTimeout(
902-
deadline.ContextWithoutDeadline(ctx),
902+
xcontext.WithoutDeadline(ctx),
903903
c.config.DeleteTimeout(),
904904
)
905905
defer cancel()

internal/deadline/context.go renamed to internal/xcontext/without_deadline.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package deadline
1+
package xcontext
22

33
import (
44
"context"
@@ -13,7 +13,7 @@ func (valueOnlyContext) Done() <-chan struct{} { return nil }
1313

1414
func (valueOnlyContext) Err() error { return nil }
1515

16-
// ContextWithoutDeadline helps to clear derived deadline from deadline
17-
func ContextWithoutDeadline(ctx context.Context) context.Context {
16+
// WithoutDeadline helps to clear derived deadline from deadline
17+
func WithoutDeadline(ctx context.Context) context.Context {
1818
return valueOnlyContext{ctx}
1919
}

0 commit comments

Comments
 (0)