fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +00:00
Code Issues Projects Releases Wiki Activity

Skiplist theoretical fix

Browse Source
This commit is contained in:
antirez 2010-04-08 15:56:21 +02:00
parent 454eea7c44
commit 6fcb180039
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redis.c
View File

@ -5092,7 +5092,7 @@ static int zslRandomLevel(void) {
int level = 1; int level = 1;
while ((random()&0xFFFF) < (ZSKIPLIST_P * 0xFFFF)) while ((random()&0xFFFF) < (ZSKIPLIST_P * 0xFFFF))
level += 1; level += 1;
return level; return (level<ZSKIPLIST_MAXLEVEL) ? level : (ZSKIPLIST_MAXLEVEL-1);
} }
static void zslInsert(zskiplist *zsl, double score, robj *obj) { static void zslInsert(zskiplist *zsl, double score, robj *obj) {

11
redis.tcl
View File

@ -33,6 +33,7 @@ array set ::redis::fd {}
array set ::redis::blocking {} array set ::redis::blocking {}
array set ::redis::callback {} array set ::redis::callback {}
array set ::redis::state {} ;# State in non-blocking reply reading array set ::redis::state {} ;# State in non-blocking reply reading
array set ::redis::statestack {} ;# Stack of states, for nested mbulks
array set ::redis::bulkarg {} array set ::redis::bulkarg {}
array set ::redis::multibulkarg {} array set ::redis::multibulkarg {}
@ -117,6 +118,7 @@ proc ::redis::__method__close {id fd} {
catch {unset ::redis::fd($id)} catch {unset ::redis::fd($id)}
catch {unset ::redis::blocking($id)} catch {unset ::redis::blocking($id)}
catch {unset ::redis::state($id)} catch {unset ::redis::state($id)}
catch {unset ::redis::statestack($id)}
catch {unset ::redis::callback($id)} catch {unset ::redis::callback($id)}
catch {interp alias {} ::redis::redisHandle$id {}} catch {interp alias {} ::redis::redisHandle$id {}}
} }
@ -176,6 +178,7 @@ proc ::redis::redis_read_reply fd {
proc ::redis::redis_reset_state id { proc ::redis::redis_reset_state id {
set ::redis::state($id) [dict create buf {} mbulk -1 bulk -1 reply {}] set ::redis::state($id) [dict create buf {} mbulk -1 bulk -1 reply {}]
set ::redis::statestack($id) {}
} }
proc ::redis::redis_call_callback {id type reply} { proc ::redis::redis_call_callback {id type reply} {
@ -209,7 +212,13 @@ proc ::redis::redis_readable {fd id} {
::redis::redis_readable $fd $id ::redis::redis_readable $fd $id
} }
} }
* {dict set ::redis::state($id) mbulk [string range $line 1 end-1]} * {
dict set ::redis::state($id) mbulk [string range $line 1 end-1]
# Handle *-1
if {[dict get $::redis::state($id) mbulk] == -1} {
redis_call_callback $id reply {}
}
}
default { default {
redis_call_callback $id err \ redis_call_callback $id err \
"Bad protocol, $type as reply type byte" "Bad protocol, $type as reply type byte"