Merge pull request #67 from ydb-platform/draft-v3.5.1

draft v3.5.1

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.5.1
+* Added system certificates for `darwin` system
+* Fixed `table.StreamResult` finishing
+* Fixes `sugar.MakePath()`
+* Added helper `ydb.MergeOptions()` for merge several `ydb.Option` to single `ydb.Option`
+
 ## 3.5.0
 * Added `ClosabelSession` interface which extends `Session` interface and provide `Close` method
 * Added `CreateSession` method into `table.Client` interface

config/config.go

@@ -3,7 +3,6 @@ package config
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"runtime"
 	"time"
 
 	"google.golang.org/grpc"
@@ -288,12 +287,8 @@ func defaults() (c *config) {
 		certPool *x509.CertPool
 		err      error
 	)
-	if runtime.GOOS != "darwin" {
-		certPool, err = x509.SystemCertPool()
-		if err != nil {
-			certPool = x509.NewCertPool()
-		}
-	} else {
+	certPool, err = x509.SystemCertPool()
+	if err != nil {
 		certPool = x509.NewCertPool()
 	}
 	return &config{

internal/meta/version.go

@@ -1,5 +1,5 @@
 package meta
 
 const (
-	Version = "ydb-go-sdk/3.5.0"
+	Version = "ydb-go-sdk/3.5.1"
 )

internal/table/scanner/result.go

@@ -122,7 +122,7 @@ func (r *streamResult) NextResultSet(ctx context.Context, columns ...string) boo
 	}
 	select {
 	case s, ok := <-r.ch:
-		if !ok {
+		if !ok || s == nil {
 			return false
 		}
 		r.Reset(s, columns...)

internal/table/session.go

@@ -699,6 +699,7 @@ func (s *session) StreamReadTable(ctx context.Context, path string, opts ...opti
 		defer func() {
 			cancel()
 			onDone(r, errors.HideEOF(err))
+			r.Append(nil)
 		}()
 		for {
 			select {
@@ -765,6 +766,7 @@ func (s *session) StreamExecuteScanQuery(ctx context.Context, query string, para
 		defer func() {
 			cancel()
 			onDone(r, errors.HideEOF(err))
+			r.Append(nil)
 		}()
 		for {
 			select {

options.go

@@ -149,6 +149,17 @@ func With(options ...config.Option) Option {
 	}
 }
 
+func MergeOptions(options ...Option) Option {
+	return func(ctx context.Context, db *db) error {
+		for _, o := range options {
+			if err := o(ctx, db); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+}
+
 func WithDiscoveryInterval(discoveryInterval time.Duration) Option {
 	return func(ctx context.Context, db *db) error {
 		db.options = append(db.options, config.WithDiscoveryInterval(discoveryInterval))

sugar/sugar.go

@@ -14,16 +14,16 @@ import (
 
 // MakePath creates path inside database
 func MakePath(ctx context.Context, db ydb.Connection, path string) error {
-	for i := 0; i < len(path); i++ {
+	for i := len(db.Name()) + 1; i < len(path); i++ {
 		x := strings.IndexByte(path[i:], '/')
 		if x == -1 {
 			x = len(path[i:]) - 1
 		}
 		i += x
 		sub := path[:i+1]
 		info, err := db.Scheme().DescribePath(ctx, sub)
-		operr, ok := err.(*errors.OpError)
-		if ok && operr.Reason == errors.StatusSchemeError {
+		opErr, ok := err.(*errors.OpError)
+		if ok && opErr.Reason == errors.StatusSchemeError {
 			err = db.Scheme().MakeDirectory(ctx, sub)
 		}
 		if err != nil {