add DoTx test with empty transaction operations + changed API of sugar package

Author: asmyasnikov

CHANGELOG.md

@@ -3,6 +3,7 @@
 * Added custom dns-resolver to grpc options for use dns-balancing with round_robin balancing policy
 * Wrapped with `recover()` system panic on getting system certificates pool
 * Added linters and fixed issues from them
+* Changed API of `sugar` package
 
 ## 3.5.1
 * Added system certificates for `darwin` system

internal/driver/cluster/cluster_test.go

@@ -132,13 +132,17 @@ func TestClusterMergeEndpoints(t *testing.T) {
 		endpoint.New("bad:23"),
 	}
 	t.Run("initial fill", func(t *testing.T) {
+		// nolint: gocritic
+		// nolint: nolintlint
 		ne := append(endpoints, badEndpoints...)
 		// merge new endpoints into balancer
 		mergeEndpointIntoCluster(ctx, c, []endpoint.Endpoint{}, ne, WithConnConfig(stub.Config(config.New())))
 		// try endpoints, filter out bad ones to tracking
 		assert(t, ne)
 	})
 	t.Run("update with another endpoints", func(t *testing.T) {
+		// nolint: gocritic
+		// nolint: nolintlint
 		ne := append(nextEndpoints, nextBadEndpoints...)
 		// merge new endpoints into balancer
 		mergeEndpointIntoCluster(ctx, c, append(endpoints, badEndpoints...), ne, WithConnConfig(stub.Config(config.New())))

sugar/sugar.go

@@ -12,19 +12,28 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
 
-// MakePath creates path inside database
-func MakePath(ctx context.Context, db ydb.Connection, path string) error {
-	for i := len(db.Name()) + 1; i < len(path); i++ {
-		x := strings.IndexByte(path[i:], '/')
+const (
+	sysTable = ".sys"
+)
+
+// MakeRecursive creates path inside database
+func MakeRecursive(ctx context.Context, db ydb.Connection, folder string) error {
+	folder = path.Join(db.Name(), folder)
+	for i := len(db.Name()) + 1; i < len(folder); i++ {
+		x := strings.IndexByte(folder[i:], '/')
 		if x == -1 {
-			x = len(path[i:]) - 1
+			x = len(folder[i:]) - 1
 		}
 		i += x
-		sub := path[:i+1]
+		sub := folder[:i+1]
 		info, err := db.Scheme().DescribePath(ctx, sub)
 		var opErr *errors.OpError
 		if errors.As(err, &opErr) && opErr.Reason == errors.StatusSchemeError {
 			err = db.Scheme().MakeDirectory(ctx, sub)
+			if err != nil {
+				return err
+			}
+			info, err = db.Scheme().DescribePath(ctx, sub)
 		}
 		if err != nil {
 			return err
@@ -41,19 +50,15 @@ func MakePath(ctx context.Context, db ydb.Connection, path string) error {
 			)
 		}
 	}
-
 	return nil
 }
 
-// RmPath remove selected directory or table names in database.
+// RemoveRecursive remove selected directory or table names in database.
 // All database entities in prefix path will remove if names list is empty.
 // Empty prefix means than use root of database.
-// RmPath method equal bash command `rm -rf ./pathToRemove/{name1,name2,name3}`
-func RmPath(ctx context.Context, db ydb.Connection, pathToRemove string, names ...string) error {
-	filter := make(map[string]struct{}, len(names))
-	for _, n := range names {
-		filter[n] = struct{}{}
-	}
+// RemoveRecursive method equal bash command `rm -rf ./path/to/remove`
+func RemoveRecursive(ctx context.Context, db ydb.Connection, pathToRemove string) error {
+	fullSysTablePath := path.Join(db.Name(), sysTable)
 	var list func(int, string) error
 	list = func(i int, p string) error {
 		dir, err := db.Scheme().ListDirectory(ctx, p)
@@ -65,10 +70,10 @@ func RmPath(ctx context.Context, db ydb.Connection, pathToRemove string, names .
 			return err
 		}
 		for _, child := range dir.Children {
-			if _, has := filter[child.Name]; !has {
+			pt := path.Join(p, child.Name)
+			if pt == fullSysTablePath {
 				continue
 			}
-			pt := path.Join(p, child.Name)
 			switch child.Type {
 			case scheme.EntryDirectory:
 				if err = list(i+1, pt); err != nil {

table/client.go

@@ -7,10 +7,10 @@ import (
 )
 
 // Operation is the interface that holds an operation for retry.
-type Operation func(context.Context, Session) error
+type Operation func(ctx context.Context, s Session) error
 
 // TxOperation is the interface that holds an operation for retry.
-type TxOperation func(context.Context, Transaction) error
+type TxOperation func(ctx context.Context, tx TransactionActor) error
 
 type Option func(o *Options)
 

table/table.go

@@ -117,8 +117,13 @@ type DataQuery interface {
 	YQL() string
 }
 
-type Transaction interface {
+type TransactionIdentifier interface {
 	ID() string
+}
+
+type TransactionActor interface {
+	TransactionIdentifier
+
 	Execute(
 		ctx context.Context,
 		query string,
@@ -131,6 +136,11 @@ type Transaction interface {
 		params *QueryParameters,
 		opts ...options.ExecuteDataQueryOption,
 	) (result.Result, error)
+}
+
+type Transaction interface {
+	TransactionActor
+
 	CommitTx(
 		ctx context.Context,
 		opts ...options.CommitTransactionOption,

test/ratelimiter_test.go

@@ -5,7 +5,6 @@ package test
 
 import (
 	"context"
-	"log"
 	"os"
 	"testing"
 	"time"
@@ -17,30 +16,13 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/errors"
 	internal "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter"
 	public "github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
-	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
 const (
 	testCoordinationNodePath = "/local/test"
 	testResource             = "test_res"
 )
 
-func driverTrace() trace.Driver {
-	var t trace.Driver
-	trace.Stub(&t, func(name string, args ...interface{}) {
-		log.Printf("[driver] %s: %+v", name, trace.ClearContext(args))
-	})
-	return t
-}
-
-func tableTrace() trace.Table {
-	var t trace.Table
-	trace.Stub(&t, func(name string, args ...interface{}) {
-		log.Printf("[table] %s: %+v", name, trace.ClearContext(args))
-	})
-	return t
-}
-
 func TestRateLimiter(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
 	defer cancel()
@@ -49,8 +31,6 @@ func TestRateLimiter(t *testing.T) {
 		ctx,
 		ydb.WithConnectionString(os.Getenv("YDB_CONNECTION_STRING")),
 		ydb.WithAnonymousCredentials(),
-		ydb.WithTraceDriver(driverTrace()),
-		ydb.WithTraceTable(tableTrace()),
 		ydb.With(
 			config.WithRequestTimeout(time.Second*5),
 			config.WithStreamTimeout(time.Second*5),