refine cmd-line options

Author: zhiqiang-hhhh

vectordb_bench/backend/clients/doris/cli.py

@@ -15,19 +15,28 @@
 
 
 def _parse_kv_list(_ctx, _param, values):  # noqa: ANN001
-    # values is a tuple of strings like ("k=v", "x=y")
+    """Parse repeatable or comma-separated key=value items into a dict.
+
+    Accepts any of the following forms (and mixtures thereof):
+      --index-prop a=1 --index-prop b=2
+      --index-prop a=1,b=2
+      --index-prop a=1,b=2 --index-prop c=3
+    """
     parsed: dict[str, str] = {}
     if not values:
         return parsed
     for item in values:
-        if "=" not in item:
-            raise click.BadParameter(f"Expect key=value, got: {item}")
-        k, v = item.split("=", 1)
-        k = k.strip()
-        v = v.strip()
-        if not k:
-            raise click.BadParameter(f"Empty key in: {item}")
-        parsed[k] = v
+        # allow comma-separated list in a single occurrence
+        parts = [p.strip() for p in str(item).split(",") if p and p.strip()]
+        for part in parts:
+            if "=" not in part:
+                raise click.BadParameter(f"Expect key=value, got: {part}")
+            k, v = part.split("=", 1)
+            k = k.strip()
+            v = v.strip()
+            if not k:
+                raise click.BadParameter(f"Empty key in: {part}")
+            parsed[k] = v
     return parsed
 
 
@@ -113,7 +122,7 @@ class DorisTypedDict(CommonTypedDict, HNSWBaseTypedDict):
             "--index-prop",
             type=str,
             multiple=True,
-            help="Extra index PROPERTY as key=value (repeatable)",
+            help="Extra index PROPERTY as key=value (repeatable or comma-separated, e.g. a=1,b=2)",
             callback=_parse_kv_list,
         ),
     ]
@@ -123,7 +132,7 @@ class DorisTypedDict(CommonTypedDict, HNSWBaseTypedDict):
             "--session-var",
             type=str,
             multiple=True,
-            help="Session variable key=value applied to each SQL session (repeatable)",
+            help="Session variable key=value applied to each SQL session (repeatable or comma-separated)",
             callback=_parse_kv_list,
         ),
     ]

vectordb_bench/backend/clients/doris/doris.py

@@ -157,17 +157,42 @@ def _create_table(self):
                 {"id": 1, "embedding": [0.0] * self.dim}
             ])
 
-            # Prepare index options
+            # Prepare index options (attach custom HNSW properties if provided)
             index_options = None
             if not getattr(self.case_config, "no_index", False):
                 index_param = self.case_config.index_param()
                 metric_type = index_param.get("metric_fn", "l2_distance")
-                
                 index_options = IndexOptions(
                     index_type="hnsw",
                     metric_type=metric_type,
-                    dim=self.dim
+                    dim=self.dim,
                 )
+                # Anything beyond metric_fn are treated as index properties (e.g. max_degree, ef_construction, user props)
+                extra_props = {k: v for k, v in index_param.items() if k != "metric_fn"}
+                # Try to set as attributes first; fall back to a generic properties dict
+                if extra_props:
+                    applied, stored = {}, {}
+                    for k, v in extra_props.items():
+                        attr_name = k
+                        if hasattr(index_options, attr_name):
+                            try:
+                                setattr(index_options, attr_name, v)
+                                applied[k] = v
+                            except Exception:  # noqa: BLE001
+                                stored[k] = v
+                        else:
+                            stored[k] = v
+                    if stored:
+                        # Keep a dynamic container so downstream SDK logic can inspect
+                        setattr(index_options, "properties", {**getattr(index_options, "properties", {}), **stored})
+                    log.info(
+                        "Index options prepared: metric=%s applied_props=%s stored_props=%s",
+                        metric_type,
+                        applied,
+                        stored,
+                    )
+                else:
+                    log.info("Index options prepared: metric=%s (no extra properties)", metric_type)
                 log.info("Creating table %s with index %s", self.table_name, index_param)
             else:
                 log.info("Creating table %s without ANN index", self.table_name)
@@ -188,6 +213,14 @@ def _create_table(self):
                         self.table.index_options.metric_type = "inner_product"
                     else:
                         self.table.index_options.metric_type = "l2_distance"
+                    # Re-apply dynamic properties to runtime index object if we stored them
+                    if index_options and hasattr(index_options, "properties") and isinstance(index_options.properties, dict):
+                        for k, v in index_options.properties.items():
+                            if hasattr(self.table.index_options, k):
+                                try:
+                                    setattr(self.table.index_options, k, v)
+                                except Exception:  # noqa: BLE001
+                                    log.debug("Skip setting index_options.%s at runtime", k)
             except Exception:
                 pass