@@ -777,8 +777,8 @@ int streamDeleteItem(stream *s, streamID *id) {
777
777
* in the standard <ms>-<seq> format, using the simple string protocol
778
778
* of REPL. */
779
779
void addReplyStreamID (client * c , streamID * id ) {
780
- sds replyid = sdscatfmt (sdsempty (),"+ %U-%U\r\n " ,id -> ms ,id -> seq );
781
- addReplySds (c ,replyid );
780
+ sds replyid = sdscatfmt (sdsempty (),"%U-%U" ,id -> ms ,id -> seq );
781
+ addReplyBulkSds (c ,replyid );
782
782
}
783
783
784
784
/* Similar to the above function, but just creates an object, usually useful
@@ -2456,11 +2456,11 @@ NULL
2456
2456
if (idle < 0 ) idle = 0 ;
2457
2457
2458
2458
addReplyMultiBulkLen (c ,6 );
2459
- addReplyStatus (c ,"name" );
2459
+ addReplyBulkCString (c ,"name" );
2460
2460
addReplyBulkCBuffer (c ,consumer -> name ,sdslen (consumer -> name ));
2461
- addReplyStatus (c ,"pending" );
2461
+ addReplyBulkCString (c ,"pending" );
2462
2462
addReplyLongLong (c ,raxSize (consumer -> pel ));
2463
- addReplyStatus (c ,"idle" );
2463
+ addReplyBulkCString (c ,"idle" );
2464
2464
addReplyLongLong (c ,idle );
2465
2465
}
2466
2466
raxStop (& ri );
@@ -2478,28 +2478,28 @@ NULL
2478
2478
while (raxNext (& ri )) {
2479
2479
streamCG * cg = ri .data ;
2480
2480
addReplyMultiBulkLen (c ,8 );
2481
- addReplyStatus (c ,"name" );
2481
+ addReplyBulkCString (c ,"name" );
2482
2482
addReplyBulkCBuffer (c ,ri .key ,ri .key_len );
2483
- addReplyStatus (c ,"consumers" );
2483
+ addReplyBulkCString (c ,"consumers" );
2484
2484
addReplyLongLong (c ,raxSize (cg -> consumers ));
2485
- addReplyStatus (c ,"pending" );
2485
+ addReplyBulkCString (c ,"pending" );
2486
2486
addReplyLongLong (c ,raxSize (cg -> pel ));
2487
- addReplyStatus (c ,"last-delivered-id" );
2487
+ addReplyBulkCString (c ,"last-delivered-id" );
2488
2488
addReplyStreamID (c ,& cg -> last_id );
2489
2489
}
2490
2490
raxStop (& ri );
2491
2491
} else if (!strcasecmp (opt ,"STREAM" ) && c -> argc == 3 ) {
2492
2492
/* XINFO STREAM <key> (or the alias XINFO <key>). */
2493
2493
addReplyMultiBulkLen (c ,14 );
2494
- addReplyStatus (c ,"length" );
2494
+ addReplyBulkCString (c ,"length" );
2495
2495
addReplyLongLong (c ,s -> length );
2496
- addReplyStatus (c ,"radix-tree-keys" );
2496
+ addReplyBulkCString (c ,"radix-tree-keys" );
2497
2497
addReplyLongLong (c ,raxSize (s -> rax ));
2498
- addReplyStatus (c ,"radix-tree-nodes" );
2498
+ addReplyBulkCString (c ,"radix-tree-nodes" );
2499
2499
addReplyLongLong (c ,s -> rax -> numnodes );
2500
- addReplyStatus (c ,"groups" );
2500
+ addReplyBulkCString (c ,"groups" );
2501
2501
addReplyLongLong (c ,s -> cgroups ? raxSize (s -> cgroups ) : 0 );
2502
- addReplyStatus (c ,"last-generated-id" );
2502
+ addReplyBulkCString (c ,"last-generated-id" );
2503
2503
addReplyStreamID (c ,& s -> last_id );
2504
2504
2505
2505
/* To emit the first/last entry we us the streamReplyWithRange()
@@ -2508,11 +2508,11 @@ NULL
2508
2508
streamID start , end ;
2509
2509
start .ms = start .seq = 0 ;
2510
2510
end .ms = end .seq = UINT64_MAX ;
2511
- addReplyStatus (c ,"first-entry" );
2511
+ addReplyBulkCString (c ,"first-entry" );
2512
2512
count = streamReplyWithRange (c ,s ,& start ,& end ,1 ,0 ,NULL ,NULL ,
2513
2513
STREAM_RWR_RAWENTRIES ,NULL );
2514
2514
if (!count ) addReply (c ,shared .nullbulk );
2515
- addReplyStatus (c ,"last-entry" );
2515
+ addReplyBulkCString (c ,"last-entry" );
2516
2516
count = streamReplyWithRange (c ,s ,& start ,& end ,1 ,1 ,NULL ,NULL ,
2517
2517
STREAM_RWR_RAWENTRIES ,NULL );
2518
2518
if (!count ) addReply (c ,shared .nullbulk );
0 commit comments