resplite 1.2.8 → 1.2.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
package/src/commands/registry.js
CHANGED
|
@@ -53,6 +53,7 @@ import * as zrem from './zrem.js';
|
|
|
53
53
|
import * as zcard from './zcard.js';
|
|
54
54
|
import * as zscore from './zscore.js';
|
|
55
55
|
import * as zrange from './zrange.js';
|
|
56
|
+
import * as zrevrange from './zrevrange.js';
|
|
56
57
|
import * as zrangebyscore from './zrangebyscore.js';
|
|
57
58
|
import * as sqliteInfo from './sqlite-info.js';
|
|
58
59
|
import * as cacheInfo from './cache-info.js';
|
|
@@ -118,6 +119,7 @@ const HANDLERS = new Map([
|
|
|
118
119
|
['ZCARD', (e, a) => zcard.handleZcard(e, a)],
|
|
119
120
|
['ZSCORE', (e, a) => zscore.handleZscore(e, a)],
|
|
120
121
|
['ZRANGE', (e, a) => zrange.handleZrange(e, a)],
|
|
122
|
+
['ZREVRANGE', (e, a) => zrevrange.handleZrevrange(e, a)],
|
|
121
123
|
['ZRANGEBYSCORE', (e, a) => zrangebyscore.handleZrangebyscore(e, a)],
|
|
122
124
|
['SQLITE.INFO', (e, a) => sqliteInfo.handleSqliteInfo(e, a)],
|
|
123
125
|
['CACHE.INFO', (e, a) => cacheInfo.handleCacheInfo(e, a)],
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ZREVRANGE key start stop [WITHSCORES]
|
|
3
|
+
* Same as ZRANGE but ordered from highest to lowest score (rank 0 = highest).
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
export function handleZrevrange(engine, args) {
|
|
7
|
+
if (!args || args.length < 3) {
|
|
8
|
+
return { error: 'ERR wrong number of arguments for \'ZREVRANGE\' command' };
|
|
9
|
+
}
|
|
10
|
+
let withScores = false;
|
|
11
|
+
for (let i = 3; i < args.length; i++) {
|
|
12
|
+
const a = (Buffer.isBuffer(args[i]) ? args[i].toString('utf8') : String(args[i])).toUpperCase();
|
|
13
|
+
if (a === 'WITHSCORES') withScores = true;
|
|
14
|
+
}
|
|
15
|
+
try {
|
|
16
|
+
const start = parseInt(String(args[1]), 10);
|
|
17
|
+
const stop = parseInt(String(args[2]), 10);
|
|
18
|
+
if (Number.isNaN(start) || Number.isNaN(stop)) {
|
|
19
|
+
return { error: 'ERR value is not an integer or out of range' };
|
|
20
|
+
}
|
|
21
|
+
const arr = engine.zrevrange(args[0], start, stop, { withScores });
|
|
22
|
+
return arr;
|
|
23
|
+
} catch (e) {
|
|
24
|
+
const msg = e && e.message ? e.message : String(e);
|
|
25
|
+
return { error: msg.startsWith('ERR ') ? msg : msg.startsWith('WRONGTYPE') ? msg : 'ERR ' + msg };
|
|
26
|
+
}
|
|
27
|
+
}
|
package/src/engine/engine.js
CHANGED
|
@@ -387,6 +387,14 @@ export function createEngine(opts = {}) {
|
|
|
387
387
|
return zsets.rangeByRank(k, start, stop, { withScores: options.withScores });
|
|
388
388
|
},
|
|
389
389
|
|
|
390
|
+
zrevrange(key, start, stop, options = {}) {
|
|
391
|
+
const k = asKey(key);
|
|
392
|
+
const meta = getKeyMeta(key);
|
|
393
|
+
if (!meta) return [];
|
|
394
|
+
expectZset(meta);
|
|
395
|
+
return zsets.rangeByRankReverse(k, start, stop, { withScores: options.withScores });
|
|
396
|
+
},
|
|
397
|
+
|
|
390
398
|
zrangebyscore(key, min, max, options = {}) {
|
|
391
399
|
const k = asKey(key);
|
|
392
400
|
const meta = getKeyMeta(key);
|
|
@@ -36,6 +36,12 @@ export function createZsetsStorage(db, keys) {
|
|
|
36
36
|
ORDER BY score ASC, member ASC
|
|
37
37
|
LIMIT ? OFFSET ?`
|
|
38
38
|
);
|
|
39
|
+
const rangeByRankReverseStmt = db.prepare(
|
|
40
|
+
`SELECT member, score FROM redis_zsets
|
|
41
|
+
WHERE key = ?
|
|
42
|
+
ORDER BY score DESC, member DESC
|
|
43
|
+
LIMIT ? OFFSET ?`
|
|
44
|
+
);
|
|
39
45
|
const rangeByScoreStmt = db.prepare(
|
|
40
46
|
`SELECT member, score FROM redis_zsets
|
|
41
47
|
WHERE key = ? AND score >= ? AND score <= ?
|
|
@@ -143,6 +149,34 @@ export function createZsetsStorage(db, keys) {
|
|
|
143
149
|
return out;
|
|
144
150
|
},
|
|
145
151
|
|
|
152
|
+
/**
|
|
153
|
+
* Range by rank in reverse order (ZREVRANGE). Rank 0 = highest score.
|
|
154
|
+
* Same start/stop semantics as rangeByRank; order is score DESC, member DESC.
|
|
155
|
+
* @param {Buffer} key
|
|
156
|
+
* @param {number} start 0-based inclusive (0 = highest score)
|
|
157
|
+
* @param {number} stop 0-based inclusive
|
|
158
|
+
* @param {{ withScores?: boolean }} options
|
|
159
|
+
* @returns {Buffer[] | Array<Buffer|string>} members or [member, score, ...]
|
|
160
|
+
*/
|
|
161
|
+
rangeByRankReverse(key, start, stop, options = {}) {
|
|
162
|
+
const len = this.count(key);
|
|
163
|
+
if (len === 0) return [];
|
|
164
|
+
let s = start >= 0 ? start : Math.max(0, len + start);
|
|
165
|
+
let e = stop >= 0 ? stop : Math.max(0, len + stop);
|
|
166
|
+
if (s > e) return [];
|
|
167
|
+
s = Math.min(s, len - 1);
|
|
168
|
+
e = Math.min(e, len - 1);
|
|
169
|
+
const limit = e - s + 1;
|
|
170
|
+
const offset = s;
|
|
171
|
+
const rows = rangeByRankReverseStmt.all(key, limit, offset);
|
|
172
|
+
if (!options.withScores) return rows.map((r) => r.member);
|
|
173
|
+
const out = [];
|
|
174
|
+
for (const r of rows) {
|
|
175
|
+
out.push(r.member, formatScore(r.score));
|
|
176
|
+
}
|
|
177
|
+
return out;
|
|
178
|
+
},
|
|
179
|
+
|
|
146
180
|
/**
|
|
147
181
|
* Range by score (min/max inclusive). Order: score ASC, member ASC.
|
|
148
182
|
* @param {Buffer} key
|
|
@@ -51,6 +51,24 @@ describe('ZSET integration', () => {
|
|
|
51
51
|
assert.equal(arr[3].toString('utf8'), '2');
|
|
52
52
|
});
|
|
53
53
|
|
|
54
|
+
it('ZREVRANGE returns order highest to lowest and supports WITHSCORES', async () => {
|
|
55
|
+
await sendCommand(port, argv('ZADD', 'zrev', '1', 'a', '2', 'b', '3', 'c'));
|
|
56
|
+
const rev = await sendCommand(port, argv('ZREVRANGE', 'zrev', '0', '-1'));
|
|
57
|
+
const arr = tryParseValue(rev, 0).value;
|
|
58
|
+
assert.equal(arr.length, 3);
|
|
59
|
+
assert.equal(arr[0].toString('utf8'), 'c');
|
|
60
|
+
assert.equal(arr[1].toString('utf8'), 'b');
|
|
61
|
+
assert.equal(arr[2].toString('utf8'), 'a');
|
|
62
|
+
|
|
63
|
+
const withScores = await sendCommand(port, argv('ZREVRANGE', 'zrev', '0', '30', 'WITHSCORES'));
|
|
64
|
+
const withArr = tryParseValue(withScores, 0).value;
|
|
65
|
+
assert.equal(withArr.length, 6);
|
|
66
|
+
assert.equal(withArr[0].toString('utf8'), 'c');
|
|
67
|
+
assert.equal(withArr[1].toString('utf8'), '3');
|
|
68
|
+
assert.equal(withArr[2].toString('utf8'), 'b');
|
|
69
|
+
assert.equal(withArr[3].toString('utf8'), '2');
|
|
70
|
+
});
|
|
71
|
+
|
|
54
72
|
it('ZRANGE negative indices and start > stop', async () => {
|
|
55
73
|
await sendCommand(port, argv('ZADD', 'z4', '1', 'a', '2', 'b', '3', 'c'));
|
|
56
74
|
const last = await sendCommand(port, argv('ZRANGE', 'z4', '-1', '-1'));
|