Skip to content

Commit 8f2f4b5

Browse files
authored
Merge branch 'redis:master' into master
2 parents cc08446 + e2d4b43 commit 8f2f4b5

File tree

10 files changed

+65
-38
lines changed

10 files changed

+65
-38
lines changed

package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/bloom/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redis/bloom",
3-
"version": "5.6.1",
3+
"version": "5.7.0",
44
"license": "MIT",
55
"main": "./dist/lib/index.js",
66
"types": "./dist/lib/index.d.ts",
@@ -13,7 +13,7 @@
1313
"release": "release-it"
1414
},
1515
"peerDependencies": {
16-
"@redis/client": "^5.6.1"
16+
"@redis/client": "^5.7.0"
1717
},
1818
"devDependencies": {
1919
"@redis/test-utils": "*"

packages/client/lib/commands/VSIM.spec.ts

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ describe('VSIM', () => {
3131
FILTER: '.price > 20',
3232
'FILTER-EF': 50,
3333
TRUTH: true,
34-
NOTHREAD: true
34+
NOTHREAD: true,
35+
EPSILON: 0.1
3536
});
3637
assert.deepEqual(
3738
parser.redisArgs,
3839
[
39-
'VSIM', 'key', 'ELE', 'element',
40-
'COUNT', '5', 'EF', '100', 'FILTER', '.price > 20',
41-
'FILTER-EF', '50', 'TRUTH', 'NOTHREAD'
40+
'VSIM', 'key', 'ELE', 'element', 'COUNT', '5',
41+
'EPSILON', '0.1', 'EF', '100', 'FILTER', '.price > 20',
42+
'FILTER-EF', '50', 'TRUTH', 'NOTHREAD',
4243
]
4344
);
4445
});
@@ -56,6 +57,27 @@ describe('VSIM', () => {
5657
cluster: { ...GLOBAL.CLUSTERS.OPEN, minimumDockerVersion: [8, 0] }
5758
});
5859

60+
61+
testUtils.testAll('vSim with options', async client => {
62+
await client.vAdd('key', [1.0, 2.0, 3.0], 'element1');
63+
await client.vAdd('key', [1.1, 2.1, 3.1], 'element2');
64+
65+
const result = await client.vSim('key', 'element1', {
66+
EPSILON: 0.1,
67+
COUNT: 1,
68+
EF: 100,
69+
FILTER: '.year == 8',
70+
'FILTER-EF': 50,
71+
TRUTH: true,
72+
NOTHREAD: true
73+
});
74+
75+
assert.ok(Array.isArray(result));
76+
}, {
77+
client: { ...GLOBAL.SERVERS.OPEN, minimumDockerVersion: [8, 0] },
78+
cluster: { ...GLOBAL.CLUSTERS.OPEN, minimumDockerVersion: [8, 0] }
79+
});
80+
5981
testUtils.testWithClient('vSim with RESP3', async client => {
6082
await client.vAdd('resp3-key', [1.0, 2.0, 3.0], 'element1');
6183
await client.vAdd('resp3-key', [1.1, 2.1, 3.1], 'element2');

packages/client/lib/commands/VSIM.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { transformDoubleArgument } from './generic-transformers';
44

55
export interface VSimOptions {
66
COUNT?: number;
7+
EPSILON?: number;
78
EF?: number;
89
FILTER?: string;
910
'FILTER-EF'?: number;
@@ -44,6 +45,10 @@ export default {
4445
parser.push('COUNT', options.COUNT.toString());
4546
}
4647

48+
if (options?.EPSILON !== undefined) {
49+
parser.push('EPSILON', options.EPSILON.toString());
50+
}
51+
4752
if (options?.EF !== undefined) {
4853
parser.push('EF', options.EF.toString());
4954
}

packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redis/client",
3-
"version": "5.6.1",
3+
"version": "5.7.0",
44
"license": "MIT",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",

packages/entraid/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redis/entraid",
3-
"version": "5.6.1",
3+
"version": "5.7.0",
44
"license": "MIT",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
2222
"@azure/msal-node": "^2.16.1"
2323
},
2424
"peerDependencies": {
25-
"@redis/client": "^5.6.1"
25+
"@redis/client": "^5.7.0"
2626
},
2727
"devDependencies": {
2828
"@types/express": "^4.17.21",

packages/json/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redis/json",
3-
"version": "5.6.1",
3+
"version": "5.7.0",
44
"license": "MIT",
55
"main": "./dist/lib/index.js",
66
"types": "./dist/lib/index.d.ts",
@@ -13,7 +13,7 @@
1313
"release": "release-it"
1414
},
1515
"peerDependencies": {
16-
"@redis/client": "^5.6.1"
16+
"@redis/client": "^5.7.0"
1717
},
1818
"devDependencies": {
1919
"@redis/test-utils": "*"

packages/redis/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "redis",
33
"description": "A modern, high performance Redis client",
4-
"version": "5.6.1",
4+
"version": "5.7.0",
55
"license": "MIT",
66
"main": "./dist/index.js",
77
"types": "./dist/index.d.ts",
@@ -13,11 +13,11 @@
1313
"release": "release-it"
1414
},
1515
"dependencies": {
16-
"@redis/bloom": "5.6.1",
17-
"@redis/client": "5.6.1",
18-
"@redis/json": "5.6.1",
19-
"@redis/search": "5.6.1",
20-
"@redis/time-series": "5.6.1"
16+
"@redis/bloom": "5.7.0",
17+
"@redis/client": "5.7.0",
18+
"@redis/json": "5.7.0",
19+
"@redis/search": "5.7.0",
20+
"@redis/time-series": "5.7.0"
2121
},
2222
"engines": {
2323
"node": ">= 18"

packages/search/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redis/search",
3-
"version": "5.6.1",
3+
"version": "5.7.0",
44
"license": "MIT",
55
"main": "./dist/lib/index.js",
66
"types": "./dist/lib/index.d.ts",
@@ -14,7 +14,7 @@
1414
"release": "release-it"
1515
},
1616
"peerDependencies": {
17-
"@redis/client": "^5.6.1"
17+
"@redis/client": "^5.7.0"
1818
},
1919
"devDependencies": {
2020
"@redis/test-utils": "*"

packages/time-series/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@redis/time-series",
3-
"version": "5.6.1",
3+
"version": "5.7.0",
44
"license": "MIT",
55
"main": "./dist/lib/index.js",
66
"types": "./dist/lib/index.d.ts",
@@ -13,7 +13,7 @@
1313
"release": "release-it"
1414
},
1515
"peerDependencies": {
16-
"@redis/client": "^5.6.1"
16+
"@redis/client": "^5.7.0"
1717
},
1818
"devDependencies": {
1919
"@redis/test-utils": "*"

0 commit comments

Comments
 (0)