Skip to content

Commit cd48f7f

Browse files
authored
Merge pull request #244 from ydb-platform/drop-grpc-client-conn-interface
* Removed from `ydb.Connection` embedding of `grpc.ClientConnInterface`
2 parents 566ce4f + d518675 commit cd48f7f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
* Fixed bug with convertation `time.Duration` from/to YDB value
2+
* Removed from `ydb.Connection` embedding of `grpc.ClientConnInterface`
23
* Fixed stopping of repeater
34
* Added hard minimal interval (1 second) between force wake up's
45
* Renamed `trace.DriverRepeaterTick{Start,Done}Info` to `trace.DriverRepeaterWakeUp{Start,Done}Info`

connection.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ import (
4040
// This interface is central part for access to various systems
4141
// embedded to ydb through one configured connection method.
4242
type Connection interface {
43-
// ClientConnInterface provide execute unary and streaming RPC over internal balancer
44-
grpc.ClientConnInterface
45-
4643
// Endpoint returns initial endpoint
4744
Endpoint() string
4845

@@ -118,6 +115,8 @@ type connection struct {
118115
panicCallback func(e interface{})
119116
}
120117

118+
var _ grpc.ClientConnInterface = (*connection)(nil)
119+
121120
func (c *connection) Close(ctx context.Context) error {
122121
c.mtx.Lock()
123122
defer c.mtx.Unlock()

connection_e2e_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func TestConnection(t *testing.T) {
123123
}()
124124
t.Run("discovery.WhoAmI", func(t *testing.T) {
125125
if err = retry.Retry(ctx, func(ctx context.Context) (err error) {
126-
discoveryClient := Ydb_Discovery_V1.NewDiscoveryServiceClient(db)
126+
discoveryClient := Ydb_Discovery_V1.NewDiscoveryServiceClient(db.(grpc.ClientConnInterface))
127127
response, err := discoveryClient.WhoAmI(
128128
ctx,
129129
&Ydb_Discovery.WhoAmIRequest{IncludeGroups: true},
@@ -143,7 +143,7 @@ func TestConnection(t *testing.T) {
143143
})
144144
t.Run("scripting.ExecuteYql", func(t *testing.T) {
145145
if err = retry.Retry(ctx, func(ctx context.Context) (err error) {
146-
scriptingClient := Ydb_Scripting_V1.NewScriptingServiceClient(db)
146+
scriptingClient := Ydb_Scripting_V1.NewScriptingServiceClient(db.(grpc.ClientConnInterface))
147147
response, err := scriptingClient.ExecuteYql(
148148
ctx,
149149
&Ydb_Scripting.ExecuteYqlRequest{Script: "SELECT 1+100 AS sum"},
@@ -194,7 +194,7 @@ func TestConnection(t *testing.T) {
194194
})
195195
t.Run("scripting.StreamExecuteYql", func(t *testing.T) {
196196
if err = retry.Retry(ctx, func(ctx context.Context) (err error) {
197-
scriptingClient := Ydb_Scripting_V1.NewScriptingServiceClient(db)
197+
scriptingClient := Ydb_Scripting_V1.NewScriptingServiceClient(db.(grpc.ClientConnInterface))
198198
client, err := scriptingClient.StreamExecuteYql(
199199
ctx,
200200
&Ydb_Scripting.ExecuteYqlRequest{Script: "SELECT 1+100 AS sum"},
@@ -248,7 +248,7 @@ func TestConnection(t *testing.T) {
248248
_ = childDB.Close(ctx)
249249
}()
250250
if err = retry.Retry(ctx, func(ctx context.Context) (err error) {
251-
scriptingClient := Ydb_Scripting_V1.NewScriptingServiceClient(childDB)
251+
scriptingClient := Ydb_Scripting_V1.NewScriptingServiceClient(childDB.(grpc.ClientConnInterface))
252252
client, err := scriptingClient.StreamExecuteYql(
253253
ctx,
254254
&Ydb_Scripting.ExecuteYqlRequest{Script: "SELECT 1+100 AS sum"},
@@ -291,7 +291,7 @@ func TestConnection(t *testing.T) {
291291
})
292292
t.Run("export.ExportToS3", func(t *testing.T) {
293293
if err = retry.Retry(ctx, func(ctx context.Context) (err error) {
294-
exportClient := Ydb_Export_V1.NewExportServiceClient(db)
294+
exportClient := Ydb_Export_V1.NewExportServiceClient(db.(grpc.ClientConnInterface))
295295
response, err := exportClient.ExportToS3(
296296
ctx,
297297
&Ydb_Export.ExportToS3Request{

0 commit comments

Comments
 (0)