Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
638e42ac
Commit
638e42ac
authored
Oct 16, 2009
by
antirez
Browse files
multi bulk input protocol fixed
parent
f6b141c5
Changes
1
Show whitespace changes
Inline
Side-by-side
redis.c
View file @
638e42ac
...
@@ -344,6 +344,7 @@ static int processCommand(redisClient *c);
...
@@ -344,6 +344,7 @@ static int processCommand(redisClient *c);
static void setupSigSegvAction(void);
static void setupSigSegvAction(void);
static void rdbRemoveTempFile(pid_t childpid);
static void rdbRemoveTempFile(pid_t childpid);
static size_t stringObjectLen(robj *o);
static size_t stringObjectLen(robj *o);
static void processInputBuffer(redisClient *c);
static void authCommand(redisClient *c);
static void authCommand(redisClient *c);
static void pingCommand(redisClient *c);
static void pingCommand(redisClient *c);
...
@@ -1359,6 +1360,10 @@ static int processCommand(redisClient *c) {
...
@@ -1359,6 +1360,10 @@ static int processCommand(redisClient *c) {
}
}
c->argc--;
c->argc--;
c->bulklen = bulklen+2; /* add two bytes for CR+LF */
c->bulklen = bulklen+2; /* add two bytes for CR+LF */
/*
if (sdslen(c->querybuf) > 0)
processInputBuffer(c);
*/
return 1;
return 1;
}
}
} else {
} else {
...
@@ -1389,6 +1394,10 @@ static int processCommand(redisClient *c) {
...
@@ -1389,6 +1394,10 @@ static int processCommand(redisClient *c) {
/* continue below and process the command */
/* continue below and process the command */
} else {
} else {
c->bulklen = -1;
c->bulklen = -1;
/*
if (sdslen(c->querybuf) > 0)
processInputBuffer(c);
*/
return 1;
return 1;
}
}
}
}
...
@@ -1542,34 +1551,7 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di
...
@@ -1542,34 +1551,7 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di
if (outv != static_outv) zfree(outv);
if (outv != static_outv) zfree(outv);
}
}
static
void
readQueryFromClient
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
static void processInputBuffer(redisClient *c) {
redisClient
*
c
=
(
redisClient
*
)
privdata
;
char
buf
[
REDIS_IOBUF_LEN
];
int
nread
;
REDIS_NOTUSED
(
el
);
REDIS_NOTUSED
(
mask
);
nread
=
read
(
fd
,
buf
,
REDIS_IOBUF_LEN
);
if
(
nread
==
-
1
)
{
if
(
errno
==
EAGAIN
)
{
nread
=
0
;
}
else
{
redisLog
(
REDIS_DEBUG
,
"Reading from client: %s"
,
strerror
(
errno
));
freeClient
(
c
);
return
;
}
}
else
if
(
nread
==
0
)
{
redisLog
(
REDIS_DEBUG
,
"Client closed connection"
);
freeClient
(
c
);
return
;
}
if
(
nread
)
{
c
->
querybuf
=
sdscatlen
(
c
->
querybuf
,
buf
,
nread
);
c
->
lastinteraction
=
time
(
NULL
);
}
else
{
return
;
}
again:
again:
if (c->bulklen == -1) {
if (c->bulklen == -1) {
/* Read the first line of the query */
/* Read the first line of the query */
...
@@ -1636,12 +1618,45 @@ again:
...
@@ -1636,12 +1618,45 @@ again:
c->argv[c->argc] = createStringObject(c->querybuf,c->bulklen-2);
c->argv[c->argc] = createStringObject(c->querybuf,c->bulklen-2);
c->argc++;
c->argc++;
c->querybuf = sdsrange(c->querybuf,c->bulklen,-1);
c->querybuf = sdsrange(c->querybuf,c->bulklen,-1);
processCommand
(
c
);
/* Process the command. If the client is still valid after
* the processing and there is more data in the buffer
* try to parse it. */
if (processCommand(c) && sdslen(c->querybuf)) goto again;
return;
return;
}
}
}
}
}
}
static void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
redisClient *c = (redisClient*) privdata;
char buf[REDIS_IOBUF_LEN];
int nread;
REDIS_NOTUSED(el);
REDIS_NOTUSED(mask);
nread = read(fd, buf, REDIS_IOBUF_LEN);
if (nread == -1) {
if (errno == EAGAIN) {
nread = 0;
} else {
redisLog(REDIS_DEBUG, "Reading from client: %s",strerror(errno));
freeClient(c);
return;
}
} else if (nread == 0) {
redisLog(REDIS_DEBUG, "Client closed connection");
freeClient(c);
return;
}
if (nread) {
c->querybuf = sdscatlen(c->querybuf, buf, nread);
c->lastinteraction = time(NULL);
} else {
return;
}
processInputBuffer(c);
}
static int selectDb(redisClient *c, int id) {
static int selectDb(redisClient *c, int id) {
if (id < 0 || id >= server.dbnum)
if (id < 0 || id >= server.dbnum)
return REDIS_ERR;
return REDIS_ERR;
...
...
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