Skip to content

Commit ffed443

Browse files
authored
Merge pull request #186 from qorix-group/arkjedrz_fix-broken-examples
impl: broken examples bugfix
2 parents 0af10ae + c39623f commit ffed443

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

src/rust/rust_kvs/examples/basic.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ fn main() -> Result<(), ErrorCode> {
1717

1818
{
1919
// Build KVS instance for given instance ID and temporary directory.
20-
// `kvs_load` is explicitly set to `KvsLoad::Optional`, but this is the default value.
21-
// KVS files are not required.
22-
let builder = KvsBuilder::new(instance_id)
23-
.dir(dir_string.clone())
24-
.kvs_load(KvsLoad::Optional);
20+
let builder = KvsBuilder::new(instance_id).dir(dir_string.clone());
2521
let kvs = builder.build()?;
2622

2723
println!("-> `set_value` usage");
@@ -63,10 +59,7 @@ fn main() -> Result<(), ErrorCode> {
6359

6460
{
6561
// Build KVS instance for given instance ID and temporary directory.
66-
// `kvs_load` is set to `KvsLoad::Required` - KVS files must already exist from previous KVS instance.
67-
let builder = KvsBuilder::new(instance_id)
68-
.dir(dir_string)
69-
.kvs_load(KvsLoad::Required);
62+
let builder = KvsBuilder::new(instance_id).dir(dir_string);
7063
let kvs = builder.build()?;
7164

7265
// `get_value` usage - print all existing keys with their values.

src/rust/rust_kvs/examples/defaults.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ use tinyjson::JsonValue;
1010

1111
/// Utility function for creating file containing default values.
1212
fn create_defaults_file(dir_path: PathBuf, instance_id: InstanceId) -> Result<(), ErrorCode> {
13-
// Path to expected defaults file.
14-
// E.g., `/tmp/xyz/kvs_0_default.json`.
13+
// Path to expected defaults files.
14+
// E.g., `/tmp/xyz/kvs_0_default.json`, `/tmp/xyz/kvs_0_default.hash`.
1515
let defaults_file_path = dir_path.join(format!("kvs_{instance_id}_default.json"));
16+
let defaults_hash_file_path = dir_path.join(format!("kvs_{instance_id}_default.hash"));
1617

1718
// Create defaults.
1819
// `KvsValue` is converted to `JsonValue` to ensure types are tagged.
@@ -27,6 +28,10 @@ fn create_defaults_file(dir_path: PathBuf, instance_id: InstanceId) -> Result<()
2728
let json_str = json_value.stringify()?;
2829
std::fs::write(&defaults_file_path, &json_str)?;
2930

31+
// Generate hash and save to hash file.
32+
let hash = adler32::RollingAdler32::from_buffer(json_str.as_bytes()).hash();
33+
std::fs::write(defaults_hash_file_path, hash.to_be_bytes())?;
34+
3035
Ok(())
3136
}
3237

0 commit comments

Comments
 (0)