fix pgvecto_rs: fix index and query parameters

Author: BeautyyuYanli

engine/clients/pgvector/search.py

@@ -33,12 +33,8 @@ def search_one(cls, vector: List[float], meta_conditions, top: Optional[int], sc
             cur.execute("BEGIN;")
             # set index create parameter
             for key in cls.search_params["params"].keys():
-                if cls.engine_type == "c":
-                    cur.execute(f"SET LOCAL {key} = {cls.search_params['params'][key]};")
-                else:
-                    # pgvector_rs only support hnsw
-                    cur.execute(f"SET LOCAL vectors.k = {cls.search_params['params']['hnsw.ef_search']};")
-                    break
+                cur.execute(f"SET LOCAL {key} = {cls.search_params['params'][key]};")
+
 
             meta_conditions = cls.parser.parse(meta_conditions)
             if meta_conditions:

engine/clients/pgvector/upload.py

@@ -74,11 +74,7 @@ def post_upload(cls, distance):
         if cls.engine_type == "rust":
             create_index_command = f"""
 CREATE INDEX ON {PGVECTOR_INDEX} USING vectors (vector {cls.distance}) WITH (options=$$
-capacity = {int(cls.vector_count*1.2)}
-[vectors]
-memmap = "ram"
-[algorithm.hnsw]
-memmap = "ram"
+[indexing.hnsw]
 {index_options_rust}
 $$);
 """

experiments/needs_editing/pgvector_rust_HNSW_single_node_laion-768-5m-ip.json

@@ -24,28 +24,28 @@
         "parallel": 4,
         "top": 10,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         }
       },
       {
         "parallel": 4,
         "top": 100,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         }
       },
       {
         "parallel": 8,
         "top": 10,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         }
       },
       {
         "parallel": 8,
         "top": 100,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         }
       }
     ],

experiments/needs_editing/pgvector_rust_HNSW_single_node_laion-768-5m-probability-ip.json

@@ -24,7 +24,7 @@
         "parallel": 4,
         "top": 10,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.01
@@ -34,7 +34,7 @@
         "parallel": 4,
         "top": 10,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.1
@@ -44,7 +44,7 @@
         "parallel": 4,
         "top": 100,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.01
@@ -54,7 +54,7 @@
         "parallel": 4,
         "top": 100,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.1
@@ -64,7 +64,7 @@
         "parallel": 8,
         "top": 10,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.01
@@ -74,7 +74,7 @@
         "parallel": 8,
         "top": 10,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.1
@@ -84,7 +84,7 @@
         "parallel": 8,
         "top": 100,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.01
@@ -94,7 +94,7 @@
         "parallel": 8,
         "top": 100,
         "params": {
-          "hnsw.ef_search": 100
+          "vectors.hnsw_ef_search": 100
         },
         "query_meta": {
           "probability": 0.1