Skip to content

Commit 3d72eb4

Browse files
committed
Merge branch 'import-style' into locker
# Conflicts: # internal/table/session.go
2 parents 9f2b47d + 1275d5e commit 3d72eb4

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

internal/conn/grpc_client_stream.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import (
88
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
99
"google.golang.org/grpc"
1010

11-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
12-
1311
"github.com/ydb-platform/ydb-go-sdk/v3/internal/wrap"
12+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
1413
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1514
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
1615
)

internal/repeater/repeater.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import (
77

88
"github.com/jonboulle/clockwork"
99

10-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
11-
12-
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
13-
1410
"github.com/ydb-platform/ydb-go-sdk/v3/internal/backoff"
11+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
12+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1513
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
1614
)
1715

internal/table/session.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import (
77
"strconv"
88
"time"
99

10-
"google.golang.org/grpc"
11-
"google.golang.org/grpc/metadata"
12-
"google.golang.org/protobuf/proto"
13-
1410
"github.com/ydb-platform/ydb-go-genproto/Ydb_Table_V1"
1511
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
1612
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
1713
"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_TableStats"
14+
"google.golang.org/grpc"
15+
"google.golang.org/grpc/metadata"
16+
"google.golang.org/protobuf/proto"
1817

1918
"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
2019
"github.com/ydb-platform/ydb-go-sdk/v3/internal/feature"

0 commit comments

Comments
 (0)