Add more hierarchy to stable parameters

This helps keep parameters organized in conf files and makes them more human-readable.
onlyone0001 · Sep 1, 2021 · 45b0aff · 45b0aff
1 parent 2d3d7ae
commit 45b0aff
Show file tree

Hide file tree

Showing 77 changed files with 225 additions and 162 deletions.
diff --git a/cli/hse_cli.c b/cli/hse_cli.c
@@ -33,7 +33,7 @@
 
 #define CONFIG_KVS_PFX_LEN                                                  \
     {                                                                       \
-        "pfx_len=<int>", "Set KVS prefix length, range [0..32], default: 0" \
+        "prefix.length=<int>", "Set KVS prefix length, range [0..32], default: 0" \
     }
 
 #define min(a, b)                  \

diff --git a/config/mongodb_imp.json b/config/mongodb_imp.json
@@ -1,14 +1,24 @@
 {
 	"kvs": {
 		"MainKvs": {
-			"value_compression": "lz4",
-			"pfx_pivot": 1
+			"compression": {
+				"value": {
+					"algorithm": "lz4"
+				}
+			},
+			"prefix": {
+				"pivot": 1
+			}
 		},
 		"UniqIdxKvs": {
-			"pfx_pivot": 1
+			"prefix": {
+				"pivot": 1
+			}
 		},
 		"StdIdxKvs": {
-			"pfx_pivot": 1
+			"prefix": {
+				"pivot": 1
+			}
 		}
 	}
 }
diff --git a/config/mongodb_ycsb.json b/config/mongodb_ycsb.json
@@ -1,15 +1,25 @@
 {
 	"kvs": {
 		"MainKvs": {
-			"value_compression": "lz4",
+			"compression": {
+				"value": {
+					"algorithm": "lz4"
+				}
+			},
 			"cn_cursor_vra": 0,
-			"pfx_pivot": 1
+			"prefix": {
+				"pivot": 1
+			}
 		},
 		"UniqIdxKvs": {
-			"pfx_pivot": 1
+			"prefix": {
+				"pivot": 1
+			}
 		},
 		"StdIdxKvs": {
-			"pfx_pivot": 1
+			"prefix": {
+				"pivot": 1
+			}
 		}
 	}
 }
diff --git a/config/mongodb_ycsb_mclass_abcdef_load.json b/config/mongodb_ycsb_mclass_abcdef_load.json
@@ -1,17 +1,29 @@
 {
   "kvs": {
     "default": {
-      "mclass_policy": "staging_max_capacity"
+      "mclass": {
+        "policy": "staging_max_capacity"
+      }
     },
     "MainKvs": {
-      "value_compression": "lz4",
-      "pfx_pivot": 1
+      "compression": {
+				"value": {
+					"algorithm": "lz4"
+				}
+			},
+      "prefix": {
+				"pivot": 1
+			}
     },
     "UniqIdxKvs": {
-      "pfx_pivot": 1
+      "prefix": {
+				"pivot": 1
+			}
     },
     "StdIdxKvs": {
-      "pfx_pivot": 1
+      "prefix": {
+				"pivot": 1
+			}
     }
   }
 }
diff --git a/config/mongodb_ycsb_mclass_abcdef_run.json b/config/mongodb_ycsb_mclass_abcdef_run.json
@@ -1,17 +1,29 @@
 {
   "kvs": {
     "default": {
-      "mclass_policy": "staging_max_capacity"
+      "mclass": {
+        "policy": "staging_max_capacity"
+      }
     },
     "MainKvs": {
-      "value_compression": "lz4",
-      "pfx_pivot": 1
+      "compression": {
+				"value": {
+					"algorithm": "lz4"
+				}
+			},
+      "prefix": {
+				"pivot": 1
+			}
     },
     "UniqIdxKvs": {
-      "pfx_pivot": 1
+      "prefix": {
+				"pivot": 1
+			}
     },
     "StdIdxKvs": {
-      "pfx_pivot": 1
+      "prefix": {
+				"pivot": 1
+			}
     }
   }
 }
