fixing ornull handler & extracting vars for infinity values

Signed-off-by: TJ Zhang <[email protected]>
valkey-io · Jan 22, 2025 · fc83e0e · fc83e0e
1 parent ed42230
commit fc83e0e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/go/api/response_handlers.go b/go/api/response_handlers.go
@@ -712,7 +712,7 @@ func handleMapOfArrayOfStringArrayResponse(response *C.struct_CommandResponse) (
 }
 
 func handleMapOfArrayOfStringArrayOrNilResponse(response *C.struct_CommandResponse) (map[string][][]string, error) {
-	if response == nil || response.response_type == uint32(C.Null) {
+	if response.response_type == uint32(C.Null) {
 		return nil, nil
 	}
 

diff --git a/go/integTest/shared_commands_test.go b/go/integTest/shared_commands_test.go
@@ -7216,6 +7216,8 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		key := uuid.New().String()
 		key2 := uuid.New().String()
 		stringKey := uuid.New().String()
+		positiveInfinity := options.NewInfiniteStreamBoundary(options.PositiveInfinity)
+		negativeInfinity := options.NewInfiniteStreamBoundary(options.NegativeInfinity)
 
 		// add stream entries
 		streamId1, err := client.XAdd(
@@ -7239,8 +7241,8 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		// get everything from the stream
 		xrangeResult, err := client.XRange(
 			key,
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			negativeInfinity,
+			positiveInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Equal(
@@ -7252,8 +7254,8 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		// get everything from the stream in reverse
 		xrevrangeResult, err := client.XRevRange(
 			key,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			positiveInfinity,
+			negativeInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Equal(
@@ -7265,17 +7267,17 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		// returns empty map if + before -
 		xrangeResult, err = client.XRange(
 			key,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			positiveInfinity,
+			negativeInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrangeResult)
 
 		// rev search returns empty if - before +
 		xrevrangeResult, err = client.XRevRange(
 			key,
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			negativeInfinity,
+			positiveInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrevrangeResult)
@@ -7291,7 +7293,7 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		xrangeResult, err = client.XRangeWithCount(
 			key,
 			options.NewStreamBoundary(streamId2.Value(), false),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			positiveInfinity,
 			1,
 		)
 		assert.NoError(suite.T(), err)
@@ -7304,7 +7306,7 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		// doing the same with rev search
 		xrevrangeResult, err = client.XRevRangeWithCount(
 			key,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			positiveInfinity,
 			options.NewStreamBoundary(streamId2.Value(), false),
 			1,
 		)
@@ -7318,17 +7320,17 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		// both xrange and xrevrange return nil with a zero/negative count
 		xrangeResult, err = client.XRangeWithCount(
 			key,
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			negativeInfinity,
+			positiveInfinity,
 			0,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrangeResult)
 
 		xrevrangeResult, err = client.XRevRangeWithCount(
 			key,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			positiveInfinity,
+			negativeInfinity,
 			-1,
 		)
 		assert.NoError(suite.T(), err)
@@ -7341,33 +7343,33 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 
 		xrangeResult, err = client.XRange(
 			key,
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			negativeInfinity,
+			positiveInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrangeResult)
 
 		xrevrangeResult, err = client.XRevRange(
 			key,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			positiveInfinity,
+			negativeInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrevrangeResult)
 
 		// xrange and xrevrange against a non-existent stream
 		xrangeResult, err = client.XRange(
 			key2,
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			negativeInfinity,
+			positiveInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrangeResult)
 
 		xrevrangeResult, err = client.XRevRange(
 			key2,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			positiveInfinity,
+			negativeInfinity,
 		)
 		assert.NoError(suite.T(), err)
 		assert.Empty(suite.T(), xrevrangeResult)
@@ -7377,16 +7379,16 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		assert.NoError(suite.T(), err)
 		_, err = client.XRange(
 			stringKey,
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			negativeInfinity,
+			positiveInfinity,
 		)
 		assert.Error(suite.T(), err)
 		assert.IsType(suite.T(), &api.RequestError{}, err)
 
 		_, err = client.XRevRange(
 			stringKey,
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			positiveInfinity,
+			negativeInfinity,
 		)
 		assert.Error(suite.T(), err)
 		assert.IsType(suite.T(), &api.RequestError{}, err)
@@ -7395,15 +7397,15 @@ func (suite *GlideTestSuite) TestXRangeAndXRevRange() {
 		_, err = client.XRange(
 			key,
 			options.NewStreamBoundary("invalid-id", false),
-			options.NewInfiniteStreamBoundary(options.PositiveInfinity),
+			positiveInfinity,
 		)
 		assert.Error(suite.T(), err)
 		assert.IsType(suite.T(), &api.RequestError{}, err)
 
 		_, err = client.XRevRange(
 			key,
 			options.NewStreamBoundary("invalid-id", false),
-			options.NewInfiniteStreamBoundary(options.NegativeInfinity),
+			negativeInfinity,
 		)
 		assert.Error(suite.T(), err)
 		assert.IsType(suite.T(), &api.RequestError{}, err)