refact: MapStringFloat64Cmd -> VectorInfoSliceCmd

Signed-off-by: fukua95 <[email protected]>

Author: cxljs

command.go

@@ -5621,57 +5621,63 @@ func (cmd *MonitorCmd) Stop() {
 	cmd.status = monitorStatusStop
 }
 
-type MapStringFloatCmd struct {
+type VectorInfo struct {
+	Name  string
+	Score float64
+}
+
+type VectorInfoSliceCmd struct {
 	baseCmd
 
-	val map[string]float64
+	val []VectorInfo
 }
 
-var _ Cmder = (*MapStringFloatCmd)(nil)
+var _ Cmder = (*VectorInfoSliceCmd)(nil)
 
-func NewMapStringFloatCmd(ctx context.Context, args ...any) *MapStringFloatCmd {
-	return &MapStringFloatCmd{
+func NewVectorInfoSliceCmd(ctx context.Context, args ...any) *VectorInfoSliceCmd {
+	return &VectorInfoSliceCmd{
 		baseCmd: baseCmd{
 			ctx:  ctx,
 			args: args,
 		},
 	}
 }
 
-func (cmd *MapStringFloatCmd) SetVal(val map[string]float64) {
+func (cmd *VectorInfoSliceCmd) SetVal(val []VectorInfo) {
 	cmd.val = val
 }
 
-func (cmd *MapStringFloatCmd) Val() map[string]float64 {
+func (cmd *VectorInfoSliceCmd) Val() []VectorInfo {
 	return cmd.val
 }
 
-func (cmd *MapStringFloatCmd) Result() (map[string]float64, error) {
+func (cmd *VectorInfoSliceCmd) Result() ([]VectorInfo, error) {
 	return cmd.val, cmd.err
 }
 
-func (cmd *MapStringFloatCmd) String() string {
+func (cmd *VectorInfoSliceCmd) String() string {
 	return cmdString(cmd, cmd.val)
 }
 
-func (cmd *MapStringFloatCmd) readReply(rd *proto.Reader) error {
+func (cmd *VectorInfoSliceCmd) readReply(rd *proto.Reader) error {
 	n, err := rd.ReadMapLen()
 	if err != nil {
 		return err
 	}
 
-	cmd.val = make(map[string]float64, n)
+	cmd.val = make([]VectorInfo, n)
 	for i := 0; i < n; i++ {
-		key, err := rd.ReadString()
+		name, err := rd.ReadString()
 		if err != nil {
 			return err
 		}
+		cmd.val[i].Name = name
 
-		nn, err := rd.ReadFloat()
+		score, err := rd.ReadFloat()
 		if err != nil {
 			return err
 		}
-		cmd.val[key] = nn
+		cmd.val[i].Score = score
 	}
 	return nil
 }

vectorset_commands.go

@@ -14,15 +14,15 @@ type VectorSetCmdable interface {
 	VGetAttr(ctx context.Context, key, element string) *StringCmd
 	VInfo(ctx context.Context, key string) *MapStringInterfaceCmd
 	VLinks(ctx context.Context, key, element string) *StringSliceCmd
-	VLinksWithScores(ctx context.Context, key, element string) *MapStringFloatCmd
+	VLinksWithScores(ctx context.Context, key, element string) *VectorInfoSliceCmd
 	VRandMember(ctx context.Context, key string) *StringCmd
 	VRandMemberCount(ctx context.Context, key string, count int) *StringSliceCmd
 	VRem(ctx context.Context, key, element string) *BoolCmd
 	VSetAttr(ctx context.Context, key, element, attr string) *BoolCmd
 	VSim(ctx context.Context, key string, val Vector) *StringSliceCmd
-	VSimWithScores(ctx context.Context, key string, val Vector) *MapStringFloatCmd
+	VSimWithScores(ctx context.Context, key string, val Vector) *VectorInfoSliceCmd
 	VSimWithArgs(ctx context.Context, key string, val Vector, args *VSimArgs) *StringSliceCmd
-	VSimWithArgsWithScores(ctx context.Context, key string, val Vector, args *VSimArgs) *MapStringFloatCmd
+	VSimWithArgsWithScores(ctx context.Context, key string, val Vector, args *VSimArgs) *VectorInfoSliceCmd
 }
 
 type Vector interface {
@@ -183,8 +183,8 @@ func (c cmdable) VLinks(ctx context.Context, key, element string) *StringSliceCm
 }
 
 // `VLINKS key element WITHSCORES`
-func (c cmdable) VLinksWithScores(ctx context.Context, key, element string) *MapStringFloatCmd {
-	cmd := NewMapStringFloatCmd(ctx, "vlinks", key, element, "withscores")
+func (c cmdable) VLinksWithScores(ctx context.Context, key, element string) *VectorInfoSliceCmd {
+	cmd := NewVectorInfoSliceCmd(ctx, "vlinks", key, element, "withscores")
 	_ = c(ctx, cmd)
 	return cmd
 }
@@ -223,7 +223,7 @@ func (c cmdable) VSim(ctx context.Context, key string, val Vector) *StringSliceC
 }
 
 // `VSIM key (ELE | FP32 | VALUES num) (vector | element) WITHSCORES`
-func (c cmdable) VSimWithScores(ctx context.Context, key string, val Vector) *MapStringFloatCmd {
+func (c cmdable) VSimWithScores(ctx context.Context, key string, val Vector) *VectorInfoSliceCmd {
 	return c.VSimWithArgsWithScores(ctx, key, val, &VSimArgs{})
 }
 
@@ -279,15 +279,15 @@ func (c cmdable) VSimWithArgs(ctx context.Context, key string, val Vector, simAr
 
 // `VSIM key (ELE | FP32 | VALUES num) (vector | element) [WITHSCORES] [COUNT num]
 // [EF search-exploration-factor] [FILTER expression] [FILTER-EF max-filtering-effort] [TRUTH] [NOTHREAD]`
-func (c cmdable) VSimWithArgsWithScores(ctx context.Context, key string, val Vector, simArgs *VSimArgs) *MapStringFloatCmd {
+func (c cmdable) VSimWithArgsWithScores(ctx context.Context, key string, val Vector, simArgs *VSimArgs) *VectorInfoSliceCmd {
 	if simArgs == nil {
 		simArgs = &VSimArgs{}
 	}
 	args := []any{"vsim", key}
 	args = append(args, val.Value()...)
 	args = append(args, "withscores")
 	args = simArgs.appendArgs(args)
-	cmd := NewMapStringFloatCmd(ctx, args...)
+	cmd := NewVectorInfoSliceCmd(ctx, args...)
 	_ = c(ctx, cmd)
 	return cmd
 }

vectorset_commands_test.go

@@ -124,9 +124,13 @@ var _ = Describe("Redis VectorSet commands", Label("vectorset"), func() {
 				}).Result()
 				expectNil(err)
 				expectEqual(len(sim), 3)
-				expectTrue(sim["k1"] > 0.99)
-				expectTrue(sim["k2"] > 0.99)
-				expectTrue(sim["k3"] < 0.8)
+				simMap := make(map[string]float64)
+				for _, vi := range sim {
+					simMap[vi.Name] = vi.Score
+				}
+				expectTrue(simMap["k1"] > 0.99)
+				expectTrue(simMap["k2"] > 0.99)
+				expectTrue(simMap["k3"] < 0.8)
 			})
 
 			It("dimension operation", func() {