let Sorted.Search.Order return values and scores together (#13)

xh3b4sd · Oct 10, 2023 · 340d865 · 340d865
1 parent 2f90402
commit 340d865
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/pkg/conformance/client_single_sorted_test.go b/pkg/conformance/client_single_sorted_test.go
@@ -1358,14 +1358,20 @@ func Test_Client_Single_Sorted_Search_Order(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if len(res) != 2 {
-			t.Fatal("expected", 2, "got", len(res))
+		if len(res) != 4 {
+			t.Fatal("expected", 4, "got", len(res))
 		}
-		if res[0] != "6" {
-			t.Fatal("expected", "6", "got", res[0])
+		if res[0] != "foo" {
+			t.Fatal("expected", "foo", "got", res[0])
+		}
+		if res[1] != "6" {
+			t.Fatal("expected", "6", "got", res[1])
 		}
-		if res[1] != "7" {
-			t.Fatal("expected", "7", "got", res[1])
+		if res[2] != "bar" {
+			t.Fatal("expected", "bar", "got", res[2])
+		}
+		if res[3] != "7" {
+			t.Fatal("expected", "7", "got", res[3])
 		}
 	}
 
@@ -1394,11 +1400,14 @@ func Test_Client_Single_Sorted_Search_Order(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if len(res) != 1 {
-			t.Fatal("expected", 1, "got", len(res))
+		if len(res) != 2 {
+			t.Fatal("expected", 2, "got", len(res))
+		}
+		if res[0] != "foo" {
+			t.Fatal("expected", "foo", "got", res[0])
 		}
-		if res[0] != "6" {
-			t.Fatal("expected", "6", "got", res[0])
+		if res[1] != "6" {
+			t.Fatal("expected", "6", "got", res[1])
 		}
 	}
 

diff --git a/pkg/sorted/interface.go b/pkg/sorted/interface.go
@@ -120,8 +120,8 @@ type Search interface {
 	// Order returns the values of the sorted set elements stored under key. The
 	// provided pointers are ranks of the elements' scores within the sorted set.
 	// All values udner key can be returned using lef=0 and rig=-1. Optionally a
-	// single bool is allowed to be passed for returning the element scores
-	// instead of their values as described by WITHSCORES.
+	// single bool is allowed to be passed for additionally returning the element
+	// scores together with their values as described by WITHSCORES.
 	//
 	//     https://redis.io/commands/zrange
 	//

diff --git a/pkg/sorted/search.go b/pkg/sorted/search.go
@@ -103,16 +103,7 @@ func (s *search) Order(key string, lef int, rig int, sco ...bool) ([]string, err
 		return nil, tracer.Mask(err)
 	}
 
-	if len(sco) == 0 {
-		return res, nil
-	}
-
-	var lis []string
-	for i := 1; i < len(res); i += 2 {
-		lis = append(lis, res[i])
-	}
-
-	return lis, nil
+	return res, nil
 }
 
 func (s *search) Rando(key string, cou ...uint) ([]string, error) {