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
eee11d90
Commit
eee11d90
authored
Dec 20, 2019
by
zhujiashun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redis_server_protocol: revert BATCH_DONE
parent
8c13ae4c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
27 deletions
+36
-27
redis_protocol.cpp
src/brpc/policy/redis_protocol.cpp
+19
-17
redis.h
src/brpc/redis.h
+8
-9
brpc_redis_unittest.cpp
test/brpc_redis_unittest.cpp
+9
-1
No files found.
src/brpc/policy/redis_protocol.cpp
View file @
eee11d90
...
...
@@ -88,10 +88,8 @@ int ConsumeCommand(RedisConnContext* ctx,
result
=
ctx
->
transaction_handler
->
Run
(
commands
,
&
output
,
is_last
);
if
(
result
==
RedisCommandHandler
::
OK
)
{
ctx
->
transaction_handler
.
reset
(
NULL
);
}
else
if
(
result
==
RedisCommandHandler
::
BATCHED
||
result
==
RedisCommandHandler
::
BATCHED_DONE
)
{
LOG
(
ERROR
)
<<
"BATCHED/BATCHED_DONE should not be returned by a "
" transaction handler."
;
}
else
if
(
result
==
RedisCommandHandler
::
BATCHED
)
{
LOG
(
ERROR
)
<<
"BATCHED should not be returned by a transaction handler."
;
return
-
1
;
}
}
else
{
...
...
@@ -109,7 +107,7 @@ int ConsumeCommand(RedisConnContext* ctx,
result
=
ch
->
Run
(
commands
,
&
output
,
is_last
);
if
(
result
==
RedisCommandHandler
::
CONTINUE
)
{
if
(
ctx
->
batched_size
!=
0
)
{
LOG
(
ERROR
)
<<
"Do you forget to return
BATCHED_DONE
when is_last is true?"
;
LOG
(
ERROR
)
<<
"Do you forget to return
OK
when is_last is true?"
;
return
-
1
;
}
ctx
->
transaction_handler
.
reset
(
ch
->
NewTransactionHandler
());
...
...
@@ -118,20 +116,24 @@ int ConsumeCommand(RedisConnContext* ctx,
}
}
}
if
(
result
==
RedisCommandHandler
::
OK
||
result
==
RedisCommandHandler
::
CONTINUE
)
{
if
(
result
==
RedisCommandHandler
::
OK
)
{
if
(
ctx
->
batched_size
)
{
if
((
int
)
output
.
size
()
!=
(
ctx
->
batched_size
+
1
))
{
LOG
(
ERROR
)
<<
"reply array size can't be matched with batched size, "
<<
" expected="
<<
ctx
->
batched_size
+
1
<<
" actual="
<<
output
.
size
();
return
-
1
;
}
for
(
int
i
=
0
;
i
<
(
int
)
output
.
size
();
++
i
)
{
output
[
i
].
SerializeTo
(
sendbuf
);
}
ctx
->
batched_size
=
0
;
}
else
{
output
.
SerializeTo
(
sendbuf
);
}
}
else
if
(
result
==
RedisCommandHandler
::
CONTINUE
)
{
output
.
SerializeTo
(
sendbuf
);
}
else
if
(
result
==
RedisCommandHandler
::
BATCHED
)
{
// just do nothing and wait handler to return BATCHED_DONE.
}
else
if
(
result
==
RedisCommandHandler
::
BATCHED_DONE
)
{
if
((
int
)
output
.
size
()
!=
(
ctx
->
batched_size
+
1
))
{
LOG
(
ERROR
)
<<
"reply array size can't be matched with batched size, "
<<
" expected="
<<
ctx
->
batched_size
+
1
<<
" actual="
<<
output
.
size
();
return
-
1
;
}
for
(
int
i
=
0
;
i
<
(
int
)
output
.
size
();
++
i
)
{
output
[
i
].
SerializeTo
(
sendbuf
);
}
ctx
->
batched_size
=
0
;
// just do nothing and wait handler to return OK.
}
else
{
LOG
(
ERROR
)
<<
"unknown status="
<<
result
;
return
-
1
;
...
...
src/brpc/redis.h
View file @
eee11d90
...
...
@@ -238,7 +238,6 @@ public:
OK
=
0
,
CONTINUE
=
1
,
BATCHED
=
2
,
BATCHED_DONE
=
3
,
};
~
RedisCommandHandler
()
{}
...
...
@@ -253,13 +252,13 @@ public:
// want to do some batch processing, user should buffer the command and return
// RedisCommandHandler::BATCHED. Once `is_last' is true, run all the commands,
// set `output' to be an array in which every element is the result of batched
// commands and return RedisCommandHandler::
BATCHED_DONE
.
// commands and return RedisCommandHandler::
OK
.
//
// The return value should be RedisCommandHandler::OK for normal cases. If you want
// to implement transaction, return RedisCommandHandler::CONTINUE once server receives
// an start marker and brpc will call MultiTransactionHandler() to new a transaction
// handler that all the following commands are sent to this tranction handler until
// it returns Re
sult
::OK. Read the comment below.
// it returns Re
disCommandHandler
::OK. Read the comment below.
virtual
RedisCommandHandler
::
Result
Run
(
const
std
::
vector
<
const
char
*>&
args
,
brpc
::
RedisReply
*
output
,
bool
is_last
)
=
0
;
...
...
@@ -270,12 +269,12 @@ public:
// exec":
// 1) First command is "multi" and Run() should return RedisCommandHandler::CONTINUE,
// then brpc calls NewTransactionHandler() to new a transaction_handler.
// 2) brpc calls transaction_handler.Run() with command "set k1 v1",
which should return
// CONTINUE.
// 3) brpc calls transaction_handler.Run() with command "set k2 v2",
which should return
// CONTINUE.
// 4) brpc calls transaction_handler.Run() with command "set k3 v3",
which should return
// CONTINUE.
// 2) brpc calls transaction_handler.Run() with command "set k1 v1",
//
which should return
CONTINUE.
// 3) brpc calls transaction_handler.Run() with command "set k2 v2",
//
which should return
CONTINUE.
// 4) brpc calls transaction_handler.Run() with command "set k3 v3",
//
which should return
CONTINUE.
// 5) An ending marker(exec) is found in transaction_handler.Run(), user exeuctes all
// the commands and return OK. This Transation is done.
virtual
RedisCommandHandler
*
NewTransactionHandler
();
...
...
test/brpc_redis_unittest.cpp
View file @
eee11d90
...
...
@@ -787,6 +787,14 @@ public:
brpc
::
RedisCommandHandler
::
Result
OnBatched
(
const
std
::
vector
<
const
char
*>
args
,
brpc
::
RedisReply
*
output
,
bool
is_last
)
{
if
(
_batched_command
.
empty
()
&&
is_last
)
{
if
(
strcmp
(
args
[
0
],
"set"
)
==
0
)
{
DoSet
(
args
[
1
],
args
[
2
],
output
);
}
else
if
(
strcmp
(
args
[
0
],
"get"
)
==
0
)
{
DoGet
(
args
[
1
],
output
);
}
return
brpc
::
RedisCommandHandler
::
OK
;
}
std
::
vector
<
std
::
string
>
comm
;
for
(
int
i
=
0
;
i
<
(
int
)
args
.
size
();
++
i
)
{
comm
.
push_back
(
args
[
i
]);
...
...
@@ -803,7 +811,7 @@ public:
}
_batch_count
++
;
_batched_command
.
clear
();
return
brpc
::
RedisCommandHandler
::
BATCHED_DONE
;
return
brpc
::
RedisCommandHandler
::
OK
;
}
else
{
return
brpc
::
RedisCommandHandler
::
BATCHED
;
}
...
...
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