fix scanner uuid

Author: rekby

internal/params/builder_test.go

@@ -345,22 +345,6 @@ func TestBuilder(t *testing.T) {
 				},
 			},
 		},
-		{
-			method: "UUID",
-			args:   []any{[...]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}},
-
-			expected: expected{
-				Type: &Ydb.Type{
-					Type: &Ydb.Type_TypeId{TypeId: Ydb.Type_UUID},
-				},
-				Value: &Ydb.Value{
-					Value: &Ydb.Value_Low_128{
-						Low_128: 651345242494996240,
-					},
-					High_128: 72623859790382856,
-				},
-			},
-		},
 		{
 			method: "TzDatetime",
 			args:   []any{time.Unix(123456789, 456).UTC()},

internal/table/scanner/scanner.go

@@ -1083,6 +1083,13 @@ func (s *valueScanner) scanOptional(v interface{}, defaultValueForOptional bool)
 			val := value.NewUUIDIssue1501FixedBytesWrapper(src)
 			*v = &val
 		}
+	case **uuid.UUID:
+		if s.isNull() {
+			*v = nil
+		} else {
+			src := s.uuid()
+			*v = &src
+		}
 	case **interface{}:
 		if s.isNull() {
 			*v = nil

internal/table/scanner/scanner_data_test.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/result/indexed"
@@ -63,7 +64,7 @@ var scannerData = []struct {
 			name:   "date",
 			typeID: Ydb.Type_DATE,
 		}},
-		values: []indexed.RequiredOrOptional{new([16]byte), new(time.Time)},
+		values: []indexed.RequiredOrOptional{new(uuid.UUID), new(time.Time)},
 	},
 	{
 		name:  "Scan JSON, DOUBLE",
@@ -272,7 +273,7 @@ var scannerData = []struct {
 			typeID:   Ydb.Type_DOUBLE,
 			optional: true,
 		}},
-		values: []indexed.RequiredOrOptional{new(*time.Duration), new(*[16]byte), new(*float64)},
+		values: []indexed.RequiredOrOptional{new(*time.Duration), new(*uuid.UUID), new(*float64)},
 	},
 	{
 		name:  "Scan int64, date, string as ydb.Scanner",
@@ -424,7 +425,7 @@ var scannerData = []struct {
 			optional: true,
 			nilValue: true,
 		}},
-		values: []indexed.RequiredOrOptional{new(*uint8), new(*[]byte), new(*time.Time), new(*[16]byte)},
+		values: []indexed.RequiredOrOptional{new(*uint8), new(*[]byte), new(*time.Time), new(*uuid.UUID)},
 	},
 	{
 		name:  "Scan string as byte array.",

internal/table/scanner/scanner_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 
@@ -454,21 +455,23 @@ func valueFromPrimitiveTypeID(c *column, r xrand.Rand) (*Ydb.Value, interface{})
 				Value: &Ydb.Value_NullFlagValue{},
 			}
 			if c.testDefault {
-				var dv [16]byte
+				var dv uuid.UUID
 
 				return ydbval, &dv
 			}
-			var dv *[16]byte
+			var dv *uuid.UUID
 
 			return ydbval, &dv
 		}
-		v := [16]byte{}
-		binary.BigEndian.PutUint64(v[0:8], uint64(rv))
-		binary.BigEndian.PutUint64(v[8:16], uint64(rv))
+		v := uuid.UUID{}
+
+		binary.LittleEndian.PutUint64(v[0:8], uint64(rv))
+		binary.LittleEndian.PutUint64(v[8:16], uint64(rv))
+		low, high := value.UUIDToHiLoPair(v)
 		ydbval := &Ydb.Value{
-			High_128: binary.BigEndian.Uint64(v[0:8]),
+			High_128: high,
 			Value: &Ydb.Value_Low_128{
-				Low_128: binary.BigEndian.Uint64(v[8:16]),
+				Low_128: low,
 			},
 		}
 		if c.optional && !c.testDefault {

internal/value/value.go

@@ -2173,20 +2173,27 @@ func (v *uuidValue) toYDB(a *allocator.Allocator) *Ydb.Value {
 		return v.toYDBWithBug(a)
 	}
 
-	var bytes [16]byte
+	var low, high uint64
 	if v != nil {
-		bytes = uuidDirectBytesToLe(v.value)
+		low, high = UUIDToHiLoPair(v.value)
 	}
 	vv := a.Low128()
-	vv.Low_128 = binary.LittleEndian.Uint64(bytes[0:8])
+	vv.Low_128 = low
 
 	vvv := a.Value()
-	vvv.High_128 = binary.LittleEndian.Uint64(bytes[8:16])
+	vvv.High_128 = high
 	vvv.Value = vv
 
 	return vvv
 }
 
+func UUIDToHiLoPair(id uuid.UUID) (low, high uint64) {
+	bytes := uuidDirectBytesToLe(id)
+	low = binary.LittleEndian.Uint64(bytes[0:8])
+	high = binary.LittleEndian.Uint64(bytes[8:16])
+	return low, high
+}
+
 func (v *uuidValue) toYDBWithBug(a *allocator.Allocator) *Ydb.Value {
 	var bytes [16]byte
 	if v != nil {