1st cut plugin adapters

nosqlbench · Oct 5, 2023 · 3a6b849 · 3a6b849
1 parent db00f8c
commit 3a6b849
Show file tree

Hide file tree

Showing 11 changed files with 182 additions and 153 deletions.
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtils.java b/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtils.java
@@ -17,11 +17,17 @@
 package io.nosqlbench.engine.extensions.vectormath;
 
 import com.datastax.oss.driver.api.core.cql.Row;
+import io.nosqlbench.components.NBBaseComponent;
+import io.nosqlbench.components.NBComponent;
 
 import java.util.List;
 import java.util.Objects;
 
-public class CqlUtils {
+public class CqlUtils extends NBBaseComponent {
+
+    public CqlUtils(NBComponent parentComponent) {
+        super(parentComponent);
+    }
 
     public static long[] cqlRowFieldsToLongArray(String fieldName, List<Row> rows) {
         return rows.stream().mapToLong(r -> r.getLong(fieldName)).toArray();

diff --git a/...er-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java b/...er-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java
@@ -31,6 +31,6 @@ public String getDescription() {
 
     @Override
     public CqlUtils getExtensionObject(Logger logger, NBComponent baseComponent) {
-        return new CqlUtils();
+        return new CqlUtils(baseComponent);
     }
 }
diff --git a/...cone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtils.java b/...cone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtils.java
@@ -17,10 +17,16 @@
 package io.nosqlbench.engine.extensions.vectormath;
 
 import com.google.protobuf.Descriptors;
+import io.nosqlbench.components.NBBaseComponent;
+import io.nosqlbench.components.NBComponent;
 import io.pinecone.proto.QueryResponse;
 import io.pinecone.proto.ScoredVector;
 
-public class PineconeScriptingUtils {
+public class PineconeScriptingUtils extends NBBaseComponent {
+
+    public PineconeScriptingUtils(NBComponent parentComponent) {
+        super(parentComponent);
+    }
 
     public String[] responseIdsToStringArray(QueryResponse response) {
         return response.getMatchesList().stream().map(ScoredVector::getId).toArray(String[]::new);

diff --git a/...ain/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsPluginInfo.java b/...ain/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsPluginInfo.java
@@ -30,6 +30,6 @@ public String getDescription() {
 
     @Override
     public PineconeScriptingUtils getExtensionObject(Logger logger, NBComponent baseComponent) {
-        return new PineconeScriptingUtils();
+        return new PineconeScriptingUtils(baseComponent);
     }
 }
diff --git a/.../src/test/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsTest.java b/.../src/test/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsTest.java
@@ -19,6 +19,7 @@
 
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
+import io.nosqlbench.components.NBBaseComponent;
 import io.pinecone.proto.QueryResponse;
 import io.pinecone.proto.ScoredVector;
 import org.junit.jupiter.api.Test;
@@ -50,7 +51,7 @@ private QueryResponse generateQueryResponse() {
     @Test
     void responseIdsToStringArrayTest() {
         QueryResponse response = generateQueryResponse();
-        PineconeScriptingUtils utils = new PineconeScriptingUtils();
+        PineconeScriptingUtils utils = new PineconeScriptingUtils(new NBBaseComponent(null));
         String[] ids = utils.responseIdsToStringArray(response);
         assert(ids.length == 3);
         assert(ids[0].equals("1"));
@@ -61,7 +62,7 @@ void responseIdsToStringArrayTest() {
     @Test
     void responseIdsToIntArrayTest() {
         QueryResponse response = generateQueryResponse();
-        PineconeScriptingUtils utils = new PineconeScriptingUtils();
+        PineconeScriptingUtils utils = new PineconeScriptingUtils(new NBBaseComponent(null));
         int[] ids = utils.responseIdsToIntArray(response);
         assert(ids.length == 3);
         assert(ids[0] == 1);
@@ -72,7 +73,7 @@ void responseIdsToIntArrayTest() {
     @Test
     void responseIdsToLongArrayTest() {
         QueryResponse response = generateQueryResponse();
-        PineconeScriptingUtils utils = new PineconeScriptingUtils();
+        PineconeScriptingUtils utils = new PineconeScriptingUtils(new NBBaseComponent(null));
         long[] ids = utils.responseIdsToLongArray(response);
         assert(ids.length == 3);
         assert(ids[0] == 1L);
@@ -83,7 +84,7 @@ void responseIdsToLongArrayTest() {
     @Test
     void responseFieldToStringArrayTest() {
         QueryResponse response = generateQueryResponse();
-        PineconeScriptingUtils utils = new PineconeScriptingUtils();
+        PineconeScriptingUtils utils = new PineconeScriptingUtils(new NBBaseComponent(null));
         String[] ids = utils.responseFieldToStringArray("a", response);
         assert(ids.length == 3);
         assert(ids[0].equals("4"));
@@ -94,7 +95,7 @@ void responseFieldToStringArrayTest() {
     @Test
     void responseFieldToIntArrayTest() {
         QueryResponse response = generateQueryResponse();
-        PineconeScriptingUtils utils = new PineconeScriptingUtils();
+        PineconeScriptingUtils utils = new PineconeScriptingUtils(new NBBaseComponent(null));
         int[] ids = utils.responseFieldToIntArray("b", response);
         assert(ids.length == 3);
         assert(ids[0] == 5);
@@ -105,7 +106,7 @@ void responseFieldToIntArrayTest() {
     @Test
     void responseFieldToLongArrayTest() {
         QueryResponse response = generateQueryResponse();
-        PineconeScriptingUtils utils = new PineconeScriptingUtils();
+        PineconeScriptingUtils utils = new PineconeScriptingUtils(new NBBaseComponent(null));
         long[] ids = utils.responseFieldToLongArray("c", response);
         assert(ids.length == 3);
         assert(ids[0] == 6L);

diff --git a/...main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java b/...main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java
@@ -33,7 +33,7 @@ public String getDescription() {
 
     @Override
     public ComputeFunctions getExtensionObject(Logger logger, NBComponent baseComponent) {
-        return new ComputeFunctions();
+        return new ComputeFunctions(baseComponent);
     }
 
     @Override

diff --git a/...ions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java b/...ions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java
@@ -16,6 +16,9 @@
 
 package io.nosqlbench.engine.extensions.computefunctions;
 
+import io.nosqlbench.components.NBBaseComponent;
+import io.nosqlbench.components.NBComponent;
+
 import java.util.Arrays;
 import java.util.DoubleSummaryStatistics;
 import java.util.HashSet;
@@ -39,7 +42,11 @@
  * these methods will yield incorrect results as they rely on the <EM>two-pointer</EM> method and do not
  * elide duplicates internally.
  */
-public class ComputeFunctions {
+public class ComputeFunctions extends NBBaseComponent {
+
+    public ComputeFunctions(NBComponent parentComponent) {
+        super(parentComponent);
+    }
 
     /**
      * Compute the recall as the proportion of matching indices divided by the expected indices

diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePlugin.java
@@ -17,8 +17,14 @@
 package io.nosqlbench.engine.extensions.example;
 
 import io.nosqlbench.api.extensions.SandboxPlugin;
+import io.nosqlbench.components.NBBaseComponent;
+import io.nosqlbench.components.NBComponent;
 
-public class ExamplePlugin implements SandboxPlugin {
+public class ExamplePlugin extends NBBaseComponent implements SandboxPlugin {
+
+    public ExamplePlugin(NBComponent parentComponent) {
+        super(parentComponent);
+    }
 
     public long getSum(int addend1, int addend2) {
         return addend1 + addend2;

diff --git a/...e-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java b/...e-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
@@ -16,7 +16,6 @@
 
 package io.nosqlbench.engine.extensions.example;
 
-import io.nosqlbench.api.config.LabeledScenarioContext;
 import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
 import io.nosqlbench.components.NBComponent;
 import io.nosqlbench.nb.annotations.Service;
@@ -33,7 +32,7 @@ public String getDescription() {
 
     @Override
     public ExamplePlugin getExtensionObject(final Logger logger, final NBComponent baseComponent) {
-        return new ExamplePlugin();
+        return new ExamplePlugin(baseComponent);
     }
 
 }
diff --git a/nb-api/src/main/java/io/nosqlbench/components/NBBuilders.java b/nb-api/src/main/java/io/nosqlbench/components/NBBuilders.java
@@ -102,6 +102,10 @@ public PromPushReporterComponent pushReporter(String targetUri, int seconds, Str
         return reporter;
     }
 
+//    public ExamplePlugin getExamplePlugin(final NBComponent component) {
+//        return new ExamplePlugin(component);
+//    }
+
     public static class csvReporterBuilder {
         private final NBComponent component;
         private Path reportTo = Path.of("metrics.csv");