Skip to content

Commit

Permalink
fix: marshal/unmarshal error
Browse files Browse the repository at this point in the history
  • Loading branch information
highpon committed Jan 21, 2025
1 parent f92db92 commit 7add1ec
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion internal/net/grpc/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func BidirectionalStreamClient[S, R any](
return eg.Wait()
}

err = stream.SendMsg(data)
err = stream.SendMsg(*data)
if err != nil {
return err
}
Expand Down
12 changes: 3 additions & 9 deletions pkg/tools/cli/loadtest/service/insert.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ func objectVectorProvider(dataset assets.Dataset) (func() *any, int) {
Vector: v.([]float32),
},
})
tmp := any(obj)
return &tmp
ret = &obj
}
return ret
}, size
Expand All @@ -77,20 +76,15 @@ func objectVectorsProvider(dataset assets.Dataset, n int) (func() *any, int) {
if d == nil {
break
}
insertRequest, ok := (*d).(*payload.Insert_Request)
if !ok {
return nil
}
r = append(r, insertRequest)
r = append(r, (*d).(*payload.Insert_Request))
}
if len(r) == 0 {
return nil
}
obj := any(&payload.Insert_MultiRequest{
Requests: r,
})
tmp := any(obj)
return &tmp
return &obj
}, size
}

Expand Down
12 changes: 11 additions & 1 deletion pkg/tools/cli/loadtest/service/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"syscall"
"time"

"github.com/vdaas/vald/apis/grpc/v1/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/log"
"github.com/vdaas/vald/internal/net/grpc"
Expand Down Expand Up @@ -201,7 +202,16 @@ func (l *loader) do(
if err != nil {
return nil, err
}
return nil, grpc.BidirectionalStreamClient(st.(grpc.ClientStream), l.sendDataProvider, f)

if l.operation == config.StreamInsert {
return nil, grpc.BidirectionalStreamClient(st.(grpc.ClientStream), l.sendDataProvider, func(i *payload.Empty, err error) {
f(nil, err)
})
} else {
return nil, grpc.BidirectionalStreamClient(st.(grpc.ClientStream), l.sendDataProvider, func(i *payload.Search_Response, err error) {
f(nil, err)
})
}
})
return err
}))
Expand Down

0 comments on commit 7add1ec

Please sign in to comment.