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
d1c920c5
Commit
d1c920c5
authored
Mar 09, 2011
by
Pieter Noordhuis
Browse files
Support dual encoding for more commands
parent
aff255c8
Changes
1
Show whitespace changes
Inline
Side-by-side
src/t_zset.c
View file @
d1c920c5
...
@@ -658,7 +658,7 @@ int zzlInsert(robj *zobj, robj *ele, double score) {
...
@@ -658,7 +658,7 @@ int zzlInsert(robj *zobj, robj *ele, double score) {
break;
break;
} else if (s == score) {
} else if (s == score) {
/* Ensure lexicographical ordering for elements. */
/* Ensure lexicographical ordering for elements. */
if (zzlCompareElements(eptr,ele->ptr,sdslen(ele->ptr))
<
0) {
if (zzlCompareElements(eptr,ele->ptr,sdslen(ele->ptr))
>
0) {
zzlInsertAt(zobj,ele,score,eptr);
zzlInsertAt(zobj,ele,score,eptr);
break;
break;
}
}
...
@@ -1505,67 +1505,104 @@ void zcountCommand(redisClient *c) {
...
@@ -1505,67 +1505,104 @@ void zcountCommand(redisClient *c) {
}
}
void zcardCommand(redisClient *c) {
void zcardCommand(redisClient *c) {
robj *
o
;
robj *
key = c->argv[1]
;
zset *zs
;
robj *zobj
;
if ((
o
= lookupKeyReadOrReply(c,
c->argv[1]
,shared.czero)) == NULL ||
if ((
zobj
= lookupKeyReadOrReply(c,
key
,shared.czero)) == NULL ||
checkType(c,
o
,REDIS_ZSET)) return;
checkType(c,
zobj
,REDIS_ZSET)) return;
zs = o->ptr;
addReplyLongLong(c,zzlLength(zobj));
addReplyLongLong(c,zs->zsl->length);
}
}
void zscoreCommand(redisClient *c) {
void zscoreCommand(redisClient *c) {
robj *o;
robj *key = c->argv[1];
zset *zs;
robj *zobj;
dictEntry *de;
double score;
if ((zobj = lookupKeyReadOrReply(c,key,shared.nullbulk)) == NULL ||
checkType(c,zobj,REDIS_ZSET)) return;
if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL ||
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
checkType(c,o,REDIS_ZSET)) return;
if (zzlFind(zobj,c->argv[2],&score) != NULL)
addReplyDouble(c,score);
else
addReply(c,shared.nullbulk);
} else if (zobj->encoding == REDIS_ENCODING_RAW) {
zset *zs = zobj->ptr;
dictEntry *de;
zs = o->ptr;
c->argv[2] = tryObjectEncoding(c->argv[2]);
c->argv[2] = tryObjectEncoding(c->argv[2]);
de = dictFind(zs->dict,c->argv[2]);
de = dictFind(zs->dict,c->argv[2]);
if (!de) {
if (de != NULL) {
score = *(double*)dictGetEntryVal(de);
addReplyDouble(c,score);
} else {
addReply(c,shared.nullbulk);
addReply(c,shared.nullbulk);
}
} else {
} else {
double *score = dictGetEntryVal(de);
redisPanic("Unknown sorted set encoding");
addReplyDouble(c,*score);
}
}
}
}
void zrankGenericCommand(redisClient *c, int reverse) {
void zrankGenericCommand(redisClient *c, int reverse) {
robj *
o
;
robj *
key = c->argv[1]
;
zset *zs
;
robj *ele = c->argv[2]
;
zskiplist *zsl
;
robj *zobj
;
dictEntry *de
;
unsigned long llen
;
unsigned long rank;
unsigned long rank;
double *score;
if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL ||
if ((zobj = lookupKeyReadOrReply(c,key,shared.nullbulk)) == NULL ||
checkType(c,o,REDIS_ZSET)) return;
checkType(c,zobj,REDIS_ZSET)) return;
llen = zsLength(zobj);
zs = o->ptr;
redisAssert(ele->encoding == REDIS_ENCODING_RAW);
zsl = zs->zsl;
if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {
c->argv[2] = tryObjectEncoding(c->argv[2]);
unsigned char *zl = zobj->ptr;
de = dictFind(zs->dict,c->argv[2]);
unsigned char *eptr, *sptr;
if (!de) {
addReply(c,shared.nullbulk);
eptr = ziplistIndex(zl,0);
return;
redisAssert(eptr != NULL);
sptr = ziplistNext(zl,eptr);
redisAssert(sptr != NULL);
rank = 1;
while(eptr != NULL) {
if (ziplistCompare(eptr,ele->ptr,sdslen(ele->ptr)))
break;
rank++;
zzlNext(zl,&eptr,&sptr);
}
}
score = dictGetEntryVal(de);
if (eptr != NULL) {
rank = zslGetRank(zsl, *score, c->argv[2]);
if (reverse)
if (
rank)
{
addReplyLongLong(c,llen-
rank)
;
if (reverse) {
else
addReplyLongLong(c,
zsl->length -
rank);
addReplyLongLong(c,rank
-1
);
} else {
} else {
addReply
LongLong(c, rank-1
);
addReply
(c,shared.nullbulk
);
}
}
} else if (zobj->encoding == REDIS_ENCODING_RAW) {
zset *zs = zobj->ptr;
zskiplist *zsl = zs->zsl;
dictEntry *de;
double score;
ele = c->argv[2] = tryObjectEncoding(c->argv[2]);
de = dictFind(zs->dict,ele);
if (de != NULL) {
score = *(double*)dictGetEntryVal(de);
rank = zslGetRank(zsl,score,ele);
redisAssert(rank); /* Existing elements always have a rank. */
if (reverse)
addReplyLongLong(c,llen-rank);
else
addReplyLongLong(c,rank-1);
} else {
} else {
addReply(c,shared.nullbulk);
addReply(c,shared.nullbulk);
}
}
} else {
redisPanic("Unknown sorted set encoding");
}
}
}
void zrankCommand(redisClient *c) {
void zrankCommand(redisClient *c) {
...
...
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