Skip to content

Commit 049f9c0

Browse files
committed
refactor(storage): adapt vector set to engine removal
1 parent ede10cd commit 049f9c0

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/storage/src/redis_strings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@ impl Redis {
21052105
let meta = ParsedListsMetaValue::new(&value_bytes[..])?;
21062106
!meta.is_stale() && meta.count() > 0
21072107
}
2108-
DataType::Hash | DataType::Set | DataType::ZSet => {
2108+
DataType::Hash | DataType::Set | DataType::ZSet | DataType::VectorSet => {
21092109
let meta = ParsedBaseMetaValue::new(&value_bytes[..])?;
21102110
!meta.is_stale() && meta.count() > 0
21112111
}

src/storage/tests/redis_vector_test.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ fn with_redis(test: impl FnOnce(&Redis)) {
4545

4646
test(&redis);
4747

48-
redis.set_need_close(true);
4948
drop(redis);
5049
safe_cleanup_test_db(&path);
5150
}
@@ -66,7 +65,7 @@ fn search_options(count: usize, mode: VectorSearchMode) -> VectorSearchOptions {
6665
}
6766

6867
fn count_cf_entries(redis: &Redis, cf_index: ColumnFamilyIndex) -> usize {
69-
let db = redis.db.as_ref().expect("db is initialized");
68+
let db = redis.db().expect("db is initialized");
7069
let cf = redis.get_cf_handle(cf_index).expect("column family exists");
7170
db.iterator_cf(&cf, IteratorMode::Start)
7271
.map(|entry| entry.expect("read column family entry"))
@@ -205,7 +204,7 @@ fn test_vector_meta_and_member_are_committed_together() {
205204
assert!(redis.vadd(b"vectors", b"member", &vector).expect("insert"));
206205

207206
{
208-
let db = redis.db.as_ref().expect("db is initialized");
207+
let db = redis.db().expect("db is initialized");
209208
let meta_cf = redis
210209
.get_cf_handle(ColumnFamilyIndex::MetaCF)
211210
.expect("MetaCF exists");
@@ -234,7 +233,6 @@ fn test_vector_meta_and_member_are_committed_together() {
234233
assert_eq!(redis.vcard(b"vectors").expect("card"), 1);
235234
assert!(redis.vismember(b"vectors", b"member").expect("membership"));
236235

237-
redis.set_need_close(true);
238236
drop(redis);
239237
safe_cleanup_test_db(&path);
240238
}
@@ -413,7 +411,7 @@ async fn test_storage_routes_all_members_of_one_vectorset_to_one_instance() {
413411
let selected = storage.slot_indexer.get_instance_id(slot_id);
414412
let meta_key = BaseMetaKey::new(key).encode().expect("meta key");
415413
for (instance_id, redis) in storage.insts.iter().enumerate() {
416-
let db = redis.db.as_ref().expect("db is initialized");
414+
let db = redis.db().expect("db is initialized");
417415
let meta_cf = redis
418416
.get_cf_handle(ColumnFamilyIndex::MetaCF)
419417
.expect("MetaCF exists");

0 commit comments

Comments
 (0)