*: make mix percentages all optional as long as present ones sum to 100

examples/mixed/mixed.toml

@@ -9,7 +9,6 @@ report = "repeat"
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "incrementp"
 report = "hidden"
@@ -38,7 +37,6 @@ dist = "zipfian"
 
 # read-only, uniform
 [[benchmark]]
-set_perc = 0
 get_perc = 100
 timeout = 1.0
 dist = "uniform"

examples/readpopular/readpopular.toml

@@ -8,14 +8,12 @@ kmax = 1000000
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "incrementp"
 report = "hidden"
 
 [[benchmark]]
 timeout = 1
-set_perc = 0
 get_perc = 100
 dist = "zipfian"
 zipf_theta = 1.0

examples/writeheavy/writeheavy.toml

@@ -8,7 +8,6 @@ kmax = 1000000
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "incrementp"
 report = "hidden"

examples/ycsbd/ycsbd.toml

@@ -8,7 +8,6 @@ kmax = 1000000
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "shufflep"
 report = "hidden"

examples/your-kv-store/benchmark.toml

@@ -8,7 +8,6 @@ kmax = 1000
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "incrementp"
 report = "hidden"

presets/benchmarks/example.toml

@@ -10,7 +10,6 @@ kmax = 1000
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "incrementp"
 

presets/benchmarks/example_scan.toml

@@ -11,7 +11,6 @@ kmax = 1000
 
 [[benchmark]]
 set_perc = 100
-get_perc = 0
 repeat = 1
 dist = "incrementp"
 

src/bench.rs

@@ -1122,8 +1122,8 @@ mod tests {
         assert_eq!(bg.len(), 1);
 
         let wopt = WorkloadOpt {
-            set_perc: 50,
-            get_perc: 30,
+            set_perc: Some(50),
+            get_perc: Some(30),
             del_perc: Some(10),
             scan_perc: Some(10),
             dist: "incrementp".to_string(),
@@ -1173,8 +1173,8 @@ mod tests {
         assert_eq!(bg.len(), 1);
 
         let wopt = WorkloadOpt {
-            set_perc: 50,
-            get_perc: 30,
+            set_perc: Some(50),
+            get_perc: Some(30),
             del_perc: Some(10),
             scan_perc: Some(10),
             scan_n: None,

src/workload.rs

@@ -156,11 +156,11 @@ impl KeyGenerator {
 /// options, all fields must be present.
 #[derive(Deserialize, Clone, Debug, PartialEq)]
 pub struct WorkloadOpt {
-    /// Percentage of `SET` operations.
-    pub set_perc: u8,
+    /// Percentage of `SET` operations (optional, default 0).
+    pub set_perc: Option<u8>,
 
-    /// Percentage of `GET` operations.
-    pub get_perc: u8,
+    /// Percentage of `GET` operations (optional, default 0).
+    pub get_perc: Option<u8>,
 
     /// Percentage of `DELETE` operations (optional, default 0).
     pub del_perc: Option<u8>,
@@ -229,8 +229,8 @@ pub struct Workload {
 impl Workload {
     pub fn new(opt: &WorkloadOpt, thread_info: Option<(usize, usize)>) -> Self {
         // input sanity checks
-        let set_perc = opt.set_perc;
-        let get_perc = opt.get_perc;
+        let set_perc = opt.set_perc.unwrap_or(0);
+        let get_perc = opt.get_perc.unwrap_or(0);
         let del_perc = opt.del_perc.unwrap_or(0);
         let scan_perc = opt.scan_perc.unwrap_or(0);
         assert_eq!(
@@ -654,6 +654,17 @@ mod tests {
         let _ = Workload::new_from_toml_str(s, None);
     }
 
+    #[test]
+    #[should_panic(expected = "should be 100")]
+    fn workload_toml_invalid_wrong_mix_missing() {
+        let s = r#"klen = 4
+                   vlen = 6
+                   dist = "uniform"
+                   kmin = 0
+                   kmax = 12345"#;
+        let _ = Workload::new_from_toml_str(s, None);
+    }
+
     #[test]
     #[should_panic(expected = "invalid key distribution")]
     fn workload_toml_invalid_key_distribution() {
@@ -687,8 +698,8 @@ mod tests {
     #[test]
     fn workload_keygen_parallel() {
         let mut opt = WorkloadOpt {
-            set_perc: 50,
-            get_perc: 50,
+            set_perc: Some(100),
+            get_perc: None,
             del_perc: None,
             scan_perc: None,
             scan_n: Some(10),
@@ -723,8 +734,8 @@ mod tests {
     #[test]
     fn workload_keygen_parallel_fill() {
         let mut opt = WorkloadOpt {
-            set_perc: 100,
-            get_perc: 0,
+            set_perc: Some(100),
+            get_perc: None,
             del_perc: None,
             scan_perc: None,
             scan_n: Some(10),
@@ -762,8 +773,8 @@ mod tests {
     #[test]
     fn workload_keygen_zipfian_latest() {
         let opt = WorkloadOpt {
-            set_perc: 5,
-            get_perc: 95,
+            set_perc: Some(5),
+            get_perc: Some(95),
             del_perc: None,
             scan_perc: None,
             scan_n: Some(10),
@@ -809,8 +820,8 @@ mod tests {
     #[test]
     fn workload_uniform_write_intensive() {
         let opt = WorkloadOpt {
-            set_perc: 50,
-            get_perc: 50,
+            set_perc: Some(50),
+            get_perc: Some(50),
             del_perc: None,
             scan_perc: None,
             scan_n: Some(10),
@@ -857,8 +868,8 @@ mod tests {
     #[test]
     fn workload_even_operations() {
         let opt = WorkloadOpt {
-            set_perc: 25,
-            get_perc: 25,
+            set_perc: Some(25),
+            get_perc: Some(25),
             del_perc: Some(25),
             scan_perc: Some(25),
             scan_n: None,