mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5936f8a514 into a0b22576b8

This commit is contained in:
Mincho Paskalev 2025-05-13 21:09:37 +08:00 committed by GitHub
parent a0b22576b8 5936f8a514
commit f33edeb6fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/t_hash.c
View File

@ -920,9 +920,13 @@ int hashTypeSet(redisDb *db, robj *o, sds field, sds value, int flags) {
} }
if (!update) { if (!update) {
listpackEntry entries[2] = {
{.sval = (unsigned char*) field, .slen = sdslen(field)},
{.sval = (unsigned char*) value, .slen = sdslen(value)},
};
/* Push new field/value pair onto the tail of the listpack */ /* Push new field/value pair onto the tail of the listpack */
zl = lpAppend(zl, (unsigned char*)field, sdslen(field)); zl = lpBatchAppend(zl, entries, 2);
zl = lpAppend(zl, (unsigned char*)value, sdslen(value));
} }
o->ptr = zl; o->ptr = zl;

30
src/t_zset.c
View File

@ -1075,29 +1075,29 @@ unsigned char *zzlDelete(unsigned char *zl, unsigned char *eptr) {
} }
unsigned char *zzlInsertAt(unsigned char *zl, unsigned char *eptr, sds ele, double score) { unsigned char *zzlInsertAt(unsigned char *zl, unsigned char *eptr, sds ele, double score) {
unsigned char *sptr;
char scorebuf[MAX_D2STRING_CHARS]; char scorebuf[MAX_D2STRING_CHARS];
int scorelen = 0; int scorelen = 0;
long long lscore; long long lscore;
int score_is_long = double2ll(score, &lscore); int score_is_long = double2ll(score, &lscore);
if (!score_is_long) if (!score_is_long)
scorelen = d2string(scorebuf,sizeof(scorebuf),score); scorelen = d2string(scorebuf,sizeof(scorebuf),score);
if (eptr == NULL) {
zl = lpAppend(zl,(unsigned char*)ele,sdslen(ele));
if (score_is_long)
zl = lpAppendInteger(zl,lscore);
else
zl = lpAppend(zl,(unsigned char*)scorebuf,scorelen);
} else {
/* Insert member before the element 'eptr'. */
zl = lpInsertString(zl,(unsigned char*)ele,sdslen(ele),eptr,LP_BEFORE,&sptr);
/* Insert score after the member. */ listpackEntry entries[2];
if (score_is_long) entries[0].sval = (unsigned char*)ele;
zl = lpInsertInteger(zl,lscore,sptr,LP_AFTER,NULL); entries[0].slen = sdslen(ele);
else if (score_is_long) {
zl = lpInsertString(zl,(unsigned char*)scorebuf,scorelen,sptr,LP_AFTER,NULL); entries[1].sval = NULL;
entries[1].lval = lscore;
} else {
entries[1].sval = (unsigned char*)scorebuf;
entries[1].slen = scorelen;
} }
if (eptr == NULL)
zl = lpBatchAppend(zl, entries, 2);
else
zl = lpBatchInsert(zl, eptr, LP_BEFORE, entries, 2, NULL);
return zl; return zl;
} }