Merge pull request #1095 from ydb-platform/slo

fixed slo and optional.castTo

Author: asmyasnikov

.github/workflows/slo.yml

@@ -49,7 +49,7 @@ jobs:
           workload_build_context0: ../..
           workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native/table --build-arg JOB_NAME=workload-native-table
 
-          language_id1: 'query'
+          language_id1: 'native/query'
           workload_path1: 'tests/slo'
           language1: 'Go SDK native over query-service'
           workload_build_context1: ../..

internal/value/value.go

@@ -1315,6 +1315,14 @@ func (v *optionalValue) castTo(dst interface{}) error {
 	inner := reflect.Indirect(ptr)
 
 	if inner.Kind() != reflect.Pointer {
+		if v.value == nil {
+			if ptr.CanAddr() {
+				ptr.SetZero()
+			}
+
+			return nil
+		}
+
 		if err := v.value.castTo(ptr.Interface()); err != nil {
 			return xerrors.WithStackTrace(err)
 		}

tests/slo/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 as build
+FROM golang:1.22 as build
 ARG SRC_PATH
 ARG JOB_NAME
 COPY . /src

tests/slo/internal/generator/row.go

@@ -4,11 +4,12 @@ import "time"
 
 type RowID = uint64
 
+//nolint:tagalign
 type Row struct {
-	Hash             uint64     `gorm:"column:hash;primarykey;autoIncrement:false" xorm:"pk 'hash'"`
-	ID               RowID      `gorm:"column:id;primarykey;autoIncrement:false" xorm:"pk 'id'"` //nolint:tagalign
-	PayloadStr       *string    `gorm:"column:payload_str" xorm:"'payload_str'"`                 //nolint:tagalign
-	PayloadDouble    *float64   `gorm:"column:payload_double" xorm:"'payload_double'"`           //nolint:tagalign
-	PayloadTimestamp *time.Time `gorm:"column:payload_timestamp" xorm:"'payload_timestamp'"`     //nolint:tagalign
-	PayloadHash      uint64     `gorm:"column:payload_hash" xorm:"'payload_hash'"`               //nolint:tagalign
+	Hash             uint64     `sql:"hash" gorm:"column:hash;primarykey;autoIncrement:false" xorm:"pk 'hash'"`
+	ID               RowID      `sql:"id" gorm:"column:id;primarykey;autoIncrement:false" xorm:"pk 'id'"`
+	PayloadStr       *string    `sql:"payload_str" gorm:"column:payload_str" xorm:"'payload_str'"`
+	PayloadDouble    *float64   `sql:"payload_double" gorm:"column:payload_double" xorm:"'payload_double'"`
+	PayloadTimestamp *time.Time `sql:"payload_timestamp" gorm:"column:payload_timestamp" xorm:"'payload_timestamp'"`
+	PayloadHash      uint64     `sql:"payload_hash" gorm:"column:payload_hash" xorm:"'payload_hash'"`
 }

tests/slo/native/query/storage.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io"
 	"path"
 	"strconv"
 	"time"
@@ -120,20 +122,23 @@ func (s *Storage) Read(ctx context.Context, entryID generator.RowID) (_ generato
 
 			rs, err := res.NextResultSet(ctx)
 			if err != nil {
+				if errors.Is(err, io.EOF) {
+					return nil
+				}
+
 				return err
 			}
 
 			row, err := rs.NextRow(ctx)
 			if err != nil {
+				if errors.Is(err, io.EOF) {
+					return nil
+				}
+
 				return err
 			}
 
-			err = row.ScanNamed(
-				query.Named("id", &e.ID),
-				query.Named("payload_str", &e.PayloadStr),
-				query.Named("payload_double", &e.PayloadDouble),
-				query.Named("payload_timestamp", &e.PayloadTimestamp),
-			)
+			err = row.ScanStruct(&e, query.WithAllowMissingColumnsFromSelect())
 			if err != nil {
 				return err
 			}
@@ -244,9 +249,10 @@ func (s *Storage) dropTable(ctx context.Context) error {
 
 	return s.db.Query().Do(ctx,
 		func(ctx context.Context, session query.Session) error {
-			_, _, err := session.Execute(ctx, `
-				DROP TABLE `+"`"+path.Join(s.prefix, s.cfg.Table)+"`"+`
-			`)
+			_, _, err := session.Execute(ctx,
+				fmt.Sprintf("DROP TABLE `%s`", path.Join(s.prefix, s.cfg.Table)),
+				query.WithTxControl(query.NoTx()),
+			)
 
 			return err
 		},