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
94d490b9
Commit
94d490b9
authored
Nov 04, 2011
by
antirez
Browse files
Added a define to set the size threshold to enable the multi bulk parsing big objects optimization.
parent
826b5beb
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/networking.c
View file @
94d490b9
...
@@ -767,8 +767,8 @@ int processMultibulkBuffer(redisClient *c) {
...
@@ -767,8 +767,8 @@ int processMultibulkBuffer(redisClient *c) {
}
}
pos
+=
newline
-
(
c
->
querybuf
+
pos
)
+
2
;
pos
+=
newline
-
(
c
->
querybuf
+
pos
)
+
2
;
#if 1
#ifdef REDIS_MBULK_BIG_ARG
if
(
ll
>
4096
)
{
if
(
ll
>
=
REDIS_MBULK_BIG_ARG
)
{
/* If we are going to read a large object from network
/* If we are going to read a large object from network
* try to make it likely that it will start at c->querybuf
* try to make it likely that it will start at c->querybuf
* boundary so that we can optimized object creation
* boundary so that we can optimized object creation
...
@@ -776,10 +776,11 @@ int processMultibulkBuffer(redisClient *c) {
...
@@ -776,10 +776,11 @@ int processMultibulkBuffer(redisClient *c) {
c
->
querybuf
=
sdsrange
(
c
->
querybuf
,
pos
,
-
1
);
c
->
querybuf
=
sdsrange
(
c
->
querybuf
,
pos
,
-
1
);
pos
=
0
;
pos
=
0
;
}
}
#endif
/* Hint the sds library about the amount of bytes this string is
/* Hint the sds library about the amount of bytes this string is
* going to contain. */
* going to contain. */
if
(
ll
>
4096
)
c
->
querybuf
=
sdsMakeRoomFor
(
c
->
querybuf
,
ll
+
2
);
if
(
ll
>=
REDIS_MBULK_BIG_ARG
)
c
->
querybuf
=
sdsMakeRoomFor
(
c
->
querybuf
,
ll
+
2
);
#endif
c
->
bulklen
=
ll
;
c
->
bulklen
=
ll
;
}
}
...
@@ -791,8 +792,9 @@ int processMultibulkBuffer(redisClient *c) {
...
@@ -791,8 +792,9 @@ int processMultibulkBuffer(redisClient *c) {
/* Optimization: if the buffer contanins JUST our bulk element
/* Optimization: if the buffer contanins JUST our bulk element
* instead of creating a new object by *copying* the sds we
* instead of creating a new object by *copying* the sds we
* just use the current sds string. */
* just use the current sds string. */
#ifdef REDIS_MBULK_BIG_ARG
if
(
pos
==
0
&&
if
(
pos
==
0
&&
/* sdslen(c->querybuf) > 4096 && */
c
->
bulklen
>=
REDIS_MBULK_BIG_ARG
&&
(
signed
)
sdslen
(
c
->
querybuf
)
==
c
->
bulklen
+
2
)
(
signed
)
sdslen
(
c
->
querybuf
)
==
c
->
bulklen
+
2
)
{
{
// printf("HERE (arg %d)\n",c->argc);
// printf("HERE (arg %d)\n",c->argc);
...
@@ -804,11 +806,14 @@ int processMultibulkBuffer(redisClient *c) {
...
@@ -804,11 +806,14 @@ int processMultibulkBuffer(redisClient *c) {
c
->
querybuf
=
sdsMakeRoomFor
(
c
->
querybuf
,
c
->
bulklen
+
2
);
c
->
querybuf
=
sdsMakeRoomFor
(
c
->
querybuf
,
c
->
bulklen
+
2
);
pos
=
0
;
pos
=
0
;
}
else
{
}
else
{
#endif
// printf("NOT HERE (arg %d) (pos %d)\n",c->argc, pos);
// printf("NOT HERE (arg %d) (pos %d)\n",c->argc, pos);
c
->
argv
[
c
->
argc
++
]
=
c
->
argv
[
c
->
argc
++
]
=
createStringObject
(
c
->
querybuf
+
pos
,
c
->
bulklen
);
createStringObject
(
c
->
querybuf
+
pos
,
c
->
bulklen
);
pos
+=
c
->
bulklen
+
2
;
pos
+=
c
->
bulklen
+
2
;
#ifdef REDIS_MBULK_BIG_ARG
}
}
#endif
c
->
bulklen
=
-
1
;
c
->
bulklen
=
-
1
;
c
->
multibulklen
--
;
c
->
multibulklen
--
;
}
}
...
@@ -871,21 +876,21 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
...
@@ -871,21 +876,21 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
REDIS_NOTUSED
(
mask
);
REDIS_NOTUSED
(
mask
);
readlen
=
REDIS_IOBUF_LEN
;
readlen
=
REDIS_IOBUF_LEN
;
#if REDIS_MBULK_BIG_ARG
/* If this is a multi bulk request, and we are processing a bulk reply
/* If this is a multi bulk request, and we are processing a bulk reply
* that is large enough, try to maximize the probabilty that the query
* that is large enough, try to maximize the probabilty that the query
* buffer contains excatly the SDS string representing the object, even
* buffer contains excatly the SDS string representing the object, even
* at the risk of requring more read(2) calls. This way the function
* at the risk of requring more read(2) calls. This way the function
* processMultiBulkBuffer() can avoid copying buffers to create the
* processMultiBulkBuffer() can avoid copying buffers to create the
* Redis Object representing the argument. */
* Redis Object representing the argument. */
#if 1
if
(
c
->
reqtype
==
REDIS_REQ_MULTIBULK
&&
c
->
multibulklen
&&
c
->
bulklen
!=
-
1
if
(
c
->
reqtype
==
REDIS_REQ_MULTIBULK
&&
c
->
multibulklen
&&
c
->
bulklen
!=
-
1
&&
c
->
bulklen
>
4096
)
&&
c
->
bulklen
>
=
REDIS_MBULK_BIG_ARG
)
{
{
int
remaining
=
(
unsigned
)(
c
->
bulklen
+
2
)
-
sdslen
(
c
->
querybuf
);
int
remaining
=
(
unsigned
)(
c
->
bulklen
+
2
)
-
sdslen
(
c
->
querybuf
);
if
(
remaining
<
readlen
)
readlen
=
remaining
;
if
(
remaining
<
readlen
)
readlen
=
remaining
;
}
}
#endif
#endif
qblen
=
sdslen
(
c
->
querybuf
);
qblen
=
sdslen
(
c
->
querybuf
);
c
->
querybuf
=
sdsMakeRoomFor
(
c
->
querybuf
,
readlen
);
c
->
querybuf
=
sdsMakeRoomFor
(
c
->
querybuf
,
readlen
);
...
...
src/redis.h
View file @
94d490b9
...
@@ -59,6 +59,7 @@
...
@@ -59,6 +59,7 @@
#define REDIS_REPL_TIMEOUT 60
#define REDIS_REPL_TIMEOUT 60
#define REDIS_REPL_PING_SLAVE_PERIOD 10
#define REDIS_REPL_PING_SLAVE_PERIOD 10
#define REDIS_MBULK_BIG_ARG (1024*32)
/* Hash table parameters */
/* Hash table parameters */
#define REDIS_HT_MINFILL 10
/* Minimal hash table fill 10% */
#define REDIS_HT_MINFILL 10
/* Minimal hash table fill 10% */
...
...
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