-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make quantity field human readable (#891)
Add support for human readable quantity field in the different json config, i.e, 10KB -> 10000. This implementation still allows for the field being pure unsigned integers, so, it can be seen as offering an alternative configuration. Co-authored-by: Marcus Eagan <[email protected]>
- Loading branch information
1 parent
77b2c33
commit da2c4a7
Showing
9 changed files
with
456 additions
and
23 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,5 +14,5 @@ | |
|
|
||
| pub mod cas_server; | ||
| pub mod schedulers; | ||
| mod serde_utils; | ||
| pub mod serde_utils; | ||
| pub mod stores; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Copyright 2023 The NativeLink Authors. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use nativelink_config::serde_utils::{ | ||
| convert_data_size_with_shellexpand, convert_duration_with_shellexpand, | ||
| }; | ||
| use serde::Deserialize; | ||
|
|
||
| #[derive(Deserialize)] | ||
| struct DurationEntity { | ||
| #[serde(default, deserialize_with = "convert_duration_with_shellexpand")] | ||
| duration: usize, | ||
| } | ||
|
|
||
| #[derive(Deserialize)] | ||
| struct DataSizeEntity { | ||
| #[serde(default, deserialize_with = "convert_data_size_with_shellexpand")] | ||
| data_size: usize, | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_duration_human_readable_deserialize() { | ||
| let example = r#" | ||
| {"duration": "1m 10s"} | ||
| "#; | ||
| let deserialized: DurationEntity = serde_json5::from_str(example).unwrap(); | ||
| assert_eq!(deserialized.duration, 70); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_duration_usize_deserialize() { | ||
| let example = r#" | ||
| {"duration": 10} | ||
| "#; | ||
| let deserialized: DurationEntity = serde_json5::from_str(example).unwrap(); | ||
| assert_eq!(deserialized.duration, 10); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_data_size_unit_deserialize() { | ||
| let example = r#" | ||
| {"data_size": "1KiB"} | ||
| "#; | ||
| let deserialized: DataSizeEntity = serde_json5::from_str(example).unwrap(); | ||
| assert_eq!(deserialized.data_size, 1024); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_data_size_usize_deserialize() { | ||
| let example = r#" | ||
| {"data_size": 10} | ||
| "#; | ||
| let deserialized: DataSizeEntity = serde_json5::from_str(example).unwrap(); | ||
| assert_eq!(deserialized.data_size, 10); | ||
| } | ||
| } |