make m,ef_construction,dimensions static in os index create

nosqlbench · Feb 15, 2024 · 33389ea · 33389ea
1 parent 4ad42f8
commit 33389ea
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 114 deletions.
diff --git a/...rch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/CreateIndexOpDispenser.java b/...rch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/CreateIndexOpDispenser.java
@@ -30,8 +30,17 @@
 
 public class CreateIndexOpDispenser extends BaseOpenSearchOpDispenser {
 
+    private final ParsedOp pop;
+    private final int dimensions;
+    private final int ef_construction;
+    private final int m;
+
     public CreateIndexOpDispenser(OpenSearchAdapter adapter, ParsedOp op, LongFunction<String> targetF) {
         super(adapter, op, targetF);
+        this.pop = op;
+        this.dimensions = pop.getStaticValue("dimensions",Integer.class).intValue();
+        this.ef_construction = pop.getStaticValue("ef_construction",Integer.class).intValue();
+        this.m = pop.getStaticValue("m",Integer.class).intValue();
     }
 
     @Override
@@ -50,6 +59,7 @@ public LongFunction<CreateIndexOp> createOpFunc(LongFunction<OpenSearchClient> c
 
     // https://opensearch.org/docs/latest/search-plugins/knn/knn-index/
     private CreateIndexRequest.Builder resolveTypeMapping(CreateIndexRequest.Builder eb, Map<?, ?> mappings) {
+
         TypeMapping.Builder builder = new TypeMapping.Builder().properties(
                 Map.of(
                     "key",
@@ -59,13 +69,18 @@ private CreateIndexRequest.Builder resolveTypeMapping(CreateIndexRequest.Builder
                     "value",
                     new Property.Builder()
                         .knnVector(new KnnVectorProperty.Builder()
-                            .dimension(25)
+                            .dimension(dimensions)
                             .method(
                                 new KnnVectorMethod.Builder()
                                     .name("hnsw")
                                     .engine("faiss")
                                     .spaceType("l2")
-                                    .parameters(Map.of("ef_construction", JsonData.of(256), "m", JsonData.of(8)))
+                                    .parameters(
+                                        Map.of(
+                                            "ef_construction", JsonData.of(ef_construction),
+                                            "m", JsonData.of(m)
+                                        )
+                                    )
                                     .build()
                             ).build()
                         ).build()

diff --git a/adapter-aws-opensearch/src/main/resources/activities/osvectors.yaml b/adapter-aws-opensearch/src/main/resources/activities/osvectors.yaml