summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororanagra <oran@redislabs.com>2016-05-24 23:31:36 +0300
committerantirez <antirez@gmail.com>2016-06-16 12:56:17 +0200
commit2a3ee58ec73b6abdeeb4890937b25191119bce35 (patch)
treebbca47e07c86a9d59a530d798f0b3414bd86017b
parenta2e27b810edfad18b3ecc9c176a4606f94a2f0e4 (diff)
downloadredis-2a3ee58ec73b6abdeeb4890937b25191119bce35.tar.gz
check WRONGTYPE in BITFIELD before looping on the operations.
optimization: lookup key only once, and grow at once to the max need fixes #3259 and #3221, and also an early return if wrongtype is discovered by SET
-rw-r--r--src/bitops.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/bitops.c b/src/bitops.c
index a07633fa3..9ae52c81b 100644
--- a/src/bitops.c
+++ b/src/bitops.c
@@ -906,6 +906,8 @@ void bitfieldCommand(client *c) {
int j, numops = 0, changes = 0;
struct bitfieldOp *ops = NULL; /* Array of ops to execute at end. */
int owtype = BFOVERFLOW_WRAP; /* Overflow type. */
+ int readonly = 1;
+ long highestWriteOffset = 0;
for (j = 2; j < c->argc; j++) {
int remargs = c->argc-j-1; /* Remaining args other than current. */
@@ -953,8 +955,10 @@ void bitfieldCommand(client *c) {
return;
}
- /* INCRBY and SET require another argument. */
if (opcode != BITFIELDOP_GET) {
+ readonly = 0;
+ highestWriteOffset = bitoffset + bits - 1;
+ /* INCRBY and SET require another argument. */
if (getLongLongFromObjectOrReply(c,c->argv[j+3],&i64,NULL) != C_OK){
zfree(ops);
return;
@@ -974,6 +978,18 @@ void bitfieldCommand(client *c) {
j += 3 - (opcode == BITFIELDOP_GET);
}
+ if (readonly) {
+ /* Lookup for read is ok if key doesn't exit, but errors
+ * if it's not a string*/
+ o = lookupKeyRead(c->db,c->argv[1]);
+ if (o != NULL && checkType(c,o,OBJ_STRING)) return;
+ } else {
+ /* Lookup by making room up to the farest bit reached by
+ * this operation. */
+ if ((o = lookupStringForBitCommand(c,
+ highestWriteOffset)) == NULL) return;
+ }
+
addReplyMultiBulkLen(c,numops);
/* Actually process the operations. */
@@ -988,11 +1004,6 @@ void bitfieldCommand(client *c) {
* for simplicity. SET return value is the previous value so
* we need fetch & store as well. */
- /* Lookup by making room up to the farest bit reached by
- * this operation. */
- if ((o = lookupStringForBitCommand(c,
- thisop->offset + (thisop->bits-1))) == NULL) return;
-
/* We need two different but very similar code paths for signed
* and unsigned operations, since the set of functions to get/set
* the integers and the used variables types are different. */
@@ -1064,10 +1075,8 @@ void bitfieldCommand(client *c) {
unsigned char *src = NULL;
char llbuf[LONG_STR_SIZE];
- if ((o = lookupKeyRead(c->db,c->argv[1])) != NULL) {
- if (checkType(c,o,OBJ_STRING)) continue;
+ if (o != NULL)
src = getObjectReadOnlyString(o,&strlen,llbuf);
- }
/* For GET we use a trick: before executing the operation
* copy up to 9 bytes to a local buffer, so that we can easily