* Renamed package internal/db to internal/database for exclude collisions with variable name db

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Renamed package `internal/db` to `internal/database` for exclude collisions with variable name `db`
+
 ## v3.18.0
 * Added `go1.18` to test matrix
 * Added `ydb.WithOperationTimeout` and `ydb.WithOperationCancelAfter` context modifiers

connection.go

@@ -15,7 +15,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/single"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/lazy"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
@@ -34,7 +34,7 @@ import (
 // Interface and list of clients may be changed in the future
 type Connection interface {
 	closer.Closer
-	db.Info
+	database.Info
 	grpc.ClientConnInterface
 
 	// Table returns table client
@@ -86,7 +86,7 @@ type connection struct {
 	pool conn.Pool
 
 	mtx sync.Mutex
-	db  db.Connection
+	db  database.Connection
 
 	children    map[uint64]Connection
 	childrenMtx sync.Mutex
@@ -274,7 +274,7 @@ func New(ctx context.Context, opts ...Option) (_ Connection, err error) {
 		)
 	}
 
-	c.db, err = db.New(
+	c.db, err = database.New(
 		ctx,
 		c.config,
 		c.pool,

internal/db/connection.go renamed to internal/database/connection.go

@@ -1,4 +1,4 @@
-package db
+package database
 
 import (
 	"google.golang.org/grpc"

internal/db/database.go renamed to internal/database/database.go

@@ -1,4 +1,4 @@
-package db
+package database
 
 import (
 	"context"

internal/lazy/coordiantion.go

@@ -7,20 +7,20 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/coordination"
 	"github.com/ydb-platform/ydb-go-sdk/v3/coordination/config"
 	builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
 )
 
 type lazyCoordination struct {
-	db      db.Connection
+	db      database.Connection
 	options []config.Option
 	client  coordination.Client
 	m       sync.Mutex
 }
 
-func Coordination(db db.Connection, options []config.Option) coordination.Client {
+func Coordination(db database.Connection, options []config.Option) coordination.Client {
 	return &lazyCoordination{
 		db:      db,
 		options: options,

internal/lazy/ratelimiter.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/options"
@@ -14,13 +14,13 @@ import (
 )
 
 type lazyRatelimiter struct {
-	db      db.Connection
+	db      database.Connection
 	options []config.Option
 	client  ratelimiter.Client
 	m       sync.Mutex
 }
 
-func Ratelimiter(db db.Connection, options []config.Option) ratelimiter.Client {
+func Ratelimiter(db database.Connection, options []config.Option) ratelimiter.Client {
 	return &lazyRatelimiter{
 		db:      db,
 		options: options,

internal/lazy/scheme.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
@@ -13,13 +13,13 @@ import (
 )
 
 type lazyScheme struct {
-	db      db.Connection
+	db      database.Connection
 	options []config.Option
 	client  scheme.Client
 	m       sync.Mutex
 }
 
-func Scheme(db db.Connection, options []config.Option) scheme.Client {
+func Scheme(db database.Connection, options []config.Option) scheme.Client {
 	return &lazyScheme{
 		db:      db,
 		options: options,

internal/lazy/scripting.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/scripting"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
@@ -15,7 +15,7 @@ import (
 )
 
 type lazyScripting struct {
-	db      db.Connection
+	db      database.Connection
 	options []config.Option
 	client  scripting.Client
 	m       sync.Mutex
@@ -76,7 +76,7 @@ func (s *lazyScripting) Close(ctx context.Context) (err error) {
 	return nil
 }
 
-func Scripting(db db.Connection, options []config.Option) scripting.Client {
+func Scripting(db database.Connection, options []config.Option) scripting.Client {
 	return &lazyScripting{
 		db:      db,
 		options: options,

internal/lazy/table.go

@@ -4,21 +4,21 @@ import (
 	"context"
 	"sync"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	builder "github.com/ydb-platform/ydb-go-sdk/v3/internal/table"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/config"
 )
 
 type lazyTable struct {
-	db      db.Connection
+	db      database.Connection
 	options []config.Option
 	client  table.Client
 	m       sync.Mutex
 }
 
-func Table(db db.Connection, options []config.Option) table.Client {
+func Table(db database.Connection, options []config.Option) table.Client {
 	return &lazyTable{
 		db:      db,
 		options: options,

testutil/driver.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Operations"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/db"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/database"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 )
 
@@ -158,7 +158,7 @@ func getField(name string, src, dst interface{}) bool {
 	return fn(reflect.ValueOf(src).Elem(), strings.Split(name, ".")...)
 }
 
-type database struct {
+type cluster struct {
 	onInvoke func(
 		ctx context.Context,
 		method string,
@@ -177,59 +177,59 @@ type database struct {
 	) error
 }
 
-func (db *database) Invoke(
+func (c *cluster) Invoke(
 	ctx context.Context,
 	method string,
 	args interface{},
 	reply interface{},
 	opts ...grpc.CallOption,
 ) (err error) {
-	if db.onInvoke == nil {
+	if c.onInvoke == nil {
 		return fmt.Errorf("database.onInvoke() not implemented")
 	}
-	return db.onInvoke(ctx, method, args, reply, opts...)
+	return c.onInvoke(ctx, method, args, reply, opts...)
 }
 
-func (db *database) NewStream(
+func (c *cluster) NewStream(
 	ctx context.Context,
 	desc *grpc.StreamDesc,
 	method string,
 	opts ...grpc.CallOption,
 ) (_ grpc.ClientStream, err error) {
-	if db.onNewStream == nil {
+	if c.onNewStream == nil {
 		return nil, fmt.Errorf("database.onNewStream() not implemented")
 	}
-	return db.onNewStream(ctx, desc, method, opts...)
+	return c.onNewStream(ctx, desc, method, opts...)
 }
 
-func (db *database) Get(context.Context) (conn grpc.ClientConnInterface, err error) {
+func (c *cluster) Get(context.Context) (conn grpc.ClientConnInterface, err error) {
 	cc := &clientConn{
-		onInvoke:    db.onInvoke,
-		onNewStream: db.onNewStream,
+		onInvoke:    c.onInvoke,
+		onNewStream: c.onNewStream,
 	}
 	return cc, nil
 }
 
-func (db *database) Name() string {
+func (c *cluster) Name() string {
 	return "testutil.database"
 }
 
-func (db *database) Close(ctx context.Context) error {
-	if db.onClose == nil {
+func (c *cluster) Close(ctx context.Context) error {
+	if c.onClose == nil {
 		return fmt.Errorf("database.Close() not implemented")
 	}
-	return db.onClose(ctx)
+	return c.onClose(ctx)
 }
 
 type (
 	InvokeHandlers    map[MethodCode]func(request interface{}) (result proto.Message, err error)
 	NewStreamHandlers map[MethodCode]func(desc *grpc.StreamDesc) (grpc.ClientStream, error)
 )
 
-type dbOption func(c *database)
+type clusterOption func(c *cluster)
 
-func WithInvokeHandlers(invokeHandlers InvokeHandlers) dbOption {
-	return func(db *database) {
+func WithInvokeHandlers(invokeHandlers InvokeHandlers) clusterOption {
+	return func(db *cluster) {
 		db.onInvoke = func(
 			ctx context.Context,
 			method string,
@@ -260,8 +260,8 @@ func WithInvokeHandlers(invokeHandlers InvokeHandlers) dbOption {
 	}
 }
 
-func WithNewStreamHandlers(newStreamHandlers NewStreamHandlers) dbOption {
-	return func(db *database) {
+func WithNewStreamHandlers(newStreamHandlers NewStreamHandlers) clusterOption {
+	return func(db *cluster) {
 		db.onNewStream = func(
 			ctx context.Context,
 			desc *grpc.StreamDesc,
@@ -276,14 +276,14 @@ func WithNewStreamHandlers(newStreamHandlers NewStreamHandlers) dbOption {
 	}
 }
 
-func WithClose(onClose func(ctx context.Context) error) dbOption {
-	return func(c *database) {
+func WithClose(onClose func(ctx context.Context) error) clusterOption {
+	return func(c *cluster) {
 		c.onClose = onClose
 	}
 }
 
-func NewDB(opts ...dbOption) db.Cluster {
-	c := &database{}
+func NewDB(opts ...clusterOption) database.Cluster {
+	c := &cluster{}
 	for _, opt := range opts {
 		opt(c)
 	}