1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
//! `Store` sorted-set range / pop / range-removal commands
//! (`ZRANGE` / `ZRANGEBYSCORE` / `ZCOUNT` / `ZPOPMIN` / `ZREMRANGEBY*`).
//! Split out of `zset.rs` to keep it under the 500-LOC house cap; the
//! write-path core (`ZADD` / `ZREM` / `ZINCRBY`) stays there.
use crate::util::range_bounds;
use crate::value::{ScoreBound, Value};
use crate::{Store, StoreError};
impl Store {
/// `ZRANGE key start stop` by rank.
pub fn zrange(
&mut self,
key: &[u8],
start: i64,
stop: i64,
) -> Result<Vec<(Vec<u8>, f64)>, StoreError> {
match self.live_entry(key) {
None => Ok(Vec::new()),
Some(e) => match &e.value {
Value::ZSet(z) => Ok(match range_bounds(start, stop, z.len()) {
None => Vec::new(),
Some((s, end)) => z
.ordered()
.skip(s)
.take(end - s + 1)
.map(|(m, sc)| (m.to_vec(), sc))
.collect(),
}),
Value::SmallZSetInline(z) => {
let mut entries: Vec<(Vec<u8>, f64)> =
z.iter().map(|(m, sc)| (m.to_vec(), sc)).collect();
entries.sort_by(|a, b| {
a.1.total_cmp(&b.1).then_with(|| a.0.cmp(&b.0))
});
Ok(match range_bounds(start, stop, entries.len()) {
None => Vec::new(),
Some((s, end)) => entries.into_iter().skip(s).take(end - s + 1).collect(),
})
}
_ => Err(StoreError::WrongType),
},
}
}
/// `ZRANGEBYSCORE`.
pub fn zrange_by_score(
&mut self,
key: &[u8],
min: ScoreBound,
max: ScoreBound,
) -> Result<Vec<(Vec<u8>, f64)>, StoreError> {
match self.live_entry(key) {
None => Ok(Vec::new()),
Some(e) => match &e.value {
Value::ZSet(z) => Ok(z
.ordered()
.filter(|(_, sc)| min.ge_ok(*sc) && max.le_ok(*sc))
.map(|(m, sc)| (m.to_vec(), sc))
.collect()),
Value::SmallZSetInline(z) => {
let mut entries: Vec<(Vec<u8>, f64)> = z
.iter()
.filter(|(_, sc)| min.ge_ok(*sc) && max.le_ok(*sc))
.map(|(m, sc)| (m.to_vec(), sc))
.collect();
entries.sort_by(|a, b| {
a.1.total_cmp(&b.1).then_with(|| a.0.cmp(&b.0))
});
Ok(entries)
}
_ => Err(StoreError::WrongType),
},
}
}
/// `ZCOUNT`.
pub fn zcount(
&mut self,
key: &[u8],
min: ScoreBound,
max: ScoreBound,
) -> Result<usize, StoreError> {
match self.live_entry(key) {
None => Ok(0),
Some(e) => match &e.value {
Value::ZSet(z) => Ok(z
.ordered()
.filter(|(_, sc)| min.ge_ok(*sc) && max.le_ok(*sc))
.count()),
Value::SmallZSetInline(z) => Ok(z
.iter()
.filter(|(_, sc)| min.ge_ok(*sc) && max.le_ok(*sc))
.count()),
_ => Err(StoreError::WrongType),
},
}
}
/// `ZPOPMIN key [count]` — pop and return the `count` lowest-scored
/// members (ascending by `(score, member)`). Returns `(member,
/// score)` pairs in pop order; empty when the key is absent / empty.
pub fn zpopmin(
&mut self,
key: &[u8],
count: usize,
) -> Result<Vec<(Vec<u8>, f64)>, StoreError> {
if count == 0 {
// Validate type up-front so ZPOPMIN k 0 against a wrong-type
// key still reports WRONGTYPE (Redis behaviour).
if let Some(e) = self.live_entry(key) {
match &e.value {
Value::ZSet(_) | Value::SmallZSetInline(_) => {}
_ => return Err(StoreError::WrongType),
}
}
return Ok(Vec::new());
}
// Snapshot the lowest `count` members first (immutable borrow),
// then remove them via the shared zrem path (which handles the
// encoding, weight accounting, and empty-key cleanup uniformly).
let to_pop: Vec<(Vec<u8>, f64)> = match self.live_entry(key) {
None => return Ok(Vec::new()),
Some(e) => match &e.value {
Value::ZSet(z) => z
.ordered()
.take(count)
.map(|(m, sc)| (m.to_vec(), sc))
.collect(),
Value::SmallZSetInline(z) => {
let mut entries: Vec<(Vec<u8>, f64)> =
z.iter().map(|(m, sc)| (m.to_vec(), sc)).collect();
entries.sort_by(|a, b| a.1.total_cmp(&b.1).then_with(|| a.0.cmp(&b.0)));
entries.into_iter().take(count).collect()
}
_ => return Err(StoreError::WrongType),
},
};
if to_pop.is_empty() {
return Ok(to_pop);
}
let borrowed: Vec<&[u8]> = to_pop.iter().map(|(m, _)| m.as_slice()).collect();
self.zrem_borrowed(key, &borrowed)?;
Ok(to_pop)
}
/// v2.4 `zpopmin_below` — pop up to `count` lowest-scored members
/// whose score is `< below` (strictly). The delayed-job primitive:
/// "pop everything that is due" in one atomic call (score = due
/// time, `below` = now). Absent key = empty; wrong type errors.
pub fn zpopmin_below(
&mut self,
key: &[u8],
below: f64,
count: usize,
) -> Result<Vec<(Vec<u8>, f64)>, StoreError> {
if count == 0 {
if let Some(e) = self.live_entry(key) {
match &e.value {
Value::ZSet(_) | Value::SmallZSetInline(_) => {}
_ => return Err(StoreError::WrongType),
}
}
return Ok(Vec::new());
}
let to_pop: Vec<(Vec<u8>, f64)> = match self.live_entry(key) {
None => return Ok(Vec::new()),
Some(e) => match &e.value {
Value::ZSet(z) => z
.ordered()
.take_while(|(_, sc)| *sc < below)
.take(count)
.map(|(m, sc)| (m.to_vec(), sc))
.collect(),
Value::SmallZSetInline(z) => {
let mut entries: Vec<(Vec<u8>, f64)> =
z.iter().map(|(m, sc)| (m.to_vec(), sc)).collect();
entries.sort_by(|a, b| a.1.total_cmp(&b.1).then_with(|| a.0.cmp(&b.0)));
entries
.into_iter()
.take_while(|(_, sc)| *sc < below)
.take(count)
.collect()
}
_ => return Err(StoreError::WrongType),
},
};
if to_pop.is_empty() {
return Ok(to_pop);
}
let borrowed: Vec<&[u8]> = to_pop.iter().map(|(m, _)| m.as_slice()).collect();
self.zrem_borrowed(key, &borrowed)?;
Ok(to_pop)
}
/// `ZREMRANGEBYRANK key start stop` — remove members in the rank
/// range `[start, stop]` (inclusive, negative indices count from
/// the tail). Returns the number of members removed.
pub fn zrem_range_by_rank(
&mut self,
key: &[u8],
start: i64,
stop: i64,
) -> Result<usize, StoreError> {
let to_remove: Vec<Vec<u8>> = match self.live_entry(key) {
None => return Ok(0),
Some(e) => match &e.value {
Value::ZSet(z) => match crate::util::range_bounds(start, stop, z.len()) {
None => return Ok(0),
Some((s, end)) => z
.ordered()
.skip(s)
.take(end - s + 1)
.map(|(m, _)| m.to_vec())
.collect(),
},
Value::SmallZSetInline(z) => {
let mut entries: Vec<(Vec<u8>, f64)> =
z.iter().map(|(m, sc)| (m.to_vec(), sc)).collect();
entries.sort_by(|a, b| a.1.total_cmp(&b.1).then_with(|| a.0.cmp(&b.0)));
match crate::util::range_bounds(start, stop, entries.len()) {
None => return Ok(0),
Some((s, end)) => entries
.into_iter()
.skip(s)
.take(end - s + 1)
.map(|(m, _)| m)
.collect(),
}
}
_ => return Err(StoreError::WrongType),
},
};
if to_remove.is_empty() {
return Ok(0);
}
let borrowed: Vec<&[u8]> = to_remove.iter().map(Vec::as_slice).collect();
self.zrem_borrowed(key, &borrowed)
}
/// `ZREMRANGEBYSCORE key min max` — remove every member whose score
/// satisfies `min ≤ score ≤ max` (with `(` for exclusive bounds via
/// `ScoreBound`). Returns the number removed.
pub fn zrem_range_by_score(
&mut self,
key: &[u8],
min: ScoreBound,
max: ScoreBound,
) -> Result<usize, StoreError> {
// Reuse zrange_by_score's bound logic to materialise the hit set
// — keeps inline / heap parity in one place.
let hits = self.zrange_by_score(key, min, max)?;
if hits.is_empty() {
// Still need to honour wrong-type errors that zrange_by_score
// already surfaced; here Ok([]) means empty match, not type
// mismatch, so it's safe to early-return.
return Ok(0);
}
let borrowed: Vec<&[u8]> = hits.iter().map(|(m, _)| m.as_slice()).collect();
self.zrem_borrowed(key, &borrowed)
}
/// `ZREVRANGEBYSCORE` — `zrange_by_score` reversed. Bounds are
/// passed in the `(min, max)` order already (the caller is
/// responsible for swapping the user-facing `max first, min second`
/// at the dispatch layer).
pub fn zrev_range_by_score(
&mut self,
key: &[u8],
min: ScoreBound,
max: ScoreBound,
) -> Result<Vec<(Vec<u8>, f64)>, StoreError> {
let mut v = self.zrange_by_score(key, min, max)?;
v.reverse();
Ok(v)
}
}