Commit 14ff5724 authored by antirez's avatar antirez
Browse files

RDMF: OBJ_ macros for object related stuff.

parent 554bd0e7
...@@ -52,12 +52,12 @@ robj *setTypeCreate(robj *value) { ...@@ -52,12 +52,12 @@ robj *setTypeCreate(robj *value) {
* returned, otherwise the new element is added and 1 is returned. */ * returned, otherwise the new element is added and 1 is returned. */
int setTypeAdd(robj *subject, robj *value) { int setTypeAdd(robj *subject, robj *value) {
long long llval; long long llval;
if (subject->encoding == REDIS_ENCODING_HT) { if (subject->encoding == OBJ_ENCODING_HT) {
if (dictAdd(subject->ptr,value,NULL) == DICT_OK) { if (dictAdd(subject->ptr,value,NULL) == DICT_OK) {
incrRefCount(value); incrRefCount(value);
return 1; return 1;
} }
} else if (subject->encoding == REDIS_ENCODING_INTSET) { } else if (subject->encoding == OBJ_ENCODING_INTSET) {
if (isObjectRepresentableAsLongLong(value,&llval) == REDIS_OK) { if (isObjectRepresentableAsLongLong(value,&llval) == REDIS_OK) {
uint8_t success = 0; uint8_t success = 0;
subject->ptr = intsetAdd(subject->ptr,llval,&success); subject->ptr = intsetAdd(subject->ptr,llval,&success);
...@@ -65,12 +65,12 @@ int setTypeAdd(robj *subject, robj *value) { ...@@ -65,12 +65,12 @@ int setTypeAdd(robj *subject, robj *value) {
/* Convert to regular set when the intset contains /* Convert to regular set when the intset contains
* too many entries. */ * too many entries. */
if (intsetLen(subject->ptr) > server.set_max_intset_entries) if (intsetLen(subject->ptr) > server.set_max_intset_entries)
setTypeConvert(subject,REDIS_ENCODING_HT); setTypeConvert(subject,OBJ_ENCODING_HT);
return 1; return 1;
} }
} else { } else {
/* Failed to get integer from object, convert to regular set. */ /* Failed to get integer from object, convert to regular set. */
setTypeConvert(subject,REDIS_ENCODING_HT); setTypeConvert(subject,OBJ_ENCODING_HT);
/* The set *was* an intset and this value is not integer /* The set *was* an intset and this value is not integer
* encodable, so dictAdd should always work. */ * encodable, so dictAdd should always work. */
...@@ -87,12 +87,12 @@ int setTypeAdd(robj *subject, robj *value) { ...@@ -87,12 +87,12 @@ int setTypeAdd(robj *subject, robj *value) {
int setTypeRemove(robj *setobj, robj *value) { int setTypeRemove(robj *setobj, robj *value) {
long long llval; long long llval;
if (setobj->encoding == REDIS_ENCODING_HT) { if (setobj->encoding == OBJ_ENCODING_HT) {
if (dictDelete(setobj->ptr,value) == DICT_OK) { if (dictDelete(setobj->ptr,value) == DICT_OK) {
if (htNeedsResize(setobj->ptr)) dictResize(setobj->ptr); if (htNeedsResize(setobj->ptr)) dictResize(setobj->ptr);
return 1; return 1;
} }
} else if (setobj->encoding == REDIS_ENCODING_INTSET) { } else if (setobj->encoding == OBJ_ENCODING_INTSET) {
if (isObjectRepresentableAsLongLong(value,&llval) == REDIS_OK) { if (isObjectRepresentableAsLongLong(value,&llval) == REDIS_OK) {
int success; int success;
setobj->ptr = intsetRemove(setobj->ptr,llval,&success); setobj->ptr = intsetRemove(setobj->ptr,llval,&success);
...@@ -106,9 +106,9 @@ int setTypeRemove(robj *setobj, robj *value) { ...@@ -106,9 +106,9 @@ int setTypeRemove(robj *setobj, robj *value) {
int setTypeIsMember(robj *subject, robj *value) { int setTypeIsMember(robj *subject, robj *value) {
long long llval; long long llval;
if (subject->encoding == REDIS_ENCODING_HT) { if (subject->encoding == OBJ_ENCODING_HT) {
return dictFind((dict*)subject->ptr,value) != NULL; return dictFind((dict*)subject->ptr,value) != NULL;
} else if (subject->encoding == REDIS_ENCODING_INTSET) { } else if (subject->encoding == OBJ_ENCODING_INTSET) {
if (isObjectRepresentableAsLongLong(value,&llval) == REDIS_OK) { if (isObjectRepresentableAsLongLong(value,&llval) == REDIS_OK) {
return intsetFind((intset*)subject->ptr,llval); return intsetFind((intset*)subject->ptr,llval);
} }
...@@ -122,9 +122,9 @@ setTypeIterator *setTypeInitIterator(robj *subject) { ...@@ -122,9 +122,9 @@ setTypeIterator *setTypeInitIterator(robj *subject) {
setTypeIterator *si = zmalloc(sizeof(setTypeIterator)); setTypeIterator *si = zmalloc(sizeof(setTypeIterator));
si->subject = subject; si->subject = subject;
si->encoding = subject->encoding; si->encoding = subject->encoding;
if (si->encoding == REDIS_ENCODING_HT) { if (si->encoding == OBJ_ENCODING_HT) {
si->di = dictGetIterator(subject->ptr); si->di = dictGetIterator(subject->ptr);
} else if (si->encoding == REDIS_ENCODING_INTSET) { } else if (si->encoding == OBJ_ENCODING_INTSET) {
si->ii = 0; si->ii = 0;
} else { } else {
redisPanic("Unknown set encoding"); redisPanic("Unknown set encoding");
...@@ -133,7 +133,7 @@ setTypeIterator *setTypeInitIterator(robj *subject) { ...@@ -133,7 +133,7 @@ setTypeIterator *setTypeInitIterator(robj *subject) {
} }
void setTypeReleaseIterator(setTypeIterator *si) { void setTypeReleaseIterator(setTypeIterator *si) {
if (si->encoding == REDIS_ENCODING_HT) if (si->encoding == OBJ_ENCODING_HT)
dictReleaseIterator(si->di); dictReleaseIterator(si->di);
zfree(si); zfree(si);
} }
...@@ -154,12 +154,12 @@ void setTypeReleaseIterator(setTypeIterator *si) { ...@@ -154,12 +154,12 @@ void setTypeReleaseIterator(setTypeIterator *si) {
* Returned objects ref count is not incremented, so this function is * Returned objects ref count is not incremented, so this function is
* copy on write friendly. */ * copy on write friendly. */
int setTypeNext(setTypeIterator *si, robj **objele, int64_t *llele) { int setTypeNext(setTypeIterator *si, robj **objele, int64_t *llele) {
if (si->encoding == REDIS_ENCODING_HT) { if (si->encoding == OBJ_ENCODING_HT) {
dictEntry *de = dictNext(si->di); dictEntry *de = dictNext(si->di);
if (de == NULL) return -1; if (de == NULL) return -1;
*objele = dictGetKey(de); *objele = dictGetKey(de);
*llele = -123456789; /* Not needed. Defensive. */ *llele = -123456789; /* Not needed. Defensive. */
} else if (si->encoding == REDIS_ENCODING_INTSET) { } else if (si->encoding == OBJ_ENCODING_INTSET) {
if (!intsetGet(si->subject->ptr,si->ii++,llele)) if (!intsetGet(si->subject->ptr,si->ii++,llele))
return -1; return -1;
*objele = NULL; /* Not needed. Defensive. */ *objele = NULL; /* Not needed. Defensive. */
...@@ -184,9 +184,9 @@ robj *setTypeNextObject(setTypeIterator *si) { ...@@ -184,9 +184,9 @@ robj *setTypeNextObject(setTypeIterator *si) {
encoding = setTypeNext(si,&objele,&intele); encoding = setTypeNext(si,&objele,&intele);
switch(encoding) { switch(encoding) {
case -1: return NULL; case -1: return NULL;
case REDIS_ENCODING_INTSET: case OBJ_ENCODING_INTSET:
return createStringObjectFromLongLong(intele); return createStringObjectFromLongLong(intele);
case REDIS_ENCODING_HT: case OBJ_ENCODING_HT:
incrRefCount(objele); incrRefCount(objele);
return objele; return objele;
default: default:
...@@ -213,11 +213,11 @@ robj *setTypeNextObject(setTypeIterator *si) { ...@@ -213,11 +213,11 @@ robj *setTypeNextObject(setTypeIterator *si) {
* of the object is not incremented so this function can be considered * of the object is not incremented so this function can be considered
* copy on write friendly. */ * copy on write friendly. */
int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) { int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) {
if (setobj->encoding == REDIS_ENCODING_HT) { if (setobj->encoding == OBJ_ENCODING_HT) {
dictEntry *de = dictGetRandomKey(setobj->ptr); dictEntry *de = dictGetRandomKey(setobj->ptr);
*objele = dictGetKey(de); *objele = dictGetKey(de);
*llele = -123456789; /* Not needed. Defensive. */ *llele = -123456789; /* Not needed. Defensive. */
} else if (setobj->encoding == REDIS_ENCODING_INTSET) { } else if (setobj->encoding == OBJ_ENCODING_INTSET) {
*llele = intsetRandom(setobj->ptr); *llele = intsetRandom(setobj->ptr);
*objele = NULL; /* Not needed. Defensive. */ *objele = NULL; /* Not needed. Defensive. */
} else { } else {
...@@ -227,9 +227,9 @@ int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) { ...@@ -227,9 +227,9 @@ int setTypeRandomElement(robj *setobj, robj **objele, int64_t *llele) {
} }
unsigned long setTypeSize(robj *subject) { unsigned long setTypeSize(robj *subject) {
if (subject->encoding == REDIS_ENCODING_HT) { if (subject->encoding == OBJ_ENCODING_HT) {
return dictSize((dict*)subject->ptr); return dictSize((dict*)subject->ptr);
} else if (subject->encoding == REDIS_ENCODING_INTSET) { } else if (subject->encoding == OBJ_ENCODING_INTSET) {
return intsetLen((intset*)subject->ptr); return intsetLen((intset*)subject->ptr);
} else { } else {
redisPanic("Unknown set encoding"); redisPanic("Unknown set encoding");
...@@ -241,10 +241,10 @@ unsigned long setTypeSize(robj *subject) { ...@@ -241,10 +241,10 @@ unsigned long setTypeSize(robj *subject) {
* set. */ * set. */
void setTypeConvert(robj *setobj, int enc) { void setTypeConvert(robj *setobj, int enc) {
setTypeIterator *si; setTypeIterator *si;
redisAssertWithInfo(NULL,setobj,setobj->type == REDIS_SET && redisAssertWithInfo(NULL,setobj,setobj->type == OBJ_SET &&
setobj->encoding == REDIS_ENCODING_INTSET); setobj->encoding == OBJ_ENCODING_INTSET);
if (enc == REDIS_ENCODING_HT) { if (enc == OBJ_ENCODING_HT) {
int64_t intele; int64_t intele;
dict *d = dictCreate(&setDictType,NULL); dict *d = dictCreate(&setDictType,NULL);
robj *element; robj *element;
...@@ -261,7 +261,7 @@ void setTypeConvert(robj *setobj, int enc) { ...@@ -261,7 +261,7 @@ void setTypeConvert(robj *setobj, int enc) {
} }
setTypeReleaseIterator(si); setTypeReleaseIterator(si);
setobj->encoding = REDIS_ENCODING_HT; setobj->encoding = OBJ_ENCODING_HT;
zfree(setobj->ptr); zfree(setobj->ptr);
setobj->ptr = d; setobj->ptr = d;
} else { } else {
...@@ -278,7 +278,7 @@ void saddCommand(client *c) { ...@@ -278,7 +278,7 @@ void saddCommand(client *c) {
set = setTypeCreate(c->argv[2]); set = setTypeCreate(c->argv[2]);
dbAdd(c->db,c->argv[1],set); dbAdd(c->db,c->argv[1],set);
} else { } else {
if (set->type != REDIS_SET) { if (set->type != OBJ_SET) {
addReply(c,shared.wrongtypeerr); addReply(c,shared.wrongtypeerr);
return; return;
} }
...@@ -301,7 +301,7 @@ void sremCommand(client *c) { ...@@ -301,7 +301,7 @@ void sremCommand(client *c) {
int j, deleted = 0, keyremoved = 0; int j, deleted = 0, keyremoved = 0;
if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL || if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.czero)) == NULL ||
checkType(c,set,REDIS_SET)) return; checkType(c,set,OBJ_SET)) return;
for (j = 2; j < c->argc; j++) { for (j = 2; j < c->argc; j++) {
if (setTypeRemove(set,c->argv[j])) { if (setTypeRemove(set,c->argv[j])) {
...@@ -338,8 +338,8 @@ void smoveCommand(client *c) { ...@@ -338,8 +338,8 @@ void smoveCommand(client *c) {
/* If the source key has the wrong type, or the destination key /* If the source key has the wrong type, or the destination key
* is set and has the wrong type, return with an error. */ * is set and has the wrong type, return with an error. */
if (checkType(c,srcset,REDIS_SET) || if (checkType(c,srcset,OBJ_SET) ||
(dstset && checkType(c,dstset,REDIS_SET))) return; (dstset && checkType(c,dstset,OBJ_SET))) return;
/* If srcset and dstset are equal, SMOVE is a no-op */ /* If srcset and dstset are equal, SMOVE is a no-op */
if (srcset == dstset) { if (srcset == dstset) {
...@@ -381,7 +381,7 @@ void sismemberCommand(client *c) { ...@@ -381,7 +381,7 @@ void sismemberCommand(client *c) {
robj *set; robj *set;
if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL || if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
checkType(c,set,REDIS_SET)) return; checkType(c,set,OBJ_SET)) return;
c->argv[2] = tryObjectEncoding(c->argv[2]); c->argv[2] = tryObjectEncoding(c->argv[2]);
if (setTypeIsMember(set,c->argv[2])) if (setTypeIsMember(set,c->argv[2]))
...@@ -394,7 +394,7 @@ void scardCommand(client *c) { ...@@ -394,7 +394,7 @@ void scardCommand(client *c) {
robj *o; robj *o;
if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL || if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
checkType(c,o,REDIS_SET)) return; checkType(c,o,OBJ_SET)) return;
addReplyLongLong(c,setTypeSize(o)); addReplyLongLong(c,setTypeSize(o));
} }
...@@ -424,7 +424,7 @@ void spopWithCountCommand(client *c) { ...@@ -424,7 +424,7 @@ void spopWithCountCommand(client *c) {
/* Make sure a key with the name inputted exists, and that it's type is /* Make sure a key with the name inputted exists, and that it's type is
* indeed a set. Otherwise, return nil */ * indeed a set. Otherwise, return nil */
if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.emptymultibulk)) if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.emptymultibulk))
== NULL || checkType(c,set,REDIS_SET)) return; == NULL || checkType(c,set,OBJ_SET)) return;
/* If count is zero, serve an empty multibulk ASAP to avoid special /* If count is zero, serve an empty multibulk ASAP to avoid special
* cases later. */ * cases later. */
...@@ -481,7 +481,7 @@ void spopWithCountCommand(client *c) { ...@@ -481,7 +481,7 @@ void spopWithCountCommand(client *c) {
if (remaining*SPOP_MOVE_STRATEGY_MUL > count) { if (remaining*SPOP_MOVE_STRATEGY_MUL > count) {
while(count--) { while(count--) {
encoding = setTypeRandomElement(set,&objele,&llele); encoding = setTypeRandomElement(set,&objele,&llele);
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
objele = createStringObjectFromLongLong(llele); objele = createStringObjectFromLongLong(llele);
} else { } else {
incrRefCount(objele); incrRefCount(objele);
...@@ -511,7 +511,7 @@ void spopWithCountCommand(client *c) { ...@@ -511,7 +511,7 @@ void spopWithCountCommand(client *c) {
/* Create a new set with just the remaining elements. */ /* Create a new set with just the remaining elements. */
while(remaining--) { while(remaining--) {
encoding = setTypeRandomElement(set,&objele,&llele); encoding = setTypeRandomElement(set,&objele,&llele);
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
objele = createStringObjectFromLongLong(llele); objele = createStringObjectFromLongLong(llele);
} else { } else {
incrRefCount(objele); incrRefCount(objele);
...@@ -530,7 +530,7 @@ void spopWithCountCommand(client *c) { ...@@ -530,7 +530,7 @@ void spopWithCountCommand(client *c) {
setTypeIterator *si; setTypeIterator *si;
si = setTypeInitIterator(set); si = setTypeInitIterator(set);
while((encoding = setTypeNext(si,&objele,&llele)) != -1) { while((encoding = setTypeNext(si,&objele,&llele)) != -1) {
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
objele = createStringObjectFromLongLong(llele); objele = createStringObjectFromLongLong(llele);
} else { } else {
incrRefCount(objele); incrRefCount(objele);
...@@ -572,13 +572,13 @@ void spopCommand(client *c) { ...@@ -572,13 +572,13 @@ void spopCommand(client *c) {
/* Make sure a key with the name inputted exists, and that it's type is /* Make sure a key with the name inputted exists, and that it's type is
* indeed a set */ * indeed a set */
if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.nullbulk)) == NULL || if ((set = lookupKeyWriteOrReply(c,c->argv[1],shared.nullbulk)) == NULL ||
checkType(c,set,REDIS_SET)) return; checkType(c,set,OBJ_SET)) return;
/* Get a random element from the set */ /* Get a random element from the set */
encoding = setTypeRandomElement(set,&ele,&llele); encoding = setTypeRandomElement(set,&ele,&llele);
/* Remove the element from the set */ /* Remove the element from the set */
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
ele = createStringObjectFromLongLong(llele); ele = createStringObjectFromLongLong(llele);
set->ptr = intsetRemove(set->ptr,llele,NULL); set->ptr = intsetRemove(set->ptr,llele,NULL);
} else { } else {
...@@ -637,7 +637,7 @@ void srandmemberWithCountCommand(client *c) { ...@@ -637,7 +637,7 @@ void srandmemberWithCountCommand(client *c) {
} }
if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.emptymultibulk)) if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.emptymultibulk))
== NULL || checkType(c,set,REDIS_SET)) return; == NULL || checkType(c,set,OBJ_SET)) return;
size = setTypeSize(set); size = setTypeSize(set);
/* If count is zero, serve it ASAP to avoid special cases later. */ /* If count is zero, serve it ASAP to avoid special cases later. */
...@@ -654,7 +654,7 @@ void srandmemberWithCountCommand(client *c) { ...@@ -654,7 +654,7 @@ void srandmemberWithCountCommand(client *c) {
addReplyMultiBulkLen(c,count); addReplyMultiBulkLen(c,count);
while(count--) { while(count--) {
encoding = setTypeRandomElement(set,&ele,&llele); encoding = setTypeRandomElement(set,&ele,&llele);
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
addReplyBulkLongLong(c,llele); addReplyBulkLongLong(c,llele);
} else { } else {
addReplyBulk(c,ele); addReplyBulk(c,ele);
...@@ -691,7 +691,7 @@ void srandmemberWithCountCommand(client *c) { ...@@ -691,7 +691,7 @@ void srandmemberWithCountCommand(client *c) {
while((encoding = setTypeNext(si,&ele,&llele)) != -1) { while((encoding = setTypeNext(si,&ele,&llele)) != -1) {
int retval = DICT_ERR; int retval = DICT_ERR;
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
retval = dictAdd(d,createStringObjectFromLongLong(llele),NULL); retval = dictAdd(d,createStringObjectFromLongLong(llele),NULL);
} else { } else {
retval = dictAdd(d,dupStringObject(ele),NULL); retval = dictAdd(d,dupStringObject(ele),NULL);
...@@ -720,7 +720,7 @@ void srandmemberWithCountCommand(client *c) { ...@@ -720,7 +720,7 @@ void srandmemberWithCountCommand(client *c) {
while(added < count) { while(added < count) {
encoding = setTypeRandomElement(set,&ele,&llele); encoding = setTypeRandomElement(set,&ele,&llele);
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
ele = createStringObjectFromLongLong(llele); ele = createStringObjectFromLongLong(llele);
} else { } else {
ele = dupStringObject(ele); ele = dupStringObject(ele);
...@@ -763,10 +763,10 @@ void srandmemberCommand(client *c) { ...@@ -763,10 +763,10 @@ void srandmemberCommand(client *c) {
} }
if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL || if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL ||
checkType(c,set,REDIS_SET)) return; checkType(c,set,OBJ_SET)) return;
encoding = setTypeRandomElement(set,&ele,&llele); encoding = setTypeRandomElement(set,&ele,&llele);
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
addReplyBulkLongLong(c,llele); addReplyBulkLongLong(c,llele);
} else { } else {
addReplyBulk(c,ele); addReplyBulk(c,ele);
...@@ -812,7 +812,7 @@ void sinterGenericCommand(client *c, robj **setkeys, ...@@ -812,7 +812,7 @@ void sinterGenericCommand(client *c, robj **setkeys,
} }
return; return;
} }
if (checkType(c,setobj,REDIS_SET)) { if (checkType(c,setobj,OBJ_SET)) {
zfree(sets); zfree(sets);
return; return;
} }
...@@ -842,16 +842,16 @@ void sinterGenericCommand(client *c, robj **setkeys, ...@@ -842,16 +842,16 @@ void sinterGenericCommand(client *c, robj **setkeys,
while((encoding = setTypeNext(si,&eleobj,&intobj)) != -1) { while((encoding = setTypeNext(si,&eleobj,&intobj)) != -1) {
for (j = 1; j < setnum; j++) { for (j = 1; j < setnum; j++) {
if (sets[j] == sets[0]) continue; if (sets[j] == sets[0]) continue;
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
/* intset with intset is simple... and fast */ /* intset with intset is simple... and fast */
if (sets[j]->encoding == REDIS_ENCODING_INTSET && if (sets[j]->encoding == OBJ_ENCODING_INTSET &&
!intsetFind((intset*)sets[j]->ptr,intobj)) !intsetFind((intset*)sets[j]->ptr,intobj))
{ {
break; break;
/* in order to compare an integer with an object we /* in order to compare an integer with an object we
* have to use the generic function, creating an object * have to use the generic function, creating an object
* for this */ * for this */
} else if (sets[j]->encoding == REDIS_ENCODING_HT) { } else if (sets[j]->encoding == OBJ_ENCODING_HT) {
eleobj = createStringObjectFromLongLong(intobj); eleobj = createStringObjectFromLongLong(intobj);
if (!setTypeIsMember(sets[j],eleobj)) { if (!setTypeIsMember(sets[j],eleobj)) {
decrRefCount(eleobj); decrRefCount(eleobj);
...@@ -859,12 +859,12 @@ void sinterGenericCommand(client *c, robj **setkeys, ...@@ -859,12 +859,12 @@ void sinterGenericCommand(client *c, robj **setkeys,
} }
decrRefCount(eleobj); decrRefCount(eleobj);
} }
} else if (encoding == REDIS_ENCODING_HT) { } else if (encoding == OBJ_ENCODING_HT) {
/* Optimization... if the source object is integer /* Optimization... if the source object is integer
* encoded AND the target set is an intset, we can get * encoded AND the target set is an intset, we can get
* a much faster path. */ * a much faster path. */
if (eleobj->encoding == REDIS_ENCODING_INT && if (eleobj->encoding == OBJ_ENCODING_INT &&
sets[j]->encoding == REDIS_ENCODING_INTSET && sets[j]->encoding == OBJ_ENCODING_INTSET &&
!intsetFind((intset*)sets[j]->ptr,(long)eleobj->ptr)) !intsetFind((intset*)sets[j]->ptr,(long)eleobj->ptr))
{ {
break; break;
...@@ -879,13 +879,13 @@ void sinterGenericCommand(client *c, robj **setkeys, ...@@ -879,13 +879,13 @@ void sinterGenericCommand(client *c, robj **setkeys,
/* Only take action when all sets contain the member */ /* Only take action when all sets contain the member */
if (j == setnum) { if (j == setnum) {
if (!dstkey) { if (!dstkey) {
if (encoding == REDIS_ENCODING_HT) if (encoding == OBJ_ENCODING_HT)
addReplyBulk(c,eleobj); addReplyBulk(c,eleobj);
else else
addReplyBulkLongLong(c,intobj); addReplyBulkLongLong(c,intobj);
cardinality++; cardinality++;
} else { } else {
if (encoding == REDIS_ENCODING_INTSET) { if (encoding == OBJ_ENCODING_INTSET) {
eleobj = createStringObjectFromLongLong(intobj); eleobj = createStringObjectFromLongLong(intobj);
setTypeAdd(dstset,eleobj); setTypeAdd(dstset,eleobj);
decrRefCount(eleobj); decrRefCount(eleobj);
...@@ -949,7 +949,7 @@ void sunionDiffGenericCommand(client *c, robj **setkeys, int setnum, ...@@ -949,7 +949,7 @@ void sunionDiffGenericCommand(client *c, robj **setkeys, int setnum,
sets[j] = NULL; sets[j] = NULL;
continue; continue;
} }
if (checkType(c,setobj,REDIS_SET)) { if (checkType(c,setobj,OBJ_SET)) {
zfree(sets); zfree(sets);
return; return;
} }
...@@ -1114,6 +1114,6 @@ void sscanCommand(client *c) { ...@@ -1114,6 +1114,6 @@ void sscanCommand(client *c) {
if (parseScanCursorOrReply(c,c->argv[2],&cursor) == REDIS_ERR) return; if (parseScanCursorOrReply(c,c->argv[2],&cursor) == REDIS_ERR) return;
if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.emptyscan)) == NULL || if ((set = lookupKeyReadOrReply(c,c->argv[1],shared.emptyscan)) == NULL ||
checkType(c,set,REDIS_SET)) return; checkType(c,set,OBJ_SET)) return;
scanGenericCommand(c,set,cursor); scanGenericCommand(c,set,cursor);
} }
...@@ -58,11 +58,11 @@ static int checkStringLength(client *c, long long size) { ...@@ -58,11 +58,11 @@ static int checkStringLength(client *c, long long size) {
* If ok_reply is NULL "+OK" is used. * If ok_reply is NULL "+OK" is used.
* If abort_reply is NULL, "$-1" is used. */ * If abort_reply is NULL, "$-1" is used. */
#define REDIS_SET_NO_FLAGS 0 #define OBJ_SET_NO_FLAGS 0
#define REDIS_SET_NX (1<<0) /* Set if key not exists. */ #define OBJ_SET_NX (1<<0) /* Set if key not exists. */
#define REDIS_SET_XX (1<<1) /* Set if key exists. */ #define OBJ_SET_XX (1<<1) /* Set if key exists. */
#define REDIS_SET_EX (1<<2) /* Set if time in seconds is given */ #define OBJ_SET_EX (1<<2) /* Set if time in seconds is given */
#define REDIS_SET_PX (1<<3) /* Set if time in ms in given */ #define OBJ_SET_PX (1<<3) /* Set if time in ms in given */
void setGenericCommand(client *c, int flags, robj *key, robj *val, robj *expire, int unit, robj *ok_reply, robj *abort_reply) { void setGenericCommand(client *c, int flags, robj *key, robj *val, robj *expire, int unit, robj *ok_reply, robj *abort_reply) {
long long milliseconds = 0; /* initialized to avoid any harmness warning */ long long milliseconds = 0; /* initialized to avoid any harmness warning */
...@@ -77,8 +77,8 @@ void setGenericCommand(client *c, int flags, robj *key, robj *val, robj *expire, ...@@ -77,8 +77,8 @@ void setGenericCommand(client *c, int flags, robj *key, robj *val, robj *expire,
if (unit == UNIT_SECONDS) milliseconds *= 1000; if (unit == UNIT_SECONDS) milliseconds *= 1000;
} }
if ((flags & REDIS_SET_NX && lookupKeyWrite(c->db,key) != NULL) || if ((flags & OBJ_SET_NX && lookupKeyWrite(c->db,key) != NULL) ||
(flags & REDIS_SET_XX && lookupKeyWrite(c->db,key) == NULL)) (flags & OBJ_SET_XX && lookupKeyWrite(c->db,key) == NULL))
{ {
addReply(c, abort_reply ? abort_reply : shared.nullbulk); addReply(c, abort_reply ? abort_reply : shared.nullbulk);
return; return;
...@@ -97,7 +97,7 @@ void setCommand(client *c) { ...@@ -97,7 +97,7 @@ void setCommand(client *c) {
int j; int j;
robj *expire = NULL; robj *expire = NULL;
int unit = UNIT_SECONDS; int unit = UNIT_SECONDS;
int flags = REDIS_SET_NO_FLAGS; int flags = OBJ_SET_NO_FLAGS;
for (j = 3; j < c->argc; j++) { for (j = 3; j < c->argc; j++) {
char *a = c->argv[j]->ptr; char *a = c->argv[j]->ptr;
...@@ -105,27 +105,27 @@ void setCommand(client *c) { ...@@ -105,27 +105,27 @@ void setCommand(client *c) {
if ((a[0] == 'n' || a[0] == 'N') && if ((a[0] == 'n' || a[0] == 'N') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' && (a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_XX)) !(flags & OBJ_SET_XX))
{ {
flags |= REDIS_SET_NX; flags |= OBJ_SET_NX;
} else if ((a[0] == 'x' || a[0] == 'X') && } else if ((a[0] == 'x' || a[0] == 'X') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' && (a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_NX)) !(flags & OBJ_SET_NX))
{ {
flags |= REDIS_SET_XX; flags |= OBJ_SET_XX;
} else if ((a[0] == 'e' || a[0] == 'E') && } else if ((a[0] == 'e' || a[0] == 'E') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' && (a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_PX) && next) !(flags & OBJ_SET_PX) && next)
{ {
flags |= REDIS_SET_EX; flags |= OBJ_SET_EX;
unit = UNIT_SECONDS; unit = UNIT_SECONDS;
expire = next; expire = next;
j++; j++;
} else if ((a[0] == 'p' || a[0] == 'P') && } else if ((a[0] == 'p' || a[0] == 'P') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' && (a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_EX) && next) !(flags & OBJ_SET_EX) && next)
{ {
flags |= REDIS_SET_PX; flags |= OBJ_SET_PX;
unit = UNIT_MILLISECONDS; unit = UNIT_MILLISECONDS;
expire = next; expire = next;
j++; j++;
...@@ -141,17 +141,17 @@ void setCommand(client *c) { ...@@ -141,17 +141,17 @@ void setCommand(client *c) {
void setnxCommand(client *c) { void setnxCommand(client *c) {
c->argv[2] = tryObjectEncoding(c->argv[2]); c->argv[2] = tryObjectEncoding(c->argv[2]);
setGenericCommand(c,REDIS_SET_NX,c->argv[1],c->argv[2],NULL,0,shared.cone,shared.czero); setGenericCommand(c,OBJ_SET_NX,c->argv[1],c->argv[2],NULL,0,shared.cone,shared.czero);
} }
void setexCommand(client *c) { void setexCommand(client *c) {
c->argv[3] = tryObjectEncoding(c->argv[3]); c->argv[3] = tryObjectEncoding(c->argv[3]);
setGenericCommand(c,REDIS_SET_NO_FLAGS,c->argv[1],c->argv[3],c->argv[2],UNIT_SECONDS,NULL,NULL); setGenericCommand(c,OBJ_SET_NO_FLAGS,c->argv[1],c->argv[3],c->argv[2],UNIT_SECONDS,NULL,NULL);
} }
void psetexCommand(client *c) { void psetexCommand(client *c) {
c->argv[3] = tryObjectEncoding(c->argv[3]); c->argv[3] = tryObjectEncoding(c->argv[3]);
setGenericCommand(c,REDIS_SET_NO_FLAGS,c->argv[1],c->argv[3],c->argv[2],UNIT_MILLISECONDS,NULL,NULL); setGenericCommand(c,OBJ_SET_NO_FLAGS,c->argv[1],c->argv[3],c->argv[2],UNIT_MILLISECONDS,NULL,NULL);
} }
int getGenericCommand(client *c) { int getGenericCommand(client *c) {
...@@ -160,7 +160,7 @@ int getGenericCommand(client *c) { ...@@ -160,7 +160,7 @@ int getGenericCommand(client *c) {
if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL) if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL)
return REDIS_OK; return REDIS_OK;
if (o->type != REDIS_STRING) { if (o->type != OBJ_STRING) {
addReply(c,shared.wrongtypeerr); addReply(c,shared.wrongtypeerr);
return REDIS_ERR; return REDIS_ERR;
} else { } else {
...@@ -206,13 +206,13 @@ void setrangeCommand(client *c) { ...@@ -206,13 +206,13 @@ void setrangeCommand(client *c) {
if (checkStringLength(c,offset+sdslen(value)) != REDIS_OK) if (checkStringLength(c,offset+sdslen(value)) != REDIS_OK)
return; return;
o = createObject(REDIS_STRING,sdsnewlen(NULL, offset+sdslen(value))); o = createObject(OBJ_STRING,sdsnewlen(NULL, offset+sdslen(value)));
dbAdd(c->db,c->argv[1],o); dbAdd(c->db,c->argv[1],o);
} else { } else {
size_t olen; size_t olen;
/* Key exists, check type */ /* Key exists, check type */
if (checkType(c,o,REDIS_STRING)) if (checkType(c,o,OBJ_STRING))
return; return;
/* Return existing string length when setting nothing */ /* Return existing string length when setting nothing */
...@@ -252,9 +252,9 @@ void getrangeCommand(client *c) { ...@@ -252,9 +252,9 @@ void getrangeCommand(client *c) {
if (getLongLongFromObjectOrReply(c,c->argv[3],&end,NULL) != REDIS_OK) if (getLongLongFromObjectOrReply(c,c->argv[3],&end,NULL) != REDIS_OK)
return; return;
if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.emptybulk)) == NULL || if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.emptybulk)) == NULL ||
checkType(c,o,REDIS_STRING)) return; checkType(c,o,OBJ_STRING)) return;
if (o->encoding == REDIS_ENCODING_INT) { if (o->encoding == OBJ_ENCODING_INT) {
str = llbuf; str = llbuf;
strlen = ll2string(llbuf,sizeof(llbuf),(long)o->ptr); strlen = ll2string(llbuf,sizeof(llbuf),(long)o->ptr);
} else { } else {
...@@ -287,7 +287,7 @@ void mgetCommand(client *c) { ...@@ -287,7 +287,7 @@ void mgetCommand(client *c) {
if (o == NULL) { if (o == NULL) {
addReply(c,shared.nullbulk); addReply(c,shared.nullbulk);
} else { } else {
if (o->type != REDIS_STRING) { if (o->type != OBJ_STRING) {
addReply(c,shared.nullbulk); addReply(c,shared.nullbulk);
} else { } else {
addReplyBulk(c,o); addReplyBulk(c,o);
...@@ -339,7 +339,7 @@ void incrDecrCommand(client *c, long long incr) { ...@@ -339,7 +339,7 @@ void incrDecrCommand(client *c, long long incr) {
robj *o, *new; robj *o, *new;
o = lookupKeyWrite(c->db,c->argv[1]); o = lookupKeyWrite(c->db,c->argv[1]);
if (o != NULL && checkType(c,o,REDIS_STRING)) return; if (o != NULL && checkType(c,o,OBJ_STRING)) return;
if (getLongLongFromObjectOrReply(c,o,&value,NULL) != REDIS_OK) return; if (getLongLongFromObjectOrReply(c,o,&value,NULL) != REDIS_OK) return;
oldvalue = value; oldvalue = value;
...@@ -350,7 +350,7 @@ void incrDecrCommand(client *c, long long incr) { ...@@ -350,7 +350,7 @@ void incrDecrCommand(client *c, long long incr) {
} }
value += incr; value += incr;
if (o && o->refcount == 1 && o->encoding == REDIS_ENCODING_INT && if (o && o->refcount == 1 && o->encoding == OBJ_ENCODING_INT &&
(value < 0 || value >= REDIS_SHARED_INTEGERS) && (value < 0 || value >= REDIS_SHARED_INTEGERS) &&
value >= LONG_MIN && value <= LONG_MAX) value >= LONG_MIN && value <= LONG_MAX)
{ {
...@@ -399,7 +399,7 @@ void incrbyfloatCommand(client *c) { ...@@ -399,7 +399,7 @@ void incrbyfloatCommand(client *c) {
robj *o, *new, *aux; robj *o, *new, *aux;
o = lookupKeyWrite(c->db,c->argv[1]); o = lookupKeyWrite(c->db,c->argv[1]);
if (o != NULL && checkType(c,o,REDIS_STRING)) return; if (o != NULL && checkType(c,o,OBJ_STRING)) return;
if (getLongDoubleFromObjectOrReply(c,o,&value,NULL) != REDIS_OK || if (getLongDoubleFromObjectOrReply(c,o,&value,NULL) != REDIS_OK ||
getLongDoubleFromObjectOrReply(c,c->argv[2],&incr,NULL) != REDIS_OK) getLongDoubleFromObjectOrReply(c,c->argv[2],&incr,NULL) != REDIS_OK)
return; return;
...@@ -441,7 +441,7 @@ void appendCommand(client *c) { ...@@ -441,7 +441,7 @@ void appendCommand(client *c) {
totlen = stringObjectLen(c->argv[2]); totlen = stringObjectLen(c->argv[2]);
} else { } else {
/* Key exists, check type */ /* Key exists, check type */
if (checkType(c,o,REDIS_STRING)) if (checkType(c,o,OBJ_STRING))
return; return;
/* "append" is an argument, so always an sds */ /* "append" is an argument, so always an sds */
...@@ -464,6 +464,6 @@ void appendCommand(client *c) { ...@@ -464,6 +464,6 @@ void appendCommand(client *c) {
void strlenCommand(client *c) { void strlenCommand(client *c) {
robj *o; robj *o;
if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL || if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
checkType(c,o,REDIS_STRING)) return; checkType(c,o,OBJ_STRING)) return;
addReplyLongLong(c,stringObjectLen(o)); addReplyLongLong(c,stringObjectLen(o));
} }
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment