feat!: Sortedset inconsistencies

momento/cache_client.go

@@ -202,13 +202,6 @@ func (c defaultScsClient) SortedSetGetScores(ctx context.Context, r *SortedSetGe
 }
 
 func (c defaultScsClient) SortedSetRemove(ctx context.Context, r *SortedSetRemoveRequest) (responses.SortedSetRemoveResponse, error) {
-	if r.ElementsToRemove == nil {
-		return nil, convertMomentoSvcErrorToCustomerError(
-			momentoerrors.NewMomentoSvcErr(
-				momentoerrors.InvalidArgumentError, "elements to remove cannot be nil", nil,
-			),
-		)
-	}
 	if err := c.dataClient.makeRequest(ctx, r); err != nil {
 		return nil, err
 	}

momento/requester.go

@@ -90,21 +90,20 @@ func prepareName(name string, label string) (string, error) {
 	return name, nil
 }
 
-func prepareElementValue(name Value) ([]byte, error) {
-	if name == nil {
+func prepareElementValue(value Value) ([]byte, error) {
+	if value == nil {
 		return nil, buildError(
-			momentoerrors.InvalidArgumentError, "element value cannot be nil or empty", nil,
+			momentoerrors.InvalidArgumentError, "element value cannot be nil", nil,
 		)
 	}
 
 	// just validate not empty using prepareName
-	nameBytes := name.asBytes()
-	_, err := prepareName(string(nameBytes), "element value")
+	_, err := prepareName(value.asString(), "element value")
 	if err != nil {
 		return nil, err
 	}
 
-	return nameBytes, nil
+	return value.asBytes(), nil
 }
 
 func prepareCacheName(r hasCacheName) (string, error) {

momento/sorted_set_get_rank.go

@@ -9,9 +9,9 @@ import (
 )
 
 type SortedSetGetRankRequest struct {
-	CacheName    string
-	SetName      string
-	ElementValue Value
+	CacheName string
+	SetName   string
+	Value     Value
 
 	grpcRequest  *pb.XSortedSetGetRankRequest
 	grpcResponse *pb.XSortedSetGetRankResponse
@@ -30,7 +30,7 @@ func (r *SortedSetGetRankRequest) initGrpcRequest(scsDataClient) error {
 	}
 
 	var value []byte
-	if value, err = prepareElementValue(r.ElementValue); err != nil {
+	if value, err = prepareElementValue(r.Value); err != nil {
 		return err
 	}
 
@@ -61,9 +61,7 @@ func (r *SortedSetGetRankRequest) interpretGrpcResponse() error {
 	var resp responses.SortedSetGetRankResponse
 	switch rank := grpcResp.Rank.(type) {
 	case *pb.XSortedSetGetRankResponse_ElementRank:
-		resp = &responses.SortedSetGetRankHit{
-			Rank: rank.ElementRank.Rank,
-		}
+		resp = responses.SortedSetGetRankHit(rank.ElementRank.Rank)
 	case *pb.XSortedSetGetRankResponse_Missing:
 		resp = &responses.SortedSetGetRankMiss{}
 	default:

momento/sorted_set_get_scores.go

@@ -9,9 +9,9 @@ import (
 )
 
 type SortedSetGetScoresRequest struct {
-	CacheName     string
-	SetName       string
-	ElementValues []Value
+	CacheName string
+	SetName   string
+	Values    []Value
 
 	grpcRequest  *pb.XSortedSetGetScoreRequest
 	grpcResponse *pb.XSortedSetGetScoreResponse
@@ -29,7 +29,7 @@ func (r *SortedSetGetScoresRequest) initGrpcRequest(scsDataClient) error {
 		return err
 	}
 
-	values, err := momentoValuesToPrimitiveByteList(r.ElementValues)
+	values, err := momentoValuesToPrimitiveByteList(r.Values)
 	if err != nil {
 		return err
 	}

momento/sorted_set_increment_score.go

@@ -14,11 +14,11 @@ import (
 )
 
 type SortedSetIncrementScoreRequest struct {
-	CacheName    string
-	SetName      string
-	ElementValue Value
-	Amount       float64
-	Ttl          *utils.CollectionTtl
+	CacheName string
+	SetName   string
+	Value     Value
+	Amount    float64
+	Ttl       *utils.CollectionTtl
 
 	grpcRequest  *pb.XSortedSetIncrementRequest
 	grpcResponse *pb.XSortedSetIncrementResponse
@@ -47,7 +47,7 @@ func (r *SortedSetIncrementScoreRequest) initGrpcRequest(client scsDataClient) e
 	}
 
 	var value []byte
-	if value, err = prepareElementValue(r.ElementValue); err != nil {
+	if value, err = prepareElementValue(r.Value); err != nil {
 		return err
 	}
 
@@ -79,8 +79,7 @@ func (r *SortedSetIncrementScoreRequest) makeGrpcRequest(metadata context.Contex
 }
 
 func (r *SortedSetIncrementScoreRequest) interpretGrpcResponse() error {
-	r.response = &responses.SortedSetIncrementScoreSuccess{
-		Value: r.grpcResponse.Score,
-	}
+	r.response = responses.SortedSetIncrementScoreSuccess(r.grpcResponse.Score)
+
 	return nil
 }

momento/sorted_set_remove.go

@@ -2,83 +2,46 @@ package momento
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/momentohq/client-sdk-go/responses"
 
 	pb "github.com/momentohq/client-sdk-go/internal/protos"
 )
 
 type SortedSetRemoveRequest struct {
-	CacheName        string
-	SetName          string
-	ElementsToRemove SortedSetRemoveNumElements
+	CacheName string
+	SetName   string
+	Values    []Value
 
 	grpcRequest  *pb.XSortedSetRemoveRequest
 	grpcResponse *pb.XSortedSetRemoveResponse
 	response     responses.SortedSetRemoveResponse
 }
 
-type SortedSetRemoveRequestElement struct {
-	Name Value
-}
-
-type SortedSetRemoveNumElements interface {
-	isSortedSetRemoveNumElement()
-}
-
-type RemoveAllElements struct{}
-
-func (RemoveAllElements) isSortedSetRemoveNumElement() {}
-
-type RemoveSomeElements struct {
-	Elements []Value
-}
-
-func (RemoveSomeElements) isSortedSetRemoveNumElement() {}
-
 func (r *SortedSetRemoveRequest) cacheName() string { return r.CacheName }
 
 func (r *SortedSetRemoveRequest) requestName() string { return "Sorted set remove" }
 
+func (r *SortedSetRemoveRequest) values() []Value { return r.Values }
+
 func (r *SortedSetRemoveRequest) initGrpcRequest(scsDataClient) error {
 	var err error
 
 	if _, err = prepareName(r.SetName, "Set name"); err != nil {
 		return err
 	}
 
+	var valuesToRemove [][]byte
+	if valuesToRemove, err = prepareValues(r); err != nil {
+		return err
+	}
+
 	grpcReq := &pb.XSortedSetRemoveRequest{
 		SetName: []byte(r.SetName),
 	}
 
-	switch toRemove := r.ElementsToRemove.(type) {
-	case RemoveAllElements:
-		grpcReq.RemoveElements = &pb.XSortedSetRemoveRequest_All{}
-	case *RemoveAllElements:
-		grpcReq.RemoveElements = &pb.XSortedSetRemoveRequest_All{}
-	case RemoveSomeElements:
-		elemToRemove, err := momentoValuesToPrimitiveByteList(toRemove.Elements)
-		if err != nil {
-			return err
-		}
-		grpcReq.RemoveElements = &pb.XSortedSetRemoveRequest_Some{
-			Some: &pb.XSortedSetRemoveRequest_XSome{
-				Values: elemToRemove,
-			},
-		}
-	case *RemoveSomeElements:
-		elemToRemove, err := momentoValuesToPrimitiveByteList(toRemove.Elements)
-		if err != nil {
-			return err
-		}
-		grpcReq.RemoveElements = &pb.XSortedSetRemoveRequest_Some{
-			Some: &pb.XSortedSetRemoveRequest_XSome{
-				Values: elemToRemove,
-			},
-		}
-	default:
-		return fmt.Errorf("%T is an unrecognized type for ElementsToRemove", r.ElementsToRemove)
+	grpcReq.RemoveElements = &pb.XSortedSetRemoveRequest_Some{
+		Some: &pb.XSortedSetRemoveRequest_XSome{Values: valuesToRemove},
 	}
 
 	r.grpcRequest = grpcReq