Fixing Bugs in Benchmarking ClickHouse with vectordbbench (zilliztech#523)

* Update cli.py

* Update clickhouse.py

* Update clickhouse.py

* Update cli.py

* Update config.py

* remove space

Author: yuyuankang

vectordb_bench/backend/clients/clickhouse/cli.py

@@ -51,6 +51,7 @@ def Clickhouse(**parameters: Unpack[ClickhouseHNSWTypedDict]):
         db=DB.Clickhouse,
         db_config=ClickhouseConfig(
             db_label=parameters["db_label"],
+            user=parameters["user"],
             password=SecretStr(parameters["password"]) if parameters["password"] else None,
             host=parameters["host"],
             port=parameters["port"],

vectordb_bench/backend/clients/clickhouse/clickhouse.py

@@ -106,7 +106,7 @@ def _create_index(self):
                     query = f"""
                         ALTER TABLE {self.db_config["database"]}.{self.table_name}
                         ADD INDEX {self._index_name} {self._vector_field}
-                        TYPE vector_similarity('hnsw', '{self.index_param["metric_type"]}',
+                        TYPE vector_similarity('hnsw', '{self.index_param["metric_type"]}',{self.dim},
                         '{self.index_param["quantization"]}',
                         {self.index_param["params"]["M"]}, {self.index_param["params"]["efConstruction"]})
                         GRANULARITY {self.index_param["granularity"]}
@@ -115,7 +115,7 @@ def _create_index(self):
                     query = f"""
                         ALTER TABLE {self.db_config["database"]}.{self.table_name}
                         ADD INDEX {self._index_name} {self._vector_field}
-                        TYPE vector_similarity('hnsw', '{self.index_param["metric_type"]}')
+                        TYPE vector_similarity('hnsw', '{self.index_param["metric_type"]}', {self.dim})
                         GRANULARITY {self.index_param["granularity"]}
                         """
                 self.conn.command(cmd=query)
@@ -186,7 +186,7 @@ def search_embedding(
             "vector_field": self._vector_field,
             "schema": self.db_config["database"],
             "table": self.table_name,
-            "gt": filters.get("id"),
+            "gt": 0 if filters is None else filters.get("id", 0),
             "k": k,
             "metric_type": self.search_param["metric_type"],
             "query": query,

vectordb_bench/backend/clients/clickhouse/config.py

@@ -16,7 +16,7 @@ class ClickhouseConfigDict(TypedDict):
 
 
 class ClickhouseConfig(DBConfig):
-    user_name: str = "clickhouse"
+    user: str = "clickhouse"
     password: SecretStr
     host: str = "localhost"
     port: int = 8123
@@ -29,7 +29,7 @@ def to_dict(self) -> ClickhouseConfigDict:
             "host": self.host,
             "port": self.port,
             "database": self.db_name,
-            "user": self.user_name,
+            "user": self.user,
             "password": pwd_str,
             "secure": self.secure,
         }