quick fix for missing labels in measures

nosqlbench · Sep 11, 2023 · b3b361b · b3b361b
1 parent c0171dc
commit b3b361b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml b/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml
@@ -71,11 +71,8 @@ blocks:
       insert: |
         INSERT INTO TEMPLATE(keyspace,baselines).TEMPLATE(table,vectors)
         (key, value) VALUES ({id},{train_floatlist});
-#  await_index:
-#    ops:
   search_and_index:
     ops:
-      select_ann_limit_borked:
       select_ann_limit:
         prepared: |
           SELECT * FROM TEMPLATE(keyspace,baselines).TEMPLATE(table,vectors)

diff --git a/...ava/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java b/...ava/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java
@@ -16,12 +16,13 @@
 
 package io.nosqlbench.engine.extensions.computefunctions.relavency;
 
+import io.nosqlbench.api.labels.NBLabeledElement;
 import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.api.engine.metrics.wrappers.RelevancyFunction;
 
 public abstract class BaseRelevancyFunction implements RelevancyFunction {
     private final String name;
-    private final NBLabels labels;
+    private NBLabels labels;
 
     public BaseRelevancyFunction(String name, NBLabels labels) {
         this.name = name;
@@ -36,4 +37,10 @@ public NBLabels getLabels() {
     public String getName() {
         return this.name;
     }
+
+    @Override
+    public void prependLabels(NBLabeledElement prepend) {
+        this.labels = prepend.getLabels().and(this.labels);
+
+    }
 }
diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyFunction.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyFunction.java
@@ -27,4 +27,6 @@ public interface RelevancyFunction extends NBLabeledElement {
      * @return A string which can be used to identify if the metric exists yet.
      */
     String getUniqueName();
+
+    void prependLabels(NBLabeledElement prepend);
 }
diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyMeasures.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyMeasures.java
@@ -57,6 +57,7 @@ public NBLabels getLabels() {
     public RelevancyMeasures addFunction(RelevancyFunction... f) {
         for (RelevancyFunction function : f) {
             this.functions.add(function);
+            function.prependLabels(this);
             DoubleSummaryGauge gauge = ActivityMetrics.summaryGauge(function, function.getUniqueName());
             this.gauges.add(gauge);
         }