diff --git a/config/native_ycsb_abcdf_load.json b/config/native_ycsb_abcdf_load.json
@@ -1,7 +1,9 @@
 {
   "kvs": {
     "default": {
-      "pfx_len": 7
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/config/native_ycsb_abcdf_run.json b/config/native_ycsb_abcdf_run.json
@@ -1,7 +1,9 @@
 {
   "kvs": {
     "default": {
-      "pfx_len": 7
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/config/native_ycsb_e_load.json b/config/native_ycsb_e_load.json
@@ -1,7 +1,9 @@
 {
   "kvs": {
     "default": {
-      "pfx_len": 7
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/config/native_ycsb_e_run.json b/config/native_ycsb_e_run.json
@@ -2,7 +2,9 @@
   "csched_vb_scatter_pct": 1,
   "kvs": {
     "default": {
-      "pfx_len": 7,
+      "prefix": {
+        "length": 7
+      },
       "cn_cursor_vra": 0
     }
   }

diff --git a/config/native_ycsb_mclass_abcdf_load.json b/config/native_ycsb_mclass_abcdf_load.json
@@ -1,8 +1,12 @@
 {
   "kvs": {
     "default": {
-      "mclass_policy": "staging_max_capacity",
-      "pfx_len": 7
+      "mclass": {
+        "policy": "staging_max_capacity"
+      },
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/config/native_ycsb_mclass_abcdf_run.json b/config/native_ycsb_mclass_abcdf_run.json
@@ -1,8 +1,12 @@
 {
   "kvs": {
     "default": {
-      "mclass_policy": "staging_max_capacity",
-      "pfx_len": 7
+      "mclass": {
+        "policy": "staging_max_capacity"
+      },
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/config/native_ycsb_mclass_e_load.json b/config/native_ycsb_mclass_e_load.json
@@ -1,8 +1,12 @@
 {
   "kvs": {
     "default": {
-      "mclass_policy": "staging_max_capacity",
-      "pfx_len": 7
+      "mclass": {
+        "policy": "staging_max_capacity"
+      },
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/config/native_ycsb_mclass_e_run.json b/config/native_ycsb_mclass_e_run.json
@@ -1,8 +1,12 @@
 {
   "kvs": {
     "default": {
-      "mclass_policy": "staging_max_capacity",
-      "pfx_len": 7
+      "mclass": {
+        "policy": "staging_max_capacity"
+      },
+      "prefix": {
+        "length": 7
+      }
     }
   }
 }
diff --git a/hsejni/tests/hsejni_parse_test.c b/hsejni/tests/hsejni_parse_test.c
@@ -67,14 +67,14 @@ MTF_DEFINE_UTEST(hsejni_parse_test, blank_list)
 
 MTF_DEFINE_UTEST(hsejni_parse_test, no_commas)
 {
-    char        raw_arg_list[] = "kvdb.open.dur_enable=false";
+    char        raw_arg_list[] = "kvdb.open.durability.enabled=false";
     size_t      paramc = 0;
     const char *paramv[32];
 
     jni_hse_config_parse(&paramc, paramv, raw_arg_list, "kvdb.open.", NELEM(paramv));
 
     ASSERT_EQ(1, paramc);
-    ASSERT_EQ(0, strcmp("dur_enable=false", paramv[0]));
+    ASSERT_EQ(0, strcmp("durability.enabled=false", paramv[0]));
 }
 
 MTF_DEFINE_UTEST(hsejni_parse_test, too_many_commas)

diff --git a/lib/config/argv.c b/lib/config/argv.c
@@ -51,6 +51,7 @@ argv_deserialize_to_params(
         }
 
         if (!ps) {
+            printf("%s\n", key);
             err = merr(EINVAL);
             goto out;
         }

diff --git a/lib/config/param.c b/lib/config/param.c
@@ -69,7 +69,7 @@ param_default_populate(
                 *(uint64_t *)data = ps.ps_default_value.as_uscalar;
                 break;
             case PARAM_TYPE_ENUM:
-                *(uint64_t *)data = ps.ps_default_value.as_enum;
+                *(uint32_t *)data = ps.ps_default_value.as_enum;
                 break;
             case PARAM_TYPE_STRING:
                 if (ps.ps_default_value.as_string) {
@@ -226,9 +226,9 @@ param_default_converter(const struct param_spec *ps, const cJSON *node, void *va
             const double to_conv = cJSON_GetNumberValue(node);
             if (!IS_WHOLE(to_conv))
                 return false;
-            if (to_conv < 0 || to_conv > (double)UINT64_MAX)
+            if (to_conv < 0 || to_conv > (double)UINT32_MAX)
                 return false;
-            *(uint64_t *)value = (uint64_t)to_conv;
+            *(uint32_t *)value = (uint32_t)to_conv;
             break;
         case PARAM_TYPE_STRING:
             if (cJSON_IsNull(node)) {
@@ -296,7 +296,7 @@ param_default_validator(const struct param_spec *ps, const void *value)
             return tmp >= ps->ps_bounds.as_uscalar.ps_min && tmp <= ps->ps_bounds.as_uscalar.ps_max;
         }
         case PARAM_TYPE_ENUM: {
-            const uint64_t tmp = *((uint64_t *)value);
+            const uint32_t tmp = *((uint32_t *)value);
             return tmp >= ps->ps_bounds.as_enum.ps_min && tmp <= ps->ps_bounds.as_enum.ps_max;
         }
         case PARAM_TYPE_STRING: {

diff --git a/lib/include/hse_ikvdb/vcomp_params.h b/lib/include/hse_ikvdb/vcomp_params.h
@@ -6,7 +6,7 @@
 #ifndef HSE_VCOMP_PARAMS_H
 #define HSE_VCOMP_PARAMS_H
 
-#define VCOMP_PARAM_NONE    NULL
+#define VCOMP_PARAM_NONE    "none"
 #define VCOMP_PARAM_LZ4     "lz4"
 
 enum vcomp_algorithm

diff --git a/lib/kvdb/kvdb_cparams.c b/lib/kvdb/kvdb_cparams.c
@@ -19,7 +19,7 @@
 
 static const struct param_spec pspecs[] = {
     {
-        .ps_name = "storage.capacity.fmaxsz",
+        .ps_name = "storage.capacity.file.max_size",
         .ps_description = "file size in capacity mclass (GiB)",
         .ps_flags = PARAM_FLAG_EXPERIMENTAL,
         .ps_type = PARAM_TYPE_U64,
@@ -38,7 +38,7 @@ static const struct param_spec pspecs[] = {
         }
     },
     {
-        .ps_name = "storage.capacity.mblocksz",
+        .ps_name = "storage.capacity.mblock.size",
         .ps_description = "object size in capacity mclass (MiB)",
         .ps_flags = PARAM_FLAG_EXPERIMENTAL,
         .ps_type = PARAM_TYPE_U64,
@@ -57,7 +57,7 @@ static const struct param_spec pspecs[] = {
         }
     },
     {
-        .ps_name = "storage.capacity.filecnt",
+        .ps_name = "storage.capacity.file.count",
         .ps_description = "file count in capacity mclass",
         .ps_flags = PARAM_FLAG_EXPERIMENTAL,
         .ps_type = PARAM_TYPE_U8,
@@ -93,7 +93,7 @@ static const struct param_spec pspecs[] = {
         },
     },
     {
-        .ps_name = "storage.staging.fmaxsz",
+        .ps_name = "storage.staging.file.max_size",
         .ps_description = "file size in staging mclass (GiB)",
         .ps_flags = PARAM_FLAG_EXPERIMENTAL,
         .ps_type = PARAM_TYPE_U64,
@@ -112,7 +112,7 @@ static const struct param_spec pspecs[] = {
         },
     },
     {
-        .ps_name = "storage.staging.mblocksz",
+        .ps_name = "storage.staging.mblock.size",
         .ps_description = "object size in staging mclass (MiB)",
         .ps_flags = PARAM_FLAG_EXPERIMENTAL,
         .ps_type = PARAM_TYPE_U64,
@@ -131,7 +131,7 @@ static const struct param_spec pspecs[] = {
         },
     },
     {
-        .ps_name = "storage.staging.filecnt",
+        .ps_name = "storage.staging.file.count",
         .ps_description = "file count in staging mclass",
         .ps_flags = PARAM_FLAG_EXPERIMENTAL,
         .ps_type = PARAM_TYPE_U8,