move SessionStatus from options package to table

Author: asmyasnikov

CHANGELOG.md

@@ -1,5 +1,7 @@
 * Marked the truncated result as retryable error
 * Added closing sessions if node removed from discovery results
+* Moved session status type from `table/options` package to `table`
+* Changed session status source type from `uint32` to `string` alias 
 
 ## v3.37.6
 * Added to balancer notifying mechanism for listening in table client event about removing some nodes and closing sessions on them 

internal/table/client.go

@@ -19,7 +19,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
-	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
 	"github.com/ydb-platform/ydb-go-sdk/v3/testutil/timeutil"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
@@ -134,10 +133,10 @@ func (c *Client) updateNodes(ctx context.Context, endpoints []endpoint.Info) {
 				return nodeIDs[i] >= nodeID
 			}) == len(nodeIDs) {
 				for s := range c.nodes[nodeID] {
-					if c.index[s].idle != nil {
+					if info, has := c.index[s]; has && info.idle != nil {
 						c.internalPoolAsyncCloseSession(ctx, s)
 					} else {
-						s.SetStatus(options.SessionClosing)
+						s.SetStatus(table.SessionClosing)
 					}
 				}
 			}
@@ -632,7 +631,7 @@ func (c *Client) Close(ctx context.Context) (err error) {
 			for e := c.idle.Front(); e != nil; e = e.Next() {
 				wg.Add(1)
 				s := e.Value.(*session)
-				s.SetStatus(options.SessionClosing)
+				s.SetStatus(table.SessionClosing)
 				go func() {
 					defer wg.Done()
 					c.internalPoolSyncCloseSession(ctx, s)
@@ -806,7 +805,7 @@ func (c *Client) internalPoolNotify(s *session) (notified bool) {
 }
 
 func (c *Client) internalPoolAsyncCloseSession(ctx context.Context, s *session) {
-	s.SetStatus(options.SessionClosing)
+	s.SetStatus(table.SessionClosing)
 	c.spawnedGoroutines.Add(1)
 	go func() {
 		defer c.spawnedGoroutines.Done()

internal/table/retry_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xrand"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
-	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
 	"github.com/ydb-platform/ydb-go-sdk/v3/testutil"
 )
 
@@ -154,7 +153,7 @@ func TestRetryerSessionClosing(t *testing.T) {
 			config.New(),
 			func(ctx context.Context, s table.Session) error {
 				sessions = append(sessions, s)
-				s.(*session).SetStatus(options.SessionClosing)
+				s.(*session).SetStatus(table.SessionClosing)
 				return nil
 			},
 			table.Options{},

internal/table/session.go

@@ -46,8 +46,9 @@ type session struct {
 	tableService Ydb_Table_V1.TableServiceClient
 	config       config.Config
 
-	status options.SessionStatus
-	nodeID uint32
+	status    table.SessionStatus
+	statusMtx sync.RWMutex
+	nodeID    uint32
 
 	onClose   []func(s *session)
 	closeOnce sync.Once
@@ -72,23 +73,27 @@ func (s *session) NodeID() uint32 {
 	return uint32(nodeID)
 }
 
-func (s *session) Status() string {
+func (s *session) Status() table.SessionStatus {
 	if s == nil {
-		return ""
+		return table.SessionStatusUnknown
 	}
-	return options.SessionStatus(atomic.LoadUint32((*uint32)(&s.status))).String()
+	s.statusMtx.RLock()
+	defer s.statusMtx.RUnlock()
+	return s.status
 }
 
-func (s *session) SetStatus(status options.SessionStatus) {
-	atomic.StoreUint32((*uint32)(&s.status), uint32(status))
+func (s *session) SetStatus(status table.SessionStatus) {
+	s.statusMtx.Lock()
+	defer s.statusMtx.Unlock()
+	s.status = status
 }
 
 func (s *session) isClosed() bool {
-	return options.SessionStatus(atomic.LoadUint32((*uint32)(&s.status))) == options.SessionClosed
+	return s.Status() == table.SessionClosed
 }
 
 func (s *session) isClosing() bool {
-	return options.SessionStatus(atomic.LoadUint32((*uint32)(&s.status))) == options.SessionClosing
+	return s.Status() == table.SessionClosing
 }
 
 func newSession(ctx context.Context, cc grpc.ClientConnInterface, config config.Config, opts ...sessionBuilderOption) (
@@ -129,7 +134,7 @@ func newSession(ctx context.Context, cc grpc.ClientConnInterface, config config.
 		id:           result.GetSessionId(),
 		tableService: c,
 		config:       config,
-		status:       options.SessionReady,
+		status:       table.SessionReady,
 	}
 
 	for _, o := range opts {
@@ -160,7 +165,7 @@ func (s *session) Close(ctx context.Context) (err error) {
 
 	s.closeOnce.Do(func() {
 		defer func() {
-			s.SetStatus(options.SessionClosed)
+			s.SetStatus(table.SessionClosed)
 		}()
 
 		onDone := trace.TableOnSessionDelete(s.config.Trace(), &ctx, s)
@@ -232,9 +237,9 @@ func (s *session) KeepAlive(ctx context.Context) (err error) {
 	}
 	switch result.SessionStatus {
 	case Ydb_Table.KeepAliveResult_SESSION_STATUS_READY:
-		s.SetStatus(options.SessionReady)
+		s.SetStatus(table.SessionReady)
 	case Ydb_Table.KeepAliveResult_SESSION_STATUS_BUSY:
-		s.SetStatus(options.SessionBusy)
+		s.SetStatus(table.SessionBusy)
 	}
 	return nil
 }
@@ -447,7 +452,7 @@ func (s *session) checkError(err error) {
 		return
 	}
 	if m := retry.Check(err); m.MustDeleteSession() {
-		s.SetStatus(options.SessionClosing)
+		s.SetStatus(table.SessionClosing)
 	}
 }
 

internal/table/session_test.go

@@ -65,17 +65,17 @@ func TestSessionKeepAlive(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if s.Status() != options.SessionReady.String() {
-		t.Fatalf("Result %v differ from, expectd %v", s.Status(), options.SessionReady.String())
+	if s.Status() != table.SessionReady {
+		t.Fatalf("Result %v differ from, expectd %v", s.Status(), table.SessionReady)
 	}
 
 	status, e = Ydb_Table.KeepAliveResult_SESSION_STATUS_BUSY, nil
 	err = s.KeepAlive(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if s.Status() != options.SessionBusy.String() {
-		t.Fatalf("Result %v differ from, expectd %v", s.Status(), options.SessionBusy.String())
+	if s.Status() != table.SessionBusy {
+		t.Fatalf("Result %v differ from, expectd %v", s.Status(), table.SessionBusy)
 	}
 }
 

internal/table/trailer.go

@@ -5,7 +5,7 @@ import (
 	"google.golang.org/grpc/metadata"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
-	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
 
 type trailer struct {
@@ -29,7 +29,7 @@ func checkHintSessionClose(md metadata.MD) bool {
 func (t *trailer) processHints() {
 	switch {
 	case checkHintSessionClose(t.md):
-		t.s.SetStatus(options.SessionClosing)
+		t.s.SetStatus(table.SessionClosing)
 	default:
 		// pass
 	}

internal/xsql/conn.go

@@ -105,7 +105,7 @@ func (c *conn) isClosed() bool {
 	if atomic.LoadUint32(&c.closed) == 1 {
 		return true
 	}
-	if c.session.Status() != options.SessionReady.String() {
+	if c.session.Status() != table.SessionReady {
 		c.setClosed()
 		return true
 	}

table/options/models.go

@@ -2,6 +2,7 @@ package options
 
 import (
 	"bytes"
+	"fmt"
 	"time"
 
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
@@ -12,33 +13,6 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/types"
 )
 
-type SessionStatus uint32
-
-const (
-	SessionStatusUnknown SessionStatus = iota
-	SessionReady
-	SessionBusy
-	SessionClosing
-	SessionClosed
-
-	statusUnknown = "unknown"
-)
-
-func (s SessionStatus) String() string {
-	switch s {
-	case SessionReady:
-		return "ready"
-	case SessionBusy:
-		return "busy"
-	case SessionClosing:
-		return "closing"
-	case SessionClosed:
-		return "closed"
-	default:
-		return statusUnknown
-	}
-}
-
 type Column struct {
 	Name   string
 	Type   types.Type
@@ -165,7 +139,7 @@ func (c ColumnFamilyCompression) String() string {
 	case ColumnFamilyCompressionLZ4:
 		return "lz4"
 	default:
-		return statusUnknown
+		return fmt.Sprintf("unknown_column_family_compression_%d", c)
 	}
 }
 

table/table.go

@@ -65,9 +65,19 @@ type Client interface {
 	DoTx(ctx context.Context, op TxOperation, opts ...Option) error
 }
 
+type SessionStatus = string
+
+const (
+	SessionStatusUnknown = SessionStatus("unknown")
+	SessionReady         = SessionStatus("ready")
+	SessionBusy          = SessionStatus("busy")
+	SessionClosing       = SessionStatus("closing")
+	SessionClosed        = SessionStatus("closed")
+)
+
 type SessionInfo interface {
 	ID() string
-	Status() string
+	Status() SessionStatus
 }
 
 type Session interface {

table/table_e2e_test.go

@@ -245,7 +245,7 @@ func testTable(t testing.TB) {
 					if atomic.LoadUint32(&shutdowned) == 0 {
 						return
 					}
-					if info.Session.Status() != options.SessionClosing.String() {
+					if info.Session.Status() != table.SessionClosing {
 						return
 					}
 					sessionsMtx.Lock()