Skip to content

Commit 36637fd

Browse files
weedgeweedge
committed
fix: test
Signed-off-by: weedge <[email protected]>
1 parent 228f992 commit 36637fd

File tree

7 files changed

+123
-18
lines changed

7 files changed

+123
-18
lines changed

‎Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ name = "vsstest"
2525
path = "rust/tests/integration_usearch.rs"
2626
name = "usearch"
2727

28+
[[test]]
29+
path = "rust/tests/integration_hnsw.rs"
30+
name = "hnsw"
31+
2832
[dependencies]
2933
redis-module = { version = "2.0.5", features = ["default"] }
3034
usearch = "2.6.0"

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ endif
7979
test: cargo_test
8080

8181
cargo_test:
82-
cargo test --workspace $(CARGO_FLAGS)
83-
cargo test --doc --workspace $(CARGO_FLAGS)
82+
export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --workspace $(CARGO_FLAGS)
83+
# export LIBRARY_PATH=/usr/local/lib && RUSTFLAGS="-C link-args=-Wl,-rpath,/usr/local/lib" cargo test --doc --workspace $(CARGO_FLAGS)
8484

8585
.PHONY: test cargo_test
8686

‎doc/launch.json

Lines changed: 107 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
"version": "0.2.0",
44
"configurations": [
55
{
6-
"name": "6372-redisxann",
6+
"name": "6372-redisxann-vsstest",
77
"type": "cppdbg",
88
"request": "launch",
99
"program": "${workspaceFolder}/redis/src/redis-server",
1010
"args": [
1111
"--port 6372",
12-
"--loadmodule ${workspaceFolder}/target/debug/libredisxann.dylib",
13-
"--dbfilename dump.6372.rdb"
12+
"--loadmodule ${workspaceFolder}/target/debug/examples/libvsstest.dylib",
13+
"--dbfilename dump.6372.rdb",
14+
"--loglevel debug",
1415
//"--activerehashing no",
1516
],
1617
"stopAtEntry": false,
@@ -19,7 +20,109 @@
1920
{
2021
"name": "LD_LIBRARY_PATH",
2122
"value": "/usr/local/lib"
22-
}
23+
},
24+
],
25+
"externalConsole": false,
26+
"internalConsoleOptions": "openOnSessionStart",
27+
"linux": {
28+
"MIMode": "gdb",
29+
"miDebuggerPath": "/usr/bin/gdb"
30+
},
31+
"osx": {
32+
"MIMode": "lldb"
33+
},
34+
"windows": {
35+
"MIMode": "gdb",
36+
"miDebuggerPath": "C:\\MinGw\\bin\\gdb.exe"
37+
}
38+
},
39+
{
40+
"name": "6371-redisxann-hnsw",
41+
"type": "cppdbg",
42+
"request": "launch",
43+
"program": "${workspaceFolder}/redis/src/redis-server",
44+
"args": [
45+
"--port 6371",
46+
"--loadmodule ${workspaceFolder}/target/debug/libredisxann_hnsw.dylib",
47+
"--dbfilename dump.6371.rdb",
48+
"--loglevel debug",
49+
//"--activerehashing no",
50+
],
51+
"stopAtEntry": false,
52+
"cwd": "${workspaceFolder}",
53+
"environment": [
54+
{
55+
"name": "LD_LIBRARY_PATH",
56+
"value": "/usr/local/lib"
57+
},
58+
],
59+
"externalConsole": false,
60+
"internalConsoleOptions": "openOnSessionStart",
61+
"linux": {
62+
"MIMode": "gdb",
63+
"miDebuggerPath": "/usr/bin/gdb"
64+
},
65+
"osx": {
66+
"MIMode": "lldb"
67+
},
68+
"windows": {
69+
"MIMode": "gdb",
70+
"miDebuggerPath": "C:\\MinGw\\bin\\gdb.exe"
71+
}
72+
},
73+
{
74+
"name": "6373-redisxann-usearch",
75+
"type": "cppdbg",
76+
"request": "launch",
77+
"program": "${workspaceFolder}/redis/src/redis-server",
78+
"args": [
79+
"--port 6373",
80+
"--loadmodule ${workspaceFolder}/target/debug/libredisxann_usearch.dylib",
81+
"--dbfilename dump.6373.rdb",
82+
"--loglevel debug",
83+
//"--activerehashing no",
84+
],
85+
"stopAtEntry": false,
86+
"cwd": "${workspaceFolder}",
87+
"environment": [
88+
{
89+
"name": "LD_LIBRARY_PATH",
90+
"value": "/usr/local/lib"
91+
},
92+
],
93+
"externalConsole": false,
94+
"internalConsoleOptions": "openOnSessionStart",
95+
"linux": {
96+
"MIMode": "gdb",
97+
"miDebuggerPath": "/usr/bin/gdb"
98+
},
99+
"osx": {
100+
"MIMode": "lldb"
101+
},
102+
"windows": {
103+
"MIMode": "gdb",
104+
"miDebuggerPath": "C:\\MinGw\\bin\\gdb.exe"
105+
}
106+
},
107+
{
108+
"name": "6374-redisxann-faiss",
109+
"type": "cppdbg",
110+
"request": "launch",
111+
"program": "${workspaceFolder}/redis/src/redis-server",
112+
"args": [
113+
"--port 6374",
114+
"--loadmodule ${workspaceFolder}/target/debug/libredisxann_faiss.dylib",
115+
"--dbfilename dump.6374.rdb",
116+
"--loglevel debug",
117+
//"--activerehashing no",
118+
],
119+
"stopAtEntry": false,
120+
"cwd": "${workspaceFolder}",
121+
"environment": [
122+
{
123+
"name": "LD_LIBRARY_PATH",
124+
"value": "/usr/local/lib"
125+
},
23126
],
24127
"externalConsole": false,
25128
"internalConsoleOptions": "openOnSessionStart",

‎rust/tests/integration_hnsw.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ mod utils;
88
#[test]
99
fn test_redisxann_hnsw() -> Result<()> {
1010
let port: u16 = 6479;
11-
let _guards = vec![start_redis_server_with_module("redisxann-hnsw", port)
11+
let _guards = vec![start_redis_server_with_module("redisxann_hnsw", port)
1212
.with_context(|| "failed to start redis server")?];
1313
let mut con =
1414
get_redis_connection(port).with_context(|| "failed to connect to redis server")?;
1515

1616
let res: String = redis::cmd("hnsw.index.create")
17-
.arg(&[3, 4])
17+
.arg(&["idx0", "dim", "3", "m", "10", "efcon", "12"])
1818
.query(&mut con)
1919
.with_context(|| "failed to run hnsw.index.create")?;
20-
assert_eq!(res, "Ok".to_string());
20+
assert_eq!(res, "OK".to_string());
2121

2222
let res: Result<Vec<i32>, RedisError> =
2323
redis::cmd("hnsw.index.create").arg(&[""]).query(&mut con);

‎rust/tests/integration_usearch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod utils;
88
#[test]
99
fn test_redisxann_usearch() -> Result<()> {
1010
let port: u16 = 6479;
11-
let _guards = vec![start_redis_server_with_module("redisxann-usearch", port)
11+
let _guards = vec![start_redis_server_with_module("redisxann_usearch", port)
1212
.with_context(|| "failed to start redis server")?];
1313
let mut con =
1414
get_redis_connection(port).with_context(|| "failed to connect to redis server")?;
@@ -17,7 +17,7 @@ fn test_redisxann_usearch() -> Result<()> {
1717
.arg(&[3, 4])
1818
.query(&mut con)
1919
.with_context(|| "failed to run usearch.index.create")?;
20-
assert_eq!(res, "Ok".to_string());
20+
assert_eq!(res.to_lowercase(), "ok".to_string());
2121

2222
let res: Result<Vec<i32>, RedisError> = redis::cmd("usearch.index.create")
2323
.arg(&[""])

‎rust/tests/utils.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ pub fn start_redis_server_with_module(module_name: &str, port: u16) -> Result<Ch
3838

3939
let module_path: PathBuf = [
4040
std::env::current_dir()?,
41-
PathBuf::from(format!(
42-
"target/{profile}/examples/lib{module_name}.{extension}"
43-
)),
41+
PathBuf::from(format!("target/{profile}/lib{module_name}.{extension}")),
4442
]
4543
.iter()
4644
.collect();

‎rust/usearch/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn create_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
99
}
1010

1111
ctx.log_notice(format!("{:?}", args).as_str());
12-
Ok("ok".into())
12+
Ok("OK".into())
1313
}
1414

1515
fn get_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
@@ -19,7 +19,7 @@ fn get_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
1919
}
2020

2121
ctx.log_notice(format!("{:?}", args).as_str());
22-
Ok("ok".into())
22+
Ok("".into())
2323
}
2424

2525
fn del_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
@@ -29,7 +29,7 @@ fn del_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
2929
}
3030

3131
ctx.log_notice(format!("{:?}", args).as_str());
32-
Ok("ok".into())
32+
Ok("".into())
3333
}
3434

3535
fn scan_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
@@ -39,7 +39,7 @@ fn scan_index(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
3939
}
4040

4141
ctx.log_notice(format!("{:?}", args).as_str());
42-
Ok("ok".into())
42+
Ok("".into())
4343
}
4444

4545
redis_module! {

0 commit comments

Comments
 (0)