Skip to content

Commit 6654c27

Browse files
ryan-gangryan-gang
authored
Merge pull request #162 from codecrafters-io/streams-ext-params-quoting
Update parameter quoting in Streams extension
2 parents 84d26d8 + 016c294 commit 6654c27

File tree

7 files changed

+103
-100
lines changed

7 files changed

+103
-100
lines changed

‎internal/test_helpers/fixtures/streams/pass‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Debug = true
22

33
[stage-44] Running tests for Stage #44: xu1
44
[stage-44] $ ./spawn_redis_server.sh
5-
[stage-44] $ redis-cli xadd "pear" "0-1" "temperature 70"
6-
[stage-44] Received response: ""0-1""
5+
[stage-44] $ redis-cli xadd pear 0-1 temperature 70
6+
[stage-44] Received response: "0-1"
77
[stage-44] $ redis-cli xread block 0 streams pear 0-1
8-
[stage-44] $ redis-cli xadd "pear" "0-2" "temperature 70"
9-
[stage-44] Received response: ""0-2""
8+
[stage-44] $ redis-cli xadd pear 0-2 temperature 70
9+
[stage-44] Received response: "0-2"
1010
[stage-44] Received response: "[
1111
[stage-44]  {
1212
[stage-44]  "Stream": "pear",
@@ -26,11 +26,11 @@ Debug = true
2626

2727
[stage-43] Running tests for Stage #43: hw1
2828
[stage-43] $ ./spawn_redis_server.sh
29-
[stage-43] $ redis-cli xadd "raspberry" "0-1" "temperature 74"
30-
[stage-43] Received response: ""0-1""
29+
[stage-43] $ redis-cli xadd raspberry 0-1 temperature 74
30+
[stage-43] Received response: "0-1"
3131
[stage-43] $ redis-cli xread block 0 streams raspberry 0-1
32-
[stage-43] $ redis-cli xadd "raspberry" "0-2" "temperature 74"
33-
[stage-43] Received response: ""0-2""
32+
[stage-43] $ redis-cli xadd raspberry 0-2 temperature 74
33+
[stage-43] Received response: "0-2"
3434
[stage-43] Received response: "[
3535
[stage-43]  {
3636
[stage-43]  "Stream": "raspberry",
@@ -50,11 +50,11 @@ Debug = true
5050

5151
[stage-42] Running tests for Stage #42: bs1
5252
[stage-42] $ ./spawn_redis_server.sh
53-
[stage-42] $ redis-cli xadd "pear" "0-1" "temperature 30"
54-
[stage-42] Received response: ""0-1""
53+
[stage-42] $ redis-cli xadd pear 0-1 temperature 30
54+
[stage-42] Received response: "0-1"
5555
[stage-42] $ redis-cli xread block 1000 streams pear 0-1
56-
[stage-42] $ redis-cli xadd "pear" "0-2" "temperature 30"
57-
[stage-42] Received response: ""0-2""
56+
[stage-42] $ redis-cli xadd pear 0-2 temperature 30
57+
[stage-42] Received response: "0-2"
5858
[stage-42] Received response: "[
5959
[stage-42]  {
6060
[stage-42]  "Stream": "pear",
@@ -76,11 +76,11 @@ Debug = true
7676

7777
[stage-41] Running tests for Stage #41: ru9
7878
[stage-41] $ ./spawn_redis_server.sh
79-
[stage-41] $ redis-cli xadd "blueberry" "0-1" "temperature 24"
80-
[stage-41] Received response: ""0-1""
81-
[stage-41] $ redis-cli xadd "banana" "0-2" "humidity 61"
82-
[stage-41] Received response: ""0-2""
83-
[stage-41] $ redis-cli xread streams "blueberry banana 0-0 0-1"
79+
[stage-41] $ redis-cli xadd blueberry 0-1 temperature 24
80+
[stage-41] Received response: "0-1"
81+
[stage-41] $ redis-cli xadd banana 0-2 humidity 61
82+
[stage-41] Received response: "0-2"
83+
[stage-41] $ redis-cli xread streams blueberry banana 0-0 0-1
8484
[stage-41] Received response: "[
8585
[stage-41]  {
8686
[stage-41]  "Stream": "blueberry",
@@ -111,9 +111,9 @@ Debug = true
111111

112112
[stage-40] Running tests for Stage #40: um0
113113
[stage-40] $ ./spawn_redis_server.sh
114-
[stage-40] $ redis-cli xadd "grape" "0-1" "temperature 54"
115-
[stage-40] Received response: ""0-1""
116-
[stage-40] $ redis-cli xread streams "grape 0-0"
114+
[stage-40] $ redis-cli xadd grape 0-1 temperature 54
115+
[stage-40] Received response: "0-1"
116+
[stage-40] $ redis-cli xread streams grape 0-0
117117
[stage-40] Received response: "[
118118
[stage-40]  {
119119
[stage-40]  "Stream": "grape",
@@ -133,13 +133,13 @@ Debug = true
133133

134134
[stage-39] Running tests for Stage #39: fs1
135135
[stage-39] $ ./spawn_redis_server.sh
136-
[stage-39] $ redis-cli xadd "apple" "0-1" "foo bar"
137-
[stage-39] Received response: ""0-1""
138-
[stage-39] $ redis-cli xadd "apple" "0-2" "foo bar"
139-
[stage-39] Received response: ""0-2""
140-
[stage-39] $ redis-cli xadd "apple" "0-3" "foo bar"
141-
[stage-39] Received response: ""0-3""
142-
[stage-39] $ redis-cli xrange "apple" 0-2 +
136+
[stage-39] $ redis-cli xadd apple 0-1 foo bar
137+
[stage-39] Received response: "0-1"
138+
[stage-39] $ redis-cli xadd apple 0-2 foo bar
139+
[stage-39] Received response: "0-2"
140+
[stage-39] $ redis-cli xadd apple 0-3 foo bar
141+
[stage-39] Received response: "0-3"
142+
[stage-39] $ redis-cli xrange apple 0-2 +
143143
[stage-39] Received response: "[
144144
[stage-39]  {
145145
[stage-39]  "ID": "0-2",
@@ -160,13 +160,13 @@ Debug = true
160160

161161
[stage-38] Running tests for Stage #38: yp1
162162
[stage-38] $ ./spawn_redis_server.sh
163-
[stage-38] $ redis-cli xadd "banana" "0-1" "foo bar"
164-
[stage-38] Received response: ""0-1""
165-
[stage-38] $ redis-cli xadd "banana" "0-2" "foo bar"
166-
[stage-38] Received response: ""0-2""
167-
[stage-38] $ redis-cli xadd "banana" "0-3" "foo bar"
168-
[stage-38] Received response: ""0-3""
169-
[stage-38] $ redis-cli xrange "banana" - "0-2"
163+
[stage-38] $ redis-cli xadd banana 0-1 foo bar
164+
[stage-38] Received response: "0-1"
165+
[stage-38] $ redis-cli xadd banana 0-2 foo bar
166+
[stage-38] Received response: "0-2"
167+
[stage-38] $ redis-cli xadd banana 0-3 foo bar
168+
[stage-38] Received response: "0-3"
169+
[stage-38] $ redis-cli xrange banana - 0-2
170170
[stage-38] Received response: "[
171171
[stage-38]  {
172172
[stage-38]  "ID": "0-1",
@@ -187,13 +187,13 @@ Debug = true
187187

188188
[stage-37] Running tests for Stage #37: zx1
189189
[stage-37] $ ./spawn_redis_server.sh
190-
[stage-37] $ redis-cli xadd "grape" "0-1" "foo bar"
191-
[stage-37] Received response: ""0-1""
192-
[stage-37] $ redis-cli xadd "grape" "0-2" "foo bar"
193-
[stage-37] Received response: ""0-2""
194-
[stage-37] $ redis-cli xadd "grape" "0-3" "foo bar"
195-
[stage-37] Received response: ""0-3""
196-
[stage-37] $ redis-cli xrange "grape" 0-2 "0-3"
190+
[stage-37] $ redis-cli xadd grape 0-1 foo bar
191+
[stage-37] Received response: "0-1"
192+
[stage-37] $ redis-cli xadd grape 0-2 foo bar
193+
[stage-37] Received response: "0-2"
194+
[stage-37] $ redis-cli xadd grape 0-3 foo bar
195+
[stage-37] Received response: "0-3"
196+
[stage-37] $ redis-cli xrange grape 0-2 0-3
197197
[stage-37] Received response: "[
198198
[stage-37]  {
199199
[stage-37]  "ID": "0-2",

‎internal/test_helpers/fixtures/transactions/pass‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,11 @@ Debug = true
369369

370370
[stage-44] Running tests for Stage #44: xu1
371371
[stage-44] $ ./spawn_redis_server.sh
372-
[stage-44] $ redis-cli xadd "apple" "0-1" "temperature 10"
373-
[stage-44] Received response: ""0-1""
372+
[stage-44] $ redis-cli xadd apple 0-1 temperature 10
373+
[stage-44] Received response: "0-1"
374374
[stage-44] $ redis-cli xread block 0 streams apple 0-1
375-
[stage-44] $ redis-cli xadd "apple" "0-2" "temperature 10"
376-
[stage-44] Received response: ""0-2""
375+
[stage-44] $ redis-cli xadd apple 0-2 temperature 10
376+
[stage-44] Received response: "0-2"
377377
[stage-44] Received response: "[
378378
[stage-44]  {
379379
[stage-44]  "Stream": "apple",
@@ -393,11 +393,11 @@ Debug = true
393393

394394
[stage-43] Running tests for Stage #43: hw1
395395
[stage-43] $ ./spawn_redis_server.sh
396-
[stage-43] $ redis-cli xadd "banana" "0-1" "temperature 91"
397-
[stage-43] Received response: ""0-1""
396+
[stage-43] $ redis-cli xadd banana 0-1 temperature 91
397+
[stage-43] Received response: "0-1"
398398
[stage-43] $ redis-cli xread block 0 streams banana 0-1
399-
[stage-43] $ redis-cli xadd "banana" "0-2" "temperature 91"
400-
[stage-43] Received response: ""0-2""
399+
[stage-43] $ redis-cli xadd banana 0-2 temperature 91
400+
[stage-43] Received response: "0-2"
401401
[stage-43] Received response: "[
402402
[stage-43]  {
403403
[stage-43]  "Stream": "banana",
@@ -417,11 +417,11 @@ Debug = true
417417

418418
[stage-42] Running tests for Stage #42: bs1
419419
[stage-42] $ ./spawn_redis_server.sh
420-
[stage-42] $ redis-cli xadd "orange" "0-1" "temperature 2"
421-
[stage-42] Received response: ""0-1""
420+
[stage-42] $ redis-cli xadd orange 0-1 temperature 2
421+
[stage-42] Received response: "0-1"
422422
[stage-42] $ redis-cli xread block 1000 streams orange 0-1
423-
[stage-42] $ redis-cli xadd "orange" "0-2" "temperature 2"
424-
[stage-42] Received response: ""0-2""
423+
[stage-42] $ redis-cli xadd orange 0-2 temperature 2
424+
[stage-42] Received response: "0-2"
425425
[stage-42] Received response: "[
426426
[stage-42]  {
427427
[stage-42]  "Stream": "orange",
@@ -443,11 +443,11 @@ Debug = true
443443

444444
[stage-41] Running tests for Stage #41: ru9
445445
[stage-41] $ ./spawn_redis_server.sh
446-
[stage-41] $ redis-cli xadd "pineapple" "0-1" "temperature 99"
447-
[stage-41] Received response: ""0-1""
448-
[stage-41] $ redis-cli xadd "orange" "0-2" "humidity 37"
449-
[stage-41] Received response: ""0-2""
450-
[stage-41] $ redis-cli xread streams "pineapple orange 0-0 0-1"
446+
[stage-41] $ redis-cli xadd pineapple 0-1 temperature 99
447+
[stage-41] Received response: "0-1"
448+
[stage-41] $ redis-cli xadd orange 0-2 humidity 37
449+
[stage-41] Received response: "0-2"
450+
[stage-41] $ redis-cli xread streams pineapple orange 0-0 0-1
451451
[stage-41] Received response: "[
452452
[stage-41]  {
453453
[stage-41]  "Stream": "pineapple",
@@ -478,9 +478,9 @@ Debug = true
478478

479479
[stage-40] Running tests for Stage #40: um0
480480
[stage-40] $ ./spawn_redis_server.sh
481-
[stage-40] $ redis-cli xadd "apple" "0-1" "temperature 88"
482-
[stage-40] Received response: ""0-1""
483-
[stage-40] $ redis-cli xread streams "apple 0-0"
481+
[stage-40] $ redis-cli xadd apple 0-1 temperature 88
482+
[stage-40] Received response: "0-1"
483+
[stage-40] $ redis-cli xread streams apple 0-0
484484
[stage-40] Received response: "[
485485
[stage-40]  {
486486
[stage-40]  "Stream": "apple",
@@ -500,15 +500,15 @@ Debug = true
500500

501501
[stage-39] Running tests for Stage #39: fs1
502502
[stage-39] $ ./spawn_redis_server.sh
503-
[stage-39] $ redis-cli xadd "apple" "0-1" "foo bar"
504-
[stage-39] Received response: ""0-1""
505-
[stage-39] $ redis-cli xadd "apple" "0-2" "foo bar"
506-
[stage-39] Received response: ""0-2""
507-
[stage-39] $ redis-cli xadd "apple" "0-3" "foo bar"
508-
[stage-39] Received response: ""0-3""
509-
[stage-39] $ redis-cli xadd "apple" "0-4" "foo bar"
510-
[stage-39] Received response: ""0-4""
511-
[stage-39] $ redis-cli xrange "apple" 0-2 +
503+
[stage-39] $ redis-cli xadd apple 0-1 foo bar
504+
[stage-39] Received response: "0-1"
505+
[stage-39] $ redis-cli xadd apple 0-2 foo bar
506+
[stage-39] Received response: "0-2"
507+
[stage-39] $ redis-cli xadd apple 0-3 foo bar
508+
[stage-39] Received response: "0-3"
509+
[stage-39] $ redis-cli xadd apple 0-4 foo bar
510+
[stage-39] Received response: "0-4"
511+
[stage-39] $ redis-cli xrange apple 0-2 +
512512
[stage-39] Received response: "[
513513
[stage-39]  {
514514
[stage-39]  "ID": "0-2",
@@ -535,15 +535,15 @@ Debug = true
535535

536536
[stage-38] Running tests for Stage #38: yp1
537537
[stage-38] $ ./spawn_redis_server.sh
538-
[stage-38] $ redis-cli xadd "blueberry" "0-1" "foo bar"
539-
[stage-38] Received response: ""0-1""
540-
[stage-38] $ redis-cli xadd "blueberry" "0-2" "foo bar"
541-
[stage-38] Received response: ""0-2""
542-
[stage-38] $ redis-cli xadd "blueberry" "0-3" "foo bar"
543-
[stage-38] Received response: ""0-3""
544-
[stage-38] $ redis-cli xadd "blueberry" "0-4" "foo bar"
545-
[stage-38] Received response: ""0-4""
546-
[stage-38] $ redis-cli xrange "blueberry" - "0-3"
538+
[stage-38] $ redis-cli xadd blueberry 0-1 foo bar
539+
[stage-38] Received response: "0-1"
540+
[stage-38] $ redis-cli xadd blueberry 0-2 foo bar
541+
[stage-38] Received response: "0-2"
542+
[stage-38] $ redis-cli xadd blueberry 0-3 foo bar
543+
[stage-38] Received response: "0-3"
544+
[stage-38] $ redis-cli xadd blueberry 0-4 foo bar
545+
[stage-38] Received response: "0-4"
546+
[stage-38] $ redis-cli xrange blueberry - 0-3
547547
[stage-38] Received response: "[
548548
[stage-38]  {
549549
[stage-38]  "ID": "0-1",
@@ -570,15 +570,15 @@ Debug = true
570570

571571
[stage-37] Running tests for Stage #37: zx1
572572
[stage-37] $ ./spawn_redis_server.sh
573-
[stage-37] $ redis-cli xadd "grape" "0-1" "foo bar"
574-
[stage-37] Received response: ""0-1""
575-
[stage-37] $ redis-cli xadd "grape" "0-2" "foo bar"
576-
[stage-37] Received response: ""0-2""
577-
[stage-37] $ redis-cli xadd "grape" "0-3" "foo bar"
578-
[stage-37] Received response: ""0-3""
579-
[stage-37] $ redis-cli xadd "grape" "0-4" "foo bar"
580-
[stage-37] Received response: ""0-4""
581-
[stage-37] $ redis-cli xrange "grape" 0-2 "0-4"
573+
[stage-37] $ redis-cli xadd grape 0-1 foo bar
574+
[stage-37] Received response: "0-1"
575+
[stage-37] $ redis-cli xadd grape 0-2 foo bar
576+
[stage-37] Received response: "0-2"
577+
[stage-37] $ redis-cli xadd grape 0-3 foo bar
578+
[stage-37] Received response: "0-3"
579+
[stage-37] $ redis-cli xadd grape 0-4 foo bar
580+
[stage-37] Received response: "0-4"
581+
[stage-37] $ redis-cli xrange grape 0-2 0-4
582582
[stage-37] Received response: "[
583583
[stage-37]  {
584584
[stage-37]  "ID": "0-2",

‎internal/test_streams_xadd.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (t *XADDTest) Run(client *redis.Client, logger *logger.Logger) error {
3030
values = append(values, key, fmt.Sprintf("%v", value))
3131
}
3232

33-
logger.Infof("$ redis-cli xadd %q %q %q", t.streamKey, t.id, strings.Join(values, " "))
33+
logger.Infof("$ redis-cli xadd %v %v %v", t.streamKey, t.id, strings.Join(values, " "))
3434

3535
resp, err := client.XAdd(&redis.XAddArgs{
3636
Stream: t.streamKey,
@@ -48,18 +48,18 @@ func (t *XADDTest) Run(client *redis.Client, logger *logger.Logger) error {
4848
return fmt.Errorf("Expected %q, got %q", t.expectedError, err.Error())
4949
}
5050

51-
logger.Successf("Received error: \"%q\"", err.Error())
51+
logger.Successf("Received error: %q", err.Error())
5252
return nil
5353
}
5454

5555
if resp != t.expectedResponse && t.expectedError != "" {
56-
logger.Infof("Received response: \"%q\"", resp)
56+
logger.Infof("Received response: %q", resp)
5757
return fmt.Errorf("Expected an error as the response, got %q", resp)
5858
} else if resp != t.expectedResponse {
59-
logger.Infof("Received response: \"%q\"", resp)
59+
logger.Infof("Received response: %q", resp)
6060
return fmt.Errorf("Expected %q, got %q", t.expectedResponse, resp)
6161
} else {
62-
logger.Successf("Received response: \"%q\"", resp)
62+
logger.Successf("Received response: %q", resp)
6363
}
6464

6565
return nil

‎internal/test_streams_xrange.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package internal
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
76
"reflect"
87
"strconv"
98

9+
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
10+
1011
testerutils_random "github.com/codecrafters-io/tester-utils/random"
1112
"github.com/codecrafters-io/tester-utils/test_case_harness"
1213
"github.com/go-redis/redis"
@@ -55,7 +56,7 @@ func testStreamsXrange(stageHarness *test_case_harness.TestCaseHarness) error {
5556
maxID := "0-" + strconv.Itoa(randomNumber)
5657
expectedResp = expectedResp[1:]
5758

58-
logger.Infof("$ redis-cli xrange %q 0-2 %q", randomKey, maxID)
59+
logger.Infof("$ redis-cli xrange %v 0-2 %v", randomKey, maxID)
5960
resp, err := client.XRange(randomKey, "0-2", maxID).Result()
6061

6162
if err != nil {

‎internal/test_streams_xrange_max_id.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package internal
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
76
"reflect"
87
"strconv"
98

9+
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
10+
1011
testerutils_random "github.com/codecrafters-io/tester-utils/random"
1112
"github.com/codecrafters-io/tester-utils/test_case_harness"
1213
"github.com/go-redis/redis"
@@ -56,7 +57,7 @@ func testStreamsXrangeMaxID(stageHarness *test_case_harness.TestCaseHarness) err
5657
})
5758
}
5859

59-
logger.Infof("$ redis-cli xrange %q 0-2 +", randomKey)
60+
logger.Infof("$ redis-cli xrange %v 0-2 +", randomKey)
6061
resp, err := client.XRange(randomKey, "0-2", "+").Result()
6162

6263
if err != nil {

‎internal/test_streams_xrange_min_id.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package internal
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
76
"reflect"
87
"strconv"
98

9+
"github.com/codecrafters-io/redis-tester/internal/redis_executable"
10+
1011
testerutils_random "github.com/codecrafters-io/tester-utils/random"
1112
"github.com/codecrafters-io/tester-utils/test_case_harness"
1213
"github.com/go-redis/redis"
@@ -58,7 +59,7 @@ func testStreamsXrangeMinID(stageHarness *test_case_harness.TestCaseHarness) err
5859
})
5960
}
6061

61-
logger.Infof("$ redis-cli xrange %q - %q", randomKey, maxID)
62+
logger.Infof("$ redis-cli xrange %v - %v", randomKey, maxID)
6263
resp, err := client.XRange(randomKey, "-", maxID).Result()
6364

6465
if err != nil {

0 commit comments

Comments
 (0)