Skip to content

Support basic types #46

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
vinodreddy-g merged 11 commits into from
Aug 1, 2025
Merged

Support basic types #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbfcc28
impl: add basic types
vinodreddy-g Jul 15, 2025
64628b4
impl: add tests for types
vinodreddy-g Jul 15, 2025
2bdefbc
impl: take json_backend changes
vinodreddy-g Jul 22, 2025
2142c45
impl: add license header
vinodreddy-g Jul 22, 2025
7f24d66
impl: change to aligned format in json file
vinodreddy-g Jul 31, 2025
9a09005
impl: fix review comments
vinodreddy-g Jul 31, 2025
072f9c9
impl: fix the json format changes
vinodreddy-g Jul 31, 2025
d08963c
impl: Taking ownership of JsonValue in backend
vinodreddy-g Jul 31, 2025
1f37f81
impl: fixed review comments
vinodreddy-g Aug 1, 2025
0979081
impl: reverted the changes for array get in tests
vinodreddy-g Aug 1, 2025
bd0d88d
impl: Add error message checks
vinodreddy-g Aug 1, 2025
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
128 changes: 108 additions & 20 deletions src/rust/rust_kvs/src/json_backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,134 @@
// Copyright (c) 2025 Contributors to the Eclipse Foundation
Copy link
Contributor

@arkjedrz arkjedrz Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this change: maybe missing license headers can be prevented with pre-commit hook, or at least CI task?

Copy link
Contributor Author

@vinodreddy-g vinodreddy-g Jul 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ci task has to merged from central repo .I will ask dan.

//
// See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership.
//
// This program and the accompanying materials are made available under the
// terms of the Apache License Version 2.0 which is available at
// <https://www.apache.org/licenses/LICENSE-2.0>
//
// SPDX-License-Identifier: Apache-2.0

use crate::error_code::ErrorCode;
use crate::kvs_backend::KvsBackend;
use crate::kvs_value::{KvsMap, KvsValue};
use std::fs;
use std::path::PathBuf;

// for creating jsonvalue obj
use std::collections::HashMap;

use tinyjson::{JsonGenerateError, JsonParseError, JsonValue};

// Example of how KvsValue is stored in the JSON file (t-tagged format):
// {
// "my_int": { "t": "i32", "v": 42 },
// "my_float": { "t": "f64", "v": 3.1415 },
// "my_bool": { "t": "bool", "v": true },
// "my_string": { "t": "str", "v": "hello" },
// "my_array": { "t": "arr", "v": [ ... ] },
// "my_object": { "t": "obj", "v": { ... } },
// "my_null": { "t": "null", "v": null }
// }

/// Backend-specific JsonValue -> KvsValue conversion.
impl From<JsonValue> for KvsValue {
fn from(val: JsonValue) -> KvsValue {
match val {
JsonValue::Number(n) => KvsValue::Number(n),
JsonValue::Boolean(b) => KvsValue::Boolean(b),
JsonValue::String(s) => KvsValue::String(s),
JsonValue::Null => KvsValue::Null,
JsonValue::Array(arr) => KvsValue::Array(arr.into_iter().map(KvsValue::from).collect()),
JsonValue::Object(obj) => KvsValue::Object(
obj.into_iter()
.map(|(k, v)| (k.clone(), KvsValue::from(v)))
.collect(),
),
JsonValue::Object(mut obj) => {
Copy link
Contributor

@arkjedrz arkjedrz Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No mut would be preferred, but it's ok.

// Type-tagged: { "t": ..., "v": ... }
if let (Some(JsonValue::String(type_str)), Some(value)) =
(obj.remove("t"), obj.remove("v"))
{
return match (type_str.as_str(), value) {
("i32", JsonValue::Number(v)) => KvsValue::I32(v as i32),
("u32", JsonValue::Number(v)) => KvsValue::U32(v as u32),
("i64", JsonValue::Number(v)) => KvsValue::I64(v as i64),
("u64", JsonValue::Number(v)) => KvsValue::U64(v as u64),
("f64", JsonValue::Number(v)) => KvsValue::F64(v),
("bool", JsonValue::Boolean(v)) => KvsValue::Boolean(v),
("str", JsonValue::String(v)) => KvsValue::String(v),
("null", JsonValue::Null) => KvsValue::Null,
("arr", JsonValue::Array(v)) => {
KvsValue::Array(v.into_iter().map(KvsValue::from).collect())
}
("obj", JsonValue::Object(v)) => KvsValue::Object(
v.into_iter().map(|(k, v)| (k, KvsValue::from(v))).collect(),
),
// Remaining types can be handled with Null.
_ => KvsValue::Null,
};
}
// If not a t-tagged object, treat as a map of key-value pairs (KvsMap)
let map: KvsMap = obj
.into_iter()
.map(|(k, v)| (k, KvsValue::from(v)))
.collect();
KvsValue::Object(map)
}
// Remaining types can be handled with Null.
_ => KvsValue::Null,
}
}
}

