Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
d7826178
Commit
d7826178
authored
Nov 22, 2019
by
zhujiashun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redis_server_protocol: change user interface && support multi
parent
801bb1f8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
357 additions
and
142 deletions
+357
-142
redis_protocol.cpp
src/brpc/policy/redis_protocol.cpp
+126
-29
redis.cpp
src/brpc/redis.cpp
+16
-0
redis.h
src/brpc/redis.h
+31
-16
redis_command.cpp
src/brpc/redis_command.cpp
+0
-34
redis_command.h
src/brpc/redis_command.h
+35
-0
redis_message.cpp
src/brpc/redis_message.cpp
+2
-4
redis_message.h
src/brpc/redis_message.h
+2
-0
brpc_redis_unittest.cpp
test/brpc_redis_unittest.cpp
+145
-59
No files found.
src/brpc/policy/redis_protocol.cpp
View file @
d7826178
...
...
@@ -16,7 +16,9 @@
// under the License.
// Authors: Ge,Jun (gejun@baidu.com)
// Jiashun Zhu(zhujiashun2010@gmail.com)
#include <queue>
#include <google/protobuf/descriptor.h> // MethodDescriptor
#include <google/protobuf/message.h> // Message
#include <gflags/gflags.h>
...
...
@@ -30,6 +32,7 @@
#include "brpc/details/server_private_accessor.h"
#include "brpc/span.h"
#include "brpc/redis.h"
#include "brpc/redis_command.h"
#include "brpc/policy/redis_protocol.h"
#include "bthread/execution_queue.h"
...
...
@@ -53,29 +56,128 @@ struct InputResponse : public InputMessageBase {
}
};
struct
ExecutionQueueContext
{
RedisMessage
message
;
struct
QueueMeta
{
SocketId
socket_id
;
RedisService
::
CommandMap
command_map
;
RedisCommandHandler
*
handler_continue
;
// queue to buffer commands and execute these commands together and atomicly
// used to implement command like 'MULTI'.
std
::
queue
<
RedisMessage
>
command_queue
;
// used to allocate memory for queued command;
butil
::
Arena
arena
;
// command that trigger commands to execute atomicly.
std
::
string
queue_command_name
;
QueueMeta
()
:
handler_continue
(
NULL
)
{}
};
struct
TaskContext
{
RedisMessage
message
;
butil
::
Arena
arena
;
};
int
Consume
(
void
*
meta
,
bthread
::
TaskIterator
<
ExecutionQueueContext
*>&
iter
)
{
RedisConnection
*
conn
=
static_cast
<
RedisConnection
*>
(
meta
);
void
ConsumeTask
(
QueueMeta
*
meta
,
const
RedisMessage
&
m
,
butil
::
Arena
*
arena
,
butil
::
IOBuf
*
sendbuf
)
{
RedisMessage
output
;
char
buf
[
64
];
do
{
std
::
vector
<
const
char
*>
args
;
args
.
reserve
(
7
);
bool
args_parsed
=
true
;
for
(
size_t
i
=
0
;
i
<
m
.
size
();
++
i
)
{
if
(
!
m
[
i
].
is_string
())
{
output
.
set_error
(
"ERR command not string"
,
arena
);
args_parsed
=
false
;
break
;
}
args
.
push_back
(
m
[
i
].
c_str
());
}
if
(
!
args_parsed
)
{
break
;
}
std
::
string
comm
;
comm
.
reserve
(
8
);
for
(
const
char
*
c
=
m
[
0
].
c_str
();
*
c
;
++
c
)
{
comm
.
push_back
(
std
::
tolower
(
*
c
));
}
if
(
meta
->
handler_continue
)
{
RedisCommandResult
result
=
meta
->
handler_continue
->
Run
(
args
,
&
output
,
arena
);
if
(
result
==
REDIS_COMMAND_CONTINUE
)
{
if
(
comm
==
meta
->
queue_command_name
)
{
snprintf
(
buf
,
sizeof
(
buf
),
"ERR %s calls can not be nested"
,
comm
.
c_str
());
output
.
set_error
(
buf
,
arena
);
break
;
}
meta
->
command_queue
.
emplace
();
RedisMessage
&
last
=
meta
->
command_queue
.
back
();
last
.
CopyFromDifferentArena
(
m
,
&
meta
->
arena
);
output
.
set_status
(
"QUEUED"
,
arena
);
}
else
if
(
result
==
REDIS_COMMAND_OK
)
{
meta
->
handler_continue
=
NULL
;
meta
->
queue_command_name
.
clear
();
butil
::
IOBuf
nocountbuf
;
int
array_count
=
meta
->
command_queue
.
size
();
while
(
!
meta
->
command_queue
.
empty
())
{
RedisMessage
&
front
=
meta
->
command_queue
.
front
();
meta
->
command_queue
.
pop
();
ConsumeTask
(
meta
,
front
,
arena
,
&
nocountbuf
);
}
AppendHeader
(
*
sendbuf
,
'*'
,
array_count
);
sendbuf
->
append
(
nocountbuf
);
return
;
}
else
if
(
result
==
REDIS_COMMAND_ERROR
)
{
if
(
!
output
.
is_error
())
{
output
.
set_error
(
"internal server error"
,
arena
);
}
}
else
{
meta
->
handler_continue
=
NULL
;
LOG
(
ERROR
)
<<
"unknown redis command result="
<<
result
;
output
.
set_error
(
"internal server error"
,
arena
);
}
break
;
}
auto
it
=
meta
->
command_map
.
find
(
comm
);
if
(
it
==
meta
->
command_map
.
end
())
{
snprintf
(
buf
,
sizeof
(
buf
),
"ERR unknown command `%s`"
,
comm
.
c_str
());
output
.
set_error
(
buf
,
arena
);
break
;
}
RedisCommandResult
result
=
it
->
second
->
Run
(
args
,
&
output
,
arena
);
if
(
result
==
REDIS_COMMAND_CONTINUE
)
{
// First command that return REDIS_COMMAND_CONTINUE should not be pushed
// into queue, since it is always a marker.
meta
->
handler_continue
=
it
->
second
.
get
();
meta
->
queue_command_name
=
comm
;
output
.
set_status
(
"OK"
,
arena
);
}
else
if
(
result
==
REDIS_COMMAND_ERROR
)
{
if
(
!
output
.
is_error
())
{
output
.
set_error
(
"internal server error"
,
arena
);
}
}
else
if
(
result
!=
REDIS_COMMAND_OK
)
{
LOG
(
ERROR
)
<<
"unknown redis command result="
<<
result
;
}
}
while
(
0
);
output
.
SerializeToIOBuf
(
sendbuf
);
}
int
Consume
(
void
*
meta
,
bthread
::
TaskIterator
<
TaskContext
*>&
iter
)
{
QueueMeta
*
qmeta
=
static_cast
<
QueueMeta
*>
(
meta
);
if
(
iter
.
is_queue_stopped
())
{
delete
conn
;
delete
qmeta
;
return
0
;
}
SocketUniquePtr
s
;
bool
has_err
=
false
;
if
(
Socket
::
Address
(
qmeta
->
socket_id
,
&
s
)
!=
0
)
{
LOG
(
WARNING
)
<<
"Fail to address redis socket"
;
has_err
=
true
;
}
for
(;
iter
;
++
iter
)
{
std
::
unique_ptr
<
ExecutionQueueContext
>
ctx
(
*
iter
);
SocketUniquePtr
s
;
if
(
Socket
::
Address
(
ctx
->
socket_id
,
&
s
)
!=
0
)
{
LOG
(
WARNING
)
<<
"Fail to address redis socket"
;
std
::
unique_ptr
<
TaskContext
>
ctx
(
*
iter
);
if
(
has_err
)
{
continue
;
}
RedisMessage
output
;
conn
->
OnRedisMessage
(
ctx
->
message
,
&
output
,
&
ctx
->
arena
);
butil
::
IOBuf
sendbuf
;
output
.
SerializeToIOBuf
(
&
sendbuf
);
ConsumeTask
(
qmeta
,
ctx
->
message
,
&
ctx
->
arena
,
&
sendbuf
);
Socket
::
WriteOptions
wopt
;
wopt
.
ignore_eovercrowded
=
true
;
LOG_IF
(
WARNING
,
s
->
Write
(
&
sendbuf
,
&
wopt
)
!=
0
)
...
...
@@ -93,18 +195,18 @@ public:
// @Destroyable
void
Destroy
()
{
delete
this
;
}
int
init
(
RedisConnection
*
conn
)
{
int
init
(
QueueMeta
*
meta
)
{
bthread
::
ExecutionQueueOptions
q_opt
;
q_opt
.
bthread_attr
=
FLAGS_usercode_in_pthread
?
BTHREAD_ATTR_PTHREAD
:
BTHREAD_ATTR_NORMAL
;
if
(
bthread
::
execution_queue_start
(
&
queue
,
&
q_opt
,
Consume
,
conn
)
!=
0
)
{
if
(
bthread
::
execution_queue_start
(
&
queue
,
&
q_opt
,
Consume
,
meta
)
!=
0
)
{
LOG
(
ERROR
)
<<
"Fail to start execution queue"
;
return
-
1
;
}
return
0
;
}
bthread
::
ExecutionQueueId
<
ExecutionQueue
Context
*>
queue
;
bthread
::
ExecutionQueueId
<
Task
Context
*>
queue
;
};
ParseResult
ParseRedisMessage
(
butil
::
IOBuf
*
source
,
Socket
*
socket
,
...
...
@@ -120,33 +222,28 @@ ParseResult ParseRedisMessage(butil::IOBuf* source, Socket* socket,
}
ServerContext
*
ctx
=
static_cast
<
ServerContext
*>
(
socket
->
parsing_context
());
if
(
ctx
==
NULL
)
{
RedisConnection
*
conn
=
rs
->
NewConnection
();
if
(
!
conn
)
{
LOG
(
ERROR
)
<<
"Fail to new redis connection from redis service"
;
return
MakeParseError
(
PARSE_ERROR_TRY_OTHERS
);
}
QueueMeta
*
meta
=
new
QueueMeta
;
meta
->
socket_id
=
socket
->
id
();
rs
->
CloneCommandMap
(
&
meta
->
command_map
);
ctx
=
new
ServerContext
;
if
(
ctx
->
init
(
conn
)
!=
0
)
{
delete
conn
;
if
(
ctx
->
init
(
meta
)
!=
0
)
{
delete
ctx
;
delete
meta
;
LOG
(
ERROR
)
<<
"Fail to init redis ServerContext"
;
return
MakeParseError
(
PARSE_ERROR_NO_RESOURCE
);
}
socket
->
reset_parsing_context
(
ctx
);
}
std
::
unique_ptr
<
ExecutionQueueContext
>
task
(
new
ExecutionQueueContext
);
RedisMessage
message
;
ParseError
err
=
message
.
ConsumePartialIOBuf
(
*
source
,
&
task
->
arena
);
std
::
unique_ptr
<
TaskContext
>
task_ctx
(
new
TaskContext
);
ParseError
err
=
task_ctx
->
message
.
ConsumePartialIOBuf
(
*
source
,
&
task_ctx
->
arena
);
if
(
err
!=
PARSE_OK
)
{
return
MakeParseError
(
err
);
}
task
->
message
.
Swap
(
message
);
task
->
socket_id
=
socket
->
id
();
if
(
bthread
::
execution_queue_execute
(
ctx
->
queue
,
task
.
get
())
!=
0
)
{
if
(
bthread
::
execution_queue_execute
(
ctx
->
queue
,
task_ctx
.
get
())
!=
0
)
{
LOG
(
ERROR
)
<<
"Fail to push execution queue"
;
return
MakeParseError
(
PARSE_ERROR_NO_RESOURCE
);
}
task
.
release
();
task
_ctx
.
release
();
return
MakeMessage
(
NULL
);
}
else
{
// NOTE(gejun): PopPipelinedInfo() is actually more contended than what
...
...
src/brpc/redis.cpp
View file @
d7826178
...
...
@@ -435,5 +435,21 @@ std::ostream& operator<<(std::ostream& os, const RedisResponse& response) {
}
return
os
;
}
bool
RedisService
::
AddHandler
(
const
std
::
string
&
name
,
RedisCommandHandler
*
handler
)
{
std
::
string
lcname
;
lcname
.
reserve
(
name
.
size
());
for
(
auto
c
:
name
)
{
lcname
.
push_back
(
std
::
tolower
(
c
));
}
_command_map
[
lcname
].
reset
(
handler
);
return
true
;
}
void
RedisService
::
CloneCommandMap
(
CommandMap
*
map
)
{
for
(
auto
it
:
_command_map
)
{
(
*
map
)[
it
.
first
].
reset
(
it
.
second
->
New
());
}
}
}
// namespace brpc
src/brpc/redis.h
View file @
d7826178
...
...
@@ -208,29 +208,44 @@ private:
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
RedisRequest
&
);
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
RedisResponse
&
);
class
RedisConnection
;
// Implement this class and assign an instance to ServerOption.redis_service
// to enable redis support. The return type of NewConnection(), which is
// RedisConnection, should also be implemented by users.
class
RedisService
{
public
:
virtual
~
RedisService
()
{}
virtual
RedisConnection
*
NewConnection
()
=
0
;
enum
RedisCommandResult
{
REDIS_COMMAND_OK
=
0
,
REDIS_COMMAND_CONTINUE
=
1
,
REDIS_COMMAND_ERROR
=
2
,
};
// Implement this class and make RedisServiceImpl::NewConnection return the
// implemented class. Notice that one TCP connection corresponds to one RedisConnection
// instance, and for the same TCP connection, OnRedisMessage is called sequentially.
// But OnRedisMessage are called concurrently between different TCP connections.
// Read src/brpc/redis_message.h to get the idea how to read and write RedisMessage.
class
RedisConnection
{
// The handler for a redis command. Run() and New() should be implemented
// by user. For Run(), `args` is the redis command argument. For example,
// "set foo bar" corresponds to args[0] == "set", args[1] == "foo" and
// args[2] == "bar". `output` is the content that sent to client side,
// which should be set by user. Read brpc/src/redis_message.h for more usage.
// `arena` is the memory arena that `output` would use.
// For New(), whenever a tcp connection is established, all handlers would
// be cloned and brpc makes sure that all requests of the same command name
// from one connection would be sent to the same command handler. All requests
// in one connection are executed sequentially, just like what redis-server does.
class
RedisCommandHandler
{
public
:
virtual
~
RedisConnection
()
{}
virtual
void
OnRedisMessage
(
const
RedisMessage
&
message
,
~
RedisCommandHandler
()
{}
virtual
RedisCommandResult
Run
(
const
std
::
vector
<
const
char
*>&
args
,
RedisMessage
*
output
,
butil
::
Arena
*
arena
)
=
0
;
virtual
RedisCommandHandler
*
New
()
=
0
;
};
// Implement this class and assign an instance to ServerOption.redis_service
// to enable redis support. To support a particular command, you should implement
// the corresponding handler and call AddHandler to install it.
class
RedisService
{
public
:
typedef
std
::
unordered_map
<
std
::
string
,
std
::
shared_ptr
<
RedisCommandHandler
>>
CommandMap
;
virtual
~
RedisService
()
{}
bool
AddHandler
(
const
std
::
string
&
name
,
RedisCommandHandler
*
handler
);
void
CloneCommandMap
(
CommandMap
*
map
);
private
:
CommandMap
_command_map
;
};
}
// namespace brpc
...
...
src/brpc/redis_command.cpp
View file @
d7826178
...
...
@@ -28,40 +28,6 @@ namespace brpc {
const
size_t
CTX_WIDTH
=
5
;
// Much faster than snprintf(..., "%lu", d);
inline
size_t
AppendDecimal
(
char
*
outbuf
,
unsigned
long
d
)
{
char
buf
[
24
];
// enough for decimal 64-bit integers
size_t
n
=
sizeof
(
buf
);
do
{
const
unsigned
long
q
=
d
/
10
;
buf
[
--
n
]
=
d
-
q
*
10
+
'0'
;
d
=
q
;
}
while
(
d
);
fast_memcpy
(
outbuf
,
buf
+
n
,
sizeof
(
buf
)
-
n
);
return
sizeof
(
buf
)
-
n
;
}
// This function is the hotspot of RedisCommandFormatV() when format is
// short or does not have many %. In a 100K-time call to formating of
// "GET key1", the time spent on RedisRequest.AddCommand() are ~700ns
// vs. ~400ns while using snprintf() vs. AppendDecimal() respectively.
inline
void
AppendHeader
(
std
::
string
&
buf
,
char
fc
,
unsigned
long
value
)
{
char
header
[
32
];
header
[
0
]
=
fc
;
size_t
len
=
AppendDecimal
(
header
+
1
,
value
);
header
[
len
+
1
]
=
'\r'
;
header
[
len
+
2
]
=
'\n'
;
buf
.
append
(
header
,
len
+
3
);
}
inline
void
AppendHeader
(
butil
::
IOBuf
&
buf
,
char
fc
,
unsigned
long
value
)
{
char
header
[
32
];
header
[
0
]
=
fc
;
size_t
len
=
AppendDecimal
(
header
+
1
,
value
);
header
[
len
+
1
]
=
'\r'
;
header
[
len
+
2
]
=
'\n'
;
buf
.
append
(
header
,
len
+
3
);
}
static
void
FlushComponent
(
std
::
string
*
out
,
std
::
string
*
compbuf
,
int
*
ncomp
)
{
AppendHeader
(
*
out
,
'$'
,
compbuf
->
size
());
out
->
append
(
*
compbuf
);
...
...
src/brpc/redis_command.h
View file @
d7826178
...
...
@@ -40,6 +40,41 @@ butil::Status RedisCommandByComponents(butil::IOBuf* buf,
const
butil
::
StringPiece
*
components
,
size_t
num_components
);
// Much faster than snprintf(..., "%lu", d);
inline
size_t
AppendDecimal
(
char
*
outbuf
,
unsigned
long
d
)
{
char
buf
[
24
];
// enough for decimal 64-bit integers
size_t
n
=
sizeof
(
buf
);
do
{
const
unsigned
long
q
=
d
/
10
;
buf
[
--
n
]
=
d
-
q
*
10
+
'0'
;
d
=
q
;
}
while
(
d
);
fast_memcpy
(
outbuf
,
buf
+
n
,
sizeof
(
buf
)
-
n
);
return
sizeof
(
buf
)
-
n
;
}
// This function is the hotspot of RedisCommandFormatV() when format is
// short or does not have many %. In a 100K-time call to formating of
// "GET key1", the time spent on RedisRequest.AddCommand() are ~700ns
// vs. ~400ns while using snprintf() vs. AppendDecimal() respectively.
inline
void
AppendHeader
(
std
::
string
&
buf
,
char
fc
,
unsigned
long
value
)
{
char
header
[
32
];
header
[
0
]
=
fc
;
size_t
len
=
AppendDecimal
(
header
+
1
,
value
);
header
[
len
+
1
]
=
'\r'
;
header
[
len
+
2
]
=
'\n'
;
buf
.
append
(
header
,
len
+
3
);
}
inline
void
AppendHeader
(
butil
::
IOBuf
&
buf
,
char
fc
,
unsigned
long
value
)
{
char
header
[
32
];
header
[
0
]
=
fc
;
size_t
len
=
AppendDecimal
(
header
+
1
,
value
);
header
[
len
+
1
]
=
'\r'
;
header
[
len
+
2
]
=
'\n'
;
buf
.
append
(
header
,
len
+
3
);
}
}
// namespace brpc
...
...
src/brpc/redis_message.cpp
View file @
d7826178
...
...
@@ -375,10 +375,8 @@ void RedisMessage::CopyFromDifferentArena(const RedisMessage& other,
new
(
&
subs
[
i
])
RedisMessage
;
}
_data
.
array
.
last_index
=
other
.
_data
.
array
.
last_index
;
if
(
_data
.
array
.
last_index
>
0
)
{
for
(
int
i
=
0
;
i
<
_data
.
array
.
last_index
;
++
i
)
{
subs
[
i
].
CopyFromDifferentArena
(
other
.
_data
.
array
.
replies
[
i
],
arena
);
}
for
(
size_t
i
=
0
;
i
<
_length
;
++
i
)
{
subs
[
i
].
CopyFromDifferentArena
(
other
.
_data
.
array
.
replies
[
i
],
arena
);
}
_data
.
array
.
replies
=
subs
;
}
...
...
src/brpc/redis_message.h
View file @
d7826178
...
...
@@ -211,6 +211,7 @@ inline bool RedisMessage::set_basic_string(const std::string& str, butil::Arena*
size_t
size
=
str
.
size
();
if
(
size
<
sizeof
(
_data
.
short_str
))
{
memcpy
(
_data
.
short_str
,
str
.
c_str
(),
size
);
_data
.
short_str
[
size
]
=
'\0'
;
}
else
{
char
*
d
=
(
char
*
)
arena
->
allocate
((
_length
/
8
+
1
)
*
8
);
if
(
!
d
)
{
...
...
@@ -218,6 +219,7 @@ inline bool RedisMessage::set_basic_string(const std::string& str, butil::Arena*
return
false
;
}
memcpy
(
d
,
str
.
c_str
(),
size
);
d
[
size
]
=
'\0'
;
_data
.
long_str
=
d
;
}
_type
=
type
;
...
...
test/brpc_redis_unittest.cpp
View file @
d7826178
...
...
@@ -558,6 +558,7 @@ TEST_F(RedisTest, codec) {
ASSERT_TRUE
(
r
.
set_status
(
"OK"
,
&
arena
));
ASSERT_TRUE
(
r
.
SerializeToIOBuf
(
&
buf
));
ASSERT_STREQ
(
buf
.
to_string
().
c_str
(),
"+OK
\r\n
"
);
ASSERT_STREQ
(
r
.
c_str
(),
"OK"
);
r
.
Clear
();
brpc
::
ParseError
err
=
r
.
ConsumePartialIOBuf
(
buf
,
&
arena
);
ASSERT_EQ
(
err
,
brpc
::
PARSE_OK
);
...
...
@@ -590,14 +591,15 @@ TEST_F(RedisTest, codec) {
ASSERT_TRUE
(
r
.
is_nil
());
r
.
Clear
();
ASSERT_TRUE
(
r
.
set_bulk_string
(
"abc'hello world"
,
&
arena
));
ASSERT_TRUE
(
r
.
set_bulk_string
(
"abc
de
'hello world"
,
&
arena
));
ASSERT_TRUE
(
r
.
SerializeToIOBuf
(
&
buf
));
ASSERT_STREQ
(
buf
.
to_string
().
c_str
(),
"$15
\r\n
abc'hello world
\r\n
"
);
ASSERT_STREQ
(
buf
.
to_string
().
c_str
(),
"$17
\r\n
abcde'hello world
\r\n
"
);
ASSERT_STREQ
(
r
.
c_str
(),
"abcde'hello world"
);
r
.
Clear
();
err
=
r
.
ConsumePartialIOBuf
(
buf
,
&
arena
);
ASSERT_EQ
(
err
,
brpc
::
PARSE_OK
);
ASSERT_TRUE
(
r
.
is_string
());
ASSERT_STREQ
(
r
.
c_str
(),
"abc'hello world"
);
ASSERT_STREQ
(
r
.
c_str
(),
"abc
de
'hello world"
);
}
// integer
{
...
...
@@ -663,74 +665,64 @@ butil::Mutex s_mutex;
std
::
unordered_map
<
std
::
string
,
std
::
string
>
m
;
std
::
unordered_map
<
std
::
string
,
int64_t
>
int_map
;
class
RedisServiceImpl
;
class
RedisConnectionImpl
:
public
brpc
::
RedisConnection
{
class
SetCommandHandler
:
public
brpc
::
RedisCommandHandler
{
public
:
RedisConnectionImpl
(
RedisServiceImpl
*
rs
)
:
_rs
(
rs
)
{
}
brpc
::
RedisCommandResult
Run
(
const
std
::
vector
<
const
char
*>&
args
,
brpc
::
RedisMessage
*
output
,
butil
::
Arena
*
arena
)
{
std
::
string
key
=
args
[
1
];
std
::
string
value
=
args
[
2
];
m
[
key
]
=
value
;
output
->
set_status
(
"OK"
,
arena
);
return
brpc
::
REDIS_COMMAND_OK
;
}
RedisCommandHandler
*
New
()
{
new_count
++
;
return
new
SetCommandHandler
;
}
int
new_count
=
0
;
};
void
OnRedisMessage
(
const
brpc
::
RedisMessage
&
message
,
brpc
::
RedisMessage
*
output
,
butil
::
Arena
*
arena
)
{
if
(
!
message
.
is_array
()
||
message
.
size
()
==
0
)
{
output
->
set_error
(
"command not valid array"
,
arena
);
return
;
}
const
brpc
::
RedisMessage
&
comm
=
message
[
0
];
if
(
!
comm
.
is_string
())
{
output
->
set_error
(
"command not string"
,
arena
);
return
;
}
std
::
string
s
(
comm
.
c_str
());
std
::
transform
(
s
.
begin
(),
s
.
end
(),
s
.
begin
(),
[](
char
c
){
return
std
::
tolower
(
c
);
});
if
(
s
==
"set"
)
{
std
::
string
key
=
message
[
1
].
c_str
();
std
::
string
value
=
message
[
2
].
c_str
();
m
[
key
]
=
value
;
output
->
set_status
(
"OK"
,
arena
);
return
;
}
else
if
(
s
==
"get"
)
{
std
::
string
key
=
message
[
1
].
c_str
();
auto
it
=
m
.
find
(
key
);
if
(
it
!=
m
.
end
())
{
output
->
set_bulk_string
(
it
->
second
,
arena
);
}
else
{
output
->
set_nil_string
();
}
butil
::
IOBuf
buf
;
output
->
SerializeToIOBuf
(
&
buf
);
return
;
}
else
if
(
s
==
"incr"
)
{
int64_t
value
;
s_mutex
.
lock
();
value
=
++
int_map
[
message
[
1
].
c_str
()];
s_mutex
.
unlock
();
output
->
set_integer
(
value
);
return
;
class
GetCommandHandler
:
public
brpc
::
RedisCommandHandler
{
public
:
brpc
::
RedisCommandResult
Run
(
const
std
::
vector
<
const
char
*>&
args
,
brpc
::
RedisMessage
*
output
,
butil
::
Arena
*
arena
)
{
std
::
string
key
=
args
[
1
];
auto
it
=
m
.
find
(
key
);
if
(
it
!=
m
.
end
())
{
output
->
set_bulk_string
(
it
->
second
,
arena
);
}
else
{
output
->
set_nil_string
();
}
char
buf
[
128
];
snprintf
(
buf
,
sizeof
(
buf
),
"ERR unknown command `%s`"
,
s
.
c_str
());
output
->
set_error
(
buf
,
arena
);
return
;
return
brpc
::
REDIS_COMMAND_OK
;
}
private
:
RedisServiceImpl
*
_rs
;
RedisCommandHandler
*
New
()
{
new_count
++
;
return
new
GetCommandHandler
;
}
int
new_count
=
0
;
};
class
RedisServiceImpl
:
public
brpc
::
RedisService
{
class
IncrCommandHandler
:
public
brpc
::
RedisCommandHandler
{
public
:
// @RedisService
brpc
::
RedisConnection
*
NewConnection
()
{
call_count
++
;
return
new
RedisConnectionImpl
(
this
);
brpc
::
RedisCommandResult
Run
(
const
std
::
vector
<
const
char
*>&
args
,
brpc
::
RedisMessage
*
output
,
butil
::
Arena
*
arena
)
{
int64_t
value
;
s_mutex
.
lock
();
value
=
++
int_map
[
args
[
1
]];
s_mutex
.
unlock
();
output
->
set_integer
(
value
);
return
brpc
::
REDIS_COMMAND_OK
;
}
int
call
_count
=
0
;
RedisCommandHandler
*
New
()
{
new_count
++
;
return
new
IncrCommandHandler
;
}
int
new
_count
=
0
;
};
class
RedisServiceImpl
:
public
brpc
::
RedisService
{
};
TEST_F
(
RedisTest
,
server_sanity
)
{
brpc
::
Server
server
;
brpc
::
ServerOptions
server_options
;
RedisServiceImpl
*
rsimpl
=
new
RedisServiceImpl
;
GetCommandHandler
*
gh
=
new
GetCommandHandler
;
SetCommandHandler
*
sh
=
new
SetCommandHandler
;
IncrCommandHandler
*
ih
=
new
IncrCommandHandler
;
rsimpl
->
AddHandler
(
"get"
,
gh
);
rsimpl
->
AddHandler
(
"set"
,
sh
);
rsimpl
->
AddHandler
(
"incr"
,
ih
);
server_options
.
redis_service
=
rsimpl
;
brpc
::
PortRange
pr
(
8081
,
8900
);
ASSERT_EQ
(
0
,
server
.
Start
(
"127.0.0.1"
,
pr
,
&
server_options
));
...
...
@@ -766,7 +758,9 @@ TEST_F(RedisTest, server_sanity) {
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_ERROR
,
response
.
reply
(
6
).
type
());
ASSERT_TRUE
(
butil
::
StringPiece
(
response
.
reply
(
6
).
error_message
()).
starts_with
(
"ERR unknown command"
));
ASSERT_EQ
(
rsimpl
->
call_count
,
1
);
ASSERT_EQ
(
gh
->
new_count
,
1
);
ASSERT_EQ
(
sh
->
new_count
,
1
);
ASSERT_EQ
(
ih
->
new_count
,
1
);
}
void
*
incr_thread
(
void
*
arg
)
{
...
...
@@ -790,6 +784,8 @@ TEST_F(RedisTest, server_concurrency) {
brpc
::
Server
server
;
brpc
::
ServerOptions
server_options
;
RedisServiceImpl
*
rsimpl
=
new
RedisServiceImpl
;
IncrCommandHandler
*
ih
=
new
IncrCommandHandler
;
rsimpl
->
AddHandler
(
"incr"
,
ih
);
server_options
.
redis_service
=
rsimpl
;
brpc
::
PortRange
pr
(
8081
,
8900
);
ASSERT_EQ
(
0
,
server
.
Start
(
"127.0.0.1"
,
pr
,
&
server_options
));
...
...
@@ -812,7 +808,97 @@ TEST_F(RedisTest, server_concurrency) {
delete
channels
[
i
];
}
ASSERT_EQ
(
int_map
[
"count"
],
10
*
5000LL
);
ASSERT_EQ
(
N
,
rsimpl
->
call_count
);
ASSERT_EQ
(
ih
->
new_count
,
N
);
}
class
MultiCommandHandler
:
public
brpc
::
RedisCommandHandler
{
public
:
brpc
::
RedisCommandResult
Run
(
const
std
::
vector
<
const
char
*>&
args
,
brpc
::
RedisMessage
*
output
,
butil
::
Arena
*
arena
)
{
if
(
strcmp
(
args
[
0
],
"exec"
)
!=
0
)
{
return
brpc
::
REDIS_COMMAND_CONTINUE
;
}
return
brpc
::
REDIS_COMMAND_OK
;
}
RedisCommandHandler
*
New
()
{
return
new
MultiCommandHandler
;
}
};
TEST_F
(
RedisTest
,
server_command_continue
)
{
brpc
::
Server
server
;
brpc
::
ServerOptions
server_options
;
RedisServiceImpl
*
rsimpl
=
new
RedisServiceImpl
;
rsimpl
->
AddHandler
(
"get"
,
new
GetCommandHandler
);
rsimpl
->
AddHandler
(
"set"
,
new
SetCommandHandler
);
rsimpl
->
AddHandler
(
"incr"
,
new
IncrCommandHandler
);
rsimpl
->
AddHandler
(
"multi"
,
new
MultiCommandHandler
);
server_options
.
redis_service
=
rsimpl
;
brpc
::
PortRange
pr
(
8081
,
8900
);
ASSERT_EQ
(
0
,
server
.
Start
(
"127.0.0.1"
,
pr
,
&
server_options
));
brpc
::
ChannelOptions
options
;
options
.
protocol
=
brpc
::
PROTOCOL_REDIS
;
brpc
::
Channel
channel
;
ASSERT_EQ
(
0
,
channel
.
Init
(
"127.0.0.1"
,
server
.
listen_address
().
port
,
&
options
));
{
brpc
::
RedisRequest
request
;
brpc
::
RedisResponse
response
;
brpc
::
Controller
cntl
;
ASSERT_TRUE
(
request
.
AddCommand
(
"set hello world"
));
ASSERT_TRUE
(
request
.
AddCommand
(
"get hello"
));
channel
.
CallMethod
(
NULL
,
&
cntl
,
&
request
,
&
response
,
NULL
);
ASSERT_FALSE
(
cntl
.
Failed
())
<<
cntl
.
ErrorText
();
ASSERT_EQ
(
2
,
response
.
reply_size
());
ASSERT_STREQ
(
"world"
,
response
.
reply
(
1
).
c_str
());
}
{
brpc
::
RedisRequest
request
;
brpc
::
RedisResponse
response
;
brpc
::
Controller
cntl
;
// multiple 'multi' should also work
ASSERT_TRUE
(
request
.
AddCommand
(
"multi"
));
ASSERT_TRUE
(
request
.
AddCommand
(
"Multi"
));
ASSERT_TRUE
(
request
.
AddCommand
(
"muLti"
));
int
count
=
10
;
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
ASSERT_TRUE
(
request
.
AddCommand
(
"incr hello 1"
));
}
ASSERT_TRUE
(
request
.
AddCommand
(
"exec"
));
channel
.
CallMethod
(
NULL
,
&
cntl
,
&
request
,
&
response
,
NULL
);
ASSERT_EQ
(
14
,
response
.
reply_size
());
ASSERT_FALSE
(
cntl
.
Failed
())
<<
cntl
.
ErrorText
();
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_STATUS
,
response
.
reply
(
0
).
type
());
ASSERT_STREQ
(
"OK"
,
response
.
reply
(
0
).
c_str
());
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_ERROR
,
response
.
reply
(
1
).
type
());
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_ERROR
,
response
.
reply
(
2
).
type
());
for
(
int
i
=
3
;
i
<
count
+
3
;
++
i
)
{
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_STATUS
,
response
.
reply
(
i
).
type
());
ASSERT_STREQ
(
"QUEUED"
,
response
.
reply
(
i
).
c_str
());
}
const
brpc
::
RedisMessage
&
m
=
response
.
reply
(
count
+
3
);
ASSERT_EQ
(
count
,
(
int
)
m
.
size
());
for
(
int
i
=
0
;
i
<
count
;
++
i
)
{
ASSERT_EQ
(
i
+
1
,
m
[
i
].
integer
());
}
}
// After 'multi', normal requests should be successful
{
brpc
::
RedisRequest
request
;
brpc
::
RedisResponse
response
;
brpc
::
Controller
cntl
;
ASSERT_TRUE
(
request
.
AddCommand
(
"get hello"
));
ASSERT_TRUE
(
request
.
AddCommand
(
"get hello2"
));
ASSERT_TRUE
(
request
.
AddCommand
(
"set key1 value1"
));
ASSERT_TRUE
(
request
.
AddCommand
(
"get key1"
));
channel
.
CallMethod
(
NULL
,
&
cntl
,
&
request
,
&
response
,
NULL
);
ASSERT_FALSE
(
cntl
.
Failed
())
<<
cntl
.
ErrorText
();
ASSERT_STREQ
(
"world"
,
response
.
reply
(
0
).
c_str
());
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_NIL
,
response
.
reply
(
1
).
type
());
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_STATUS
,
response
.
reply
(
2
).
type
());
ASSERT_STREQ
(
"OK"
,
response
.
reply
(
2
).
c_str
());
ASSERT_EQ
(
brpc
::
REDIS_MESSAGE_STRING
,
response
.
reply
(
3
).
type
());
ASSERT_STREQ
(
"value1"
,
response
.
reply
(
3
).
c_str
());
}
}
}
//namespace
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment