Skip to content

Support default namespace on RocksDB #3648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2025
+25 −9
Merged

Support default namespace on RocksDB #3648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions linera-client/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ example service:tcp:127.0.0.1:7878:table_do_my_test"
namespace,
});
}
if parts.len() == 3 {
if parts.len() == 2 || parts.len() == 3 {
let path = parts[0].to_string().into();
let spawn_mode = match parts[1] {
"spawn_blocking" => Ok(RocksDbSpawnMode::SpawnBlocking),
Expand All @@ -279,14 +279,20 @@ example service:tcp:127.0.0.1:7878:table_do_my_test"
parts[1]
))),
}?;
let namespace = parts[2].to_string();
let namespace = if parts.len() == 2 {
DEFAULT_NAMESPACE.to_string()
} else {
parts[2].to_string()
};
let storage_config = StorageConfig::RocksDb { path, spawn_mode };
return Ok(StorageConfigNamespace {
storage_config,
namespace,
});
}
return Err(Error::Format("We should have one or three parts".into()));
return Err(Error::Format(
"We should have one, two or three parts".into(),
));
}
#[cfg(feature = "dynamodb")]
if let Some(s) = input.strip_prefix(DYNAMO_DB) {
Expand Down Expand Up @@ -958,27 +964,37 @@ fn test_shared_store_config_from_str() {
#[cfg(feature = "rocksdb")]
#[test]
fn test_rocks_db_storage_config_from_str() {
assert!(StorageConfigNamespace::from_str("rocksdb_foo.db").is_err());
assert_eq!(
StorageConfigNamespace::from_str("rocksdb:foo.db:block_in_place:chosen_namespace").unwrap(),
StorageConfigNamespace::from_str("rocksdb:foo.db").unwrap(),
StorageConfigNamespace {
storage_config: StorageConfig::RocksDb {
path: "foo.db".into(),
spawn_mode: RocksDbSpawnMode::BlockInPlace,
spawn_mode: RocksDbSpawnMode::SpawnBlocking,
},
namespace: "chosen_namespace".into()
namespace: DEFAULT_NAMESPACE.to_string()
}
);
assert!(StorageConfigNamespace::from_str("rocksdb_foo.db").is_err());
assert_eq!(
StorageConfigNamespace::from_str("rocksdb:foo.db").unwrap(),
StorageConfigNamespace::from_str("rocksdb:foo.db:block_in_place").unwrap(),
StorageConfigNamespace {
storage_config: StorageConfig::RocksDb {
path: "foo.db".into(),
spawn_mode: RocksDbSpawnMode::SpawnBlocking,
spawn_mode: RocksDbSpawnMode::BlockInPlace,
},
namespace: DEFAULT_NAMESPACE.to_string()
}
);
assert_eq!(
StorageConfigNamespace::from_str("rocksdb:foo.db:block_in_place:chosen_namespace").unwrap(),
StorageConfigNamespace {
storage_config: StorageConfig::RocksDb {
path: "foo.db".into(),
spawn_mode: RocksDbSpawnMode::BlockInPlace,
},
namespace: "chosen_namespace".into()
}
);
}

#[cfg(feature = "dynamodb")]
Expand Down