/// Backend-specific KvsValue -> JsonValue conversion.
impl From<KvsValue> for JsonValue {
fn from(val: KvsValue) -> JsonValue {
let mut obj = HashMap::new();
match val {
KvsValue::Number(n) => JsonValue::Number(n),
KvsValue::Boolean(b) => JsonValue::Boolean(b),
KvsValue::String(s) => JsonValue::String(s),
KvsValue::Null => JsonValue::Null,
KvsValue::I32(n) => {
obj.insert("t".to_string(), JsonValue::String("i32".to_string()));
obj.insert("v".to_string(), JsonValue::Number(n as f64));
}
KvsValue::U32(n) => {
obj.insert("t".to_string(), JsonValue::String("u32".to_string()));
obj.insert("v".to_string(), JsonValue::Number(n as f64));
}
KvsValue::I64(n) => {
obj.insert("t".to_string(), JsonValue::String("i64".to_string()));
obj.insert("v".to_string(), JsonValue::Number(n as f64));
}
KvsValue::U64(n) => {
obj.insert("t".to_string(), JsonValue::String("u64".to_string()));
obj.insert("v".to_string(), JsonValue::Number(n as f64));
}
KvsValue::F64(n) => {
obj.insert("t".to_string(), JsonValue::String("f64".to_string()));
obj.insert("v".to_string(), JsonValue::Number(n));
}
KvsValue::Boolean(b) => {
obj.insert("t".to_string(), JsonValue::String("bool".to_string()));
obj.insert("v".to_string(), JsonValue::Boolean(b));
}
KvsValue::String(s) => {
obj.insert("t".to_string(), JsonValue::String("str".to_string()));
obj.insert("v".to_string(), JsonValue::String(s));
}
KvsValue::Null => {
obj.insert("t".to_string(), JsonValue::String("null".to_string()));
obj.insert("v".to_string(), JsonValue::Null);
}
KvsValue::Array(arr) => {
JsonValue::Array(arr.into_iter().map(JsonValue::from).collect())
obj.insert("t".to_string(), JsonValue::String("arr".to_string()));
obj.insert(
"v".to_string(),
JsonValue::Array(arr.into_iter().map(JsonValue::from).collect()),
);
}
KvsValue::Object(map) => {
obj.insert("t".to_string(), JsonValue::String("obj".to_string()));
obj.insert(
Copy link
Contributor

@arkjedrz arkjedrz Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

->

                obj.insert(
                    "v".to_string(),
                    JsonValue::Object(
                        map.into_iter()
                            .map(|(k, v)| (k, JsonValue::from(v)))
                            .collect(),
                    ),
                );

Copy link
Contributor Author

@vinodreddy-g vinodreddy-g Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

"v".to_string(),
JsonValue::Object(
map.into_iter()
.map(|(k, v)| (k, JsonValue::from(v)))
.collect(),
),
);
}
KvsValue::Object(map) => JsonValue::Object(
map.into_iter()
.map(|(k, v)| (k.clone(), JsonValue::from(v)))
.collect(),
),
}
JsonValue::Object(obj)
}
}

Expand Down
Loading