From 112ad332cd5bbec4b1fc4f1efcb9110c4fba91f1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Sep 2023 13:20:52 -0500 Subject: [PATCH] fixups and package structure updates --- .../adapter/amqp/util/AmqpAdapterMetrics.java | 4 +- .../cqlgen/binders/NamingFolio.java | 4 +- .../cqlgen/bindspecs/BindingSpec.java | 2 +- .../cqlgen/bindspecs/BindingSpecImpl.java | 2 +- .../cqlgen/core/CGElementNamer.java | 2 +- .../cqlgen/model/CqlColumnBase.java | 6 +-- .../cqlgen/model/CqlKeyspaceDef.java | 4 +- .../io/nosqlbench/cqlgen/model/CqlTable.java | 4 +- .../cqlgen/model/CqlTableColumn.java | 2 +- .../io/nosqlbench/cqlgen/model/CqlType.java | 4 +- .../cqlgen/model/CqlTypeColumn.java | 2 +- .../transformers/CGCachingNameRemapper.java | 4 +- .../transformers/namecache/NamedColumn.java | 2 +- .../transformers/namecache/NamedKeyspace.java | 2 +- .../transformers/namecache/NamedTable.java | 2 +- .../transformers/namecache/NamedType.java | 2 +- .../baselines/astra_vectors_live.yaml | 19 ++++----- .../cql/exporters/CGElementNamerTest.java | 4 +- .../adapter/diag/optasks/BaseDiagTask.java | 4 +- .../adapter/diag/optasks/DiagTask.java | 2 +- .../adapter/diag/optasks/DiagTask_gauge.java | 2 +- .../diag/optasks/DiagTask_gaugeTest.java | 2 +- .../adapter/http/core/HttpMetrics.java | 4 +- .../adapter/http/core/HttpSpace.java | 4 +- .../adapter/http/HttpOpMapperTest.java | 2 +- .../kafka/util/KafkaAdapterMetrics.java | 4 +- .../api/activityimpl/BaseOpDispenser.java | 4 +- .../adapters/api/templating/ParsedOp.java | 6 +-- .../adapters/api/templating/ParsedOpTest.java | 2 +- .../engine/api/activityapi/core/Activity.java | 2 +- .../api/activityapi/core/ActivityType.java | 2 +- .../inputs/cyclelog/CycleLogInput.java | 4 +- .../errorhandling/ErrorMetrics.java | 2 +- .../ratelimits/HybridRateLimiter.java | 2 +- .../ratelimits/InlineTokenPool.java | 2 +- .../activityapi/ratelimits/RateLimiters.java | 2 +- .../ratelimits/ThreadDrivenTokenPool.java | 2 +- .../activityapi/ratelimits/TokenFiller.java | 2 +- .../api/activityapi/ratelimits/TokenPool.java | 2 +- .../api/activityimpl/SimpleActivity.java | 6 +-- .../api/activityimpl/input/AtomicInput.java | 4 +- .../uniform/StandardActivity.java | 4 +- .../uniform/StandardActivityType.java | 2 +- .../api/metrics/ExceptionCountMetrics.java | 2 +- ...tionExpectedResultVerificationMetrics.java | 2 +- .../api/metrics/ExceptionHistoMetrics.java | 2 +- .../api/metrics/ExceptionMeterMetrics.java | 2 +- .../api/metrics/ExceptionTimerMetrics.java | 2 +- .../modular/NBErrorHandlerTest.java | 2 +- .../RateLimiterPerfTestMethods.java | 2 +- .../ratelimits/TestHybridRateLimiterPerf.java | 2 +- .../ratelimits/TestRateLimiterPerf1E7.java | 2 +- .../ratelimits/TestRateLimiterPerf1E8.java | 2 +- .../ratelimits/TestRateLimiterPerfSingle.java | 2 +- .../ratelimits/TestableHybridRateLimiter.java | 2 +- .../activityapi/ratelimits/TokenPoolTest.java | 4 +- .../activityimpl/input/AtomicInputTest.java | 2 +- .../api/metrics/HistoIntervalLoggerTest.java | 2 +- .../api/metrics/NBMetricHistogramTest.java | 2 +- .../engine/api/metrics/TestHistoTypes.java | 2 +- .../java/io/nosqlbench/engine/cli/NBCLI.java | 4 +- .../nosqlbench/engine/cli/NBCLIOptions.java | 4 +- .../GrafanaMetricsAnnotatorTest.java | 4 +- .../engine/core/annotation/Annotators.java | 2 + .../lifecycle/activity/ActivityExecutor.java | 5 +-- .../lifecycle/activity/ActivityLoader.java | 2 +- .../activity/ActivityTypeLoader.java | 2 +- .../core/lifecycle/scenario/Scenario.java | 4 +- .../scenario/ScenarioController.java | 4 +- .../scenario/script/MetricsMapper.java | 2 +- .../scenario/script/ScenarioContext.java | 2 +- .../engine/core/metadata/MarkdownFinder.java | 2 +- .../engine/core/ActivityExecutorTest.java | 2 +- .../nosqlbench/engine/core/CoreMotorTest.java | 2 +- .../core/metrics/NBMetricsSummaryTest.java | 2 +- .../computefunctions/RelevancyFunctions.java | 2 +- .../relavency/AveragePrecision.java | 2 +- .../relavency/BaseRelevancyFunction.java | 2 +- .../computefunctions/relavency/F1.java | 2 +- .../computefunctions/relavency/Precision.java | 2 +- .../computefunctions/relavency/Recall.java | 2 +- .../relavency/ReciprocalRank.java | 2 +- .../scriptingmetrics/ScriptingMetrics.java | 2 +- .../api/annotations/Annotation.java | 4 +- .../api/annotations/AnnotationBuilder.java | 2 +- .../annotations/AnnotationBuilderFacets.java | 2 +- .../api/annotations/MutableAnnotation.java | 4 +- .../api/config/LabeledScenarioContext.java | 2 + .../api/engine/metrics/ActivityMetrics.java | 6 +-- .../metrics/DeltaHdrHistogramReservoir.java | 4 +- .../engine/metrics/DoubleSummaryGauge.java | 2 +- .../metrics/instruments/NBFunctionGauge.java | 4 +- .../metrics/instruments/NBMetricCounter.java | 4 +- .../metrics/instruments/NBMetricGauge.java | 2 +- .../instruments/NBMetricGaugeWrapper.java | 2 +- .../instruments/NBMetricHistogram.java | 4 +- .../metrics/instruments/NBMetricMeter.java | 4 +- .../metrics/instruments/NBMetricTimer.java | 4 +- .../reporters/PromExpositionFormat.java | 4 +- .../metrics/wrappers/RelevancyFunction.java | 2 +- .../metrics/wrappers/RelevancyMeasures.java | 4 +- .../api/{config => labels}/MapLabels.java | 2 +- .../nosqlbench/api/labels/MutableLabels.java | 3 -- .../api/{config => labels}/NBLabelSpec.java | 2 +- .../{config => labels}/NBLabeledElement.java | 4 +- .../api/{config => labels}/NBLabels.java | 2 +- .../standard => labels}/NBLabelsFilter.java | 4 +- .../nosqlbench/api/labels/NBLabelsResult.java | 40 ++++++++++++++++++ .../NBLabelsValidator.java | 42 +++++++------------ .../reporters/PromExpositionFormatTest.java | 2 +- .../api/{config => labels}/MapLabelsTest.java | 3 +- .../NBLabeledElementTest.java | 3 +- .../NBLabelsFilterTest.java | 5 ++- .../NBLabelsValidatorTest.java | 5 +-- .../annotations/AnnotationBuilderTest.java | 2 +- .../core/script/MetricsIntegrationTest.java | 2 +- 116 files changed, 226 insertions(+), 195 deletions(-) rename nb-api/src/main/java/io/nosqlbench/api/{config => labels}/MapLabels.java (99%) rename nb-api/src/main/java/io/nosqlbench/api/{config => labels}/NBLabelSpec.java (98%) rename nb-api/src/main/java/io/nosqlbench/api/{config => labels}/NBLabeledElement.java (94%) rename nb-api/src/main/java/io/nosqlbench/api/{config => labels}/NBLabels.java (99%) rename nb-api/src/main/java/io/nosqlbench/api/{config/standard => labels}/NBLabelsFilter.java (95%) create mode 100644 nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsResult.java rename nb-api/src/main/java/io/nosqlbench/api/{config/standard => labels}/NBLabelsValidator.java (65%) rename nb-api/src/test/java/io/nosqlbench/api/{config => labels}/MapLabelsTest.java (94%) rename nb-api/src/test/java/io/nosqlbench/api/{config => labels}/NBLabeledElementTest.java (92%) rename nb-api/src/test/java/io/nosqlbench/api/{config/standard => labels}/NBLabelsFilterTest.java (94%) rename nb-api/src/test/java/io/nosqlbench/api/{config/standard => labels}/NBLabelsValidatorTest.java (92%) diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java index 8c553baff..186f44cd9 100644 --- a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java +++ b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java @@ -20,8 +20,8 @@ import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; import io.nosqlbench.adapter.amqp.dispensers.AmqpBaseOpDispenser; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java index 4d131546c..4edf6617d 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java @@ -16,12 +16,12 @@ package io.nosqlbench.cqlgen.binders; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.cqlgen.model.CqlColumnBase; import io.nosqlbench.cqlgen.model.CqlModel; import io.nosqlbench.cqlgen.model.CqlTable; import io.nosqlbench.cqlgen.core.CGElementNamer; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.*; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java index 906c2c85a..e09b1dfb8 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.bindspecs; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; public interface BindingSpec { diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java index c33609ab3..da2036608 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.bindspecs; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; public class BindingSpecImpl implements BindingSpec { private NBLabeledElement target; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java index 2d1427109..72e3174c4 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.core; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java index 472a70591..91be45b6a 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java @@ -16,11 +16,9 @@ package io.nosqlbench.cqlgen.model; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.NBNamedElement; -import io.nosqlbench.api.config.NBLabeledElement; - -import java.util.Map; +import io.nosqlbench.api.labels.NBLabeledElement; public abstract class CqlColumnBase implements NBNamedElement, NBLabeledElement { diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java index 0394d09aa..718aebdd8 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java @@ -17,9 +17,9 @@ package io.nosqlbench.cqlgen.model; import com.datastax.oss.driver.internal.core.util.Strings; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.NBNamedElement; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.cqlgen.core.CGKeyspaceStats; import java.util.*; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java index da5d72778..1eb4adbd1 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java @@ -16,9 +16,9 @@ package io.nosqlbench.cqlgen.model; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.NBNamedElement; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.cqlgen.core.CGTableStats; import io.nosqlbench.cqlgen.transformers.ComputedTableStats; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java index b14c0458d..32ebd264f 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.model; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; public class CqlTableColumn extends CqlColumnBase { diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java index 09f092375..bfc28e8e9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java @@ -16,8 +16,8 @@ package io.nosqlbench.cqlgen.model; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.NBNamedElement; import java.util.ArrayList; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java index 2a6a91b13..da635f523 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.model; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; public class CqlTypeColumn extends CqlColumnBase { diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java index af4611ca9..c139a6fdf 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java @@ -16,8 +16,8 @@ package io.nosqlbench.cqlgen.transformers; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.virtdata.library.basics.shared.from_long.to_string.Combinations; import java.util.HashMap; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java index bc7868be9..6ae9c993f 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.transformers.namecache; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.Map; import java.util.function.Function; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java index 07c6f2705..a030b9a93 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.transformers.namecache; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java index aa40b24a8..18bde8f4c 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.transformers.namecache; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java index aec8edbba..cff2197f7 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java @@ -16,7 +16,7 @@ package io.nosqlbench.cqlgen.transformers.namecache; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.ArrayList; import java.util.LinkedHashMap; 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 index 684d1a18c..16062eb78 100644 --- a/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml @@ -34,8 +34,6 @@ scenarios: params: driver: cqld4 instrument: true - labels: - k: bindings: id: ToString() @@ -78,13 +76,7 @@ blocks: search_and_index: ops: select_ann_limit_borked: - raw: | - SELECT (nonextant) FROM TEMPLATE(keyspace,baselines).TEMPLATE(table,vectors) - ORDER BY value ANN OF {test_floatlist} LIMIT TEMPLATE(select_limit,100); - tags: - optype: select select_ann_limit: - ratio: 99 prepared: | SELECT * FROM TEMPLATE(keyspace,baselines).TEMPLATE(table,vectors) ORDER BY value ANN OF {test_floatlist} LIMIT TEMPLATE(select_limit,100); @@ -92,12 +84,19 @@ blocks: optype: select verifier-init: | relevancy=scriptingmetrics.newRelevancyMeasures(_parsed_op,"group","relevancy"); - for (int k in List.of(1,2,3,5,10,25,50,75,100)) { + for (int k in List.of(100)) { relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.recall("recall",k)); relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.precision("precision",k)); + relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.F1("F1",k)); relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.reciprocal_rank("RR",k)); relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.average_precision("AP",k)); - relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.F1("F1",k)); + } + for (int k in List.of(1,2,3,5,10,25,50,75)) { + relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.recall("s_recall",k)); + relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.precision("s_precision",k)); + relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.F1("s_F1",k)); + relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.reciprocal_rank("s_RR",k)); + relevancy.addFunction(io.nosqlbench.engine.extensions.computefunctions.RelevancyFunctions.average_precision("s_AP",k)); } verifier: | // driver-specific function diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java b/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java index 36853c008..60e98f6de 100644 --- a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java +++ b/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java @@ -16,8 +16,8 @@ package io.nosqlbench.converters.cql.exporters; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.cqlgen.core.CGElementNamer; import org.junit.jupiter.api.Test; diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java index a20ece395..37e291c72 100644 --- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java +++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java @@ -16,8 +16,8 @@ package io.nosqlbench.adapter.diag.optasks; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import java.util.Map; diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java index b8d19423b..6b5b01115 100644 --- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java +++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java @@ -16,7 +16,7 @@ package io.nosqlbench.adapter.diag.optasks; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.config.standard.NBConfigurable; import io.nosqlbench.api.config.standard.NBReconfigurable; diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java index a8b20f6a5..75e36089e 100644 --- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java +++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java @@ -17,7 +17,7 @@ package io.nosqlbench.adapter.diag.optasks; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.standard.*; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.nb.annotations.Service; diff --git a/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java b/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java index 4e38b8d1a..7a44cfdb1 100644 --- a/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java +++ b/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java @@ -16,7 +16,7 @@ package io.nosqlbench.adapter.diag.optasks; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.config.standard.NBConfiguration; import org.assertj.core.data.Offset; import org.junit.jupiter.api.Test; diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java b/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java index da7c833c3..b44aeb53a 100644 --- a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java +++ b/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java @@ -17,8 +17,8 @@ package io.nosqlbench.adapter.http.core; import com.codahale.metrics.Histogram; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ActivityMetrics; public class HttpMetrics implements NBLabeledElement { diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java b/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java index f44490241..8dcc87cc4 100644 --- a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java +++ b/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java @@ -16,8 +16,8 @@ package io.nosqlbench.adapter.http.core; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.standard.ConfigModel; import io.nosqlbench.api.config.standard.NBConfigModel; import io.nosqlbench.api.config.standard.NBConfiguration; diff --git a/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java b/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java index f48be3f31..b24f5d111 100644 --- a/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java +++ b/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.adapter.http; import io.nosqlbench.adapter.http.core.HttpOpMapper; import io.nosqlbench.adapter.http.core.HttpSpace; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.config.standard.NBConfiguration; import io.nosqlbench.adapters.api.activityconfig.OpsLoader; import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate; diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java index f4d69a731..ebf93c1e7 100644 --- a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java +++ b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java @@ -20,8 +20,8 @@ import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; import io.nosqlbench.adapter.kafka.dispensers.KafkaBaseOpDispenser; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java index 129012431..04d19a2c5 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java @@ -23,8 +23,8 @@ import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op; import io.nosqlbench.adapters.api.evalcontext.*; import io.nosqlbench.adapters.api.metrics.ThreadLocalNamedTimers; import io.nosqlbench.adapters.api.templating.ParsedOp; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.api.errors.OpConfigError; import io.nosqlbench.virtdata.core.templates.ParsedTemplateString; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java index ac5cf1137..c664180e3 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java @@ -17,9 +17,9 @@ package io.nosqlbench.adapters.api.templating; import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate; -import io.nosqlbench.api.config.NBLabelSpec; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabelSpec; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.fieldreaders.DynamicFieldReader; import io.nosqlbench.api.config.fieldreaders.StaticFieldReader; import io.nosqlbench.api.config.standard.NBConfigError; diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java b/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java index aad4374fd..9277544fa 100644 --- a/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java +++ b/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.adapters.api.templating; import io.nosqlbench.adapters.api.activityconfig.OpsLoader; import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.adapters.api.activityconfig.yaml.OpData; import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplateFormat; import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java index 212317696..99f11e39a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java @@ -24,7 +24,7 @@ import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.activityimpl.ParameterMap; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java index 60b18b473..6f894b162 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java @@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityimpl.CoreServices; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.activityimpl.action.CoreActionDispenser; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.api.engine.activityimpl.ActivityDef; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java index 1832ab667..f7f980b27 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegmentBuffer; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java index acc3e5433..8feb2b72c 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.errorhandling; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics; import io.nosqlbench.engine.api.metrics.ExceptionExpectedResultVerificationMetrics; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java index 19363a6cb..4cae4f528 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.nb.annotations.Service; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java index 089e7f121..02dc96f7a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.util.Colors; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java index 47246dbd9..61988cd5c 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiters.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java index f547e2343..701d0d64d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/ThreadDrivenTokenPool.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.nb.annotations.Service; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java index ce05544ad..4141cedee 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenFiller.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java index 548e7ba34..7bbc0648f 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPool.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; public interface TokenPool { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java index 441292e48..bc36add7b 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityimpl; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabelSpec; +import io.nosqlbench.api.labels.NBLabelSpec; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.api.activityapi.core.progress.ActivityMetricProgressMeter; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; @@ -29,8 +29,8 @@ import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters; import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.standard.NBConfiguration; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java index 5ace4dbef..3f55fcf31 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityimpl.input; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.activityimpl.CyclesSpec; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java index de1cc0d71..1cf1c9ec9 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java @@ -27,8 +27,8 @@ import io.nosqlbench.adapters.api.activityimpl.uniform.decorators.SyntheticOpTem import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.api.Shutdownable; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.standard.*; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java index 95eb3428f..f3c2ceccb 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityimpl.uniform; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.config.standard.NBConfigModel; import io.nosqlbench.api.config.standard.NBConfiguration; import io.nosqlbench.api.config.standard.NBReconfigurable; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java index f9f71ff9d..23141d45d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Counter; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import java.util.ArrayList; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java index 36527851b..d933dfc88 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Counter; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java index 198491a4e..c51f27c14 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Histogram; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java index a4505945e..6275791c9 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Meter; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import java.util.ArrayList; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java index b7e7f7f14..2d49f8706 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java index 639579579..ab40b8fcf 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java @@ -24,7 +24,7 @@ import io.nosqlbench.api.errors.ResultMismatchError; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.CountErrorHandler; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.CounterErrorHandler; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.util.NBMock; import io.nosqlbench.util.NBMock.LogAppender; import org.apache.logging.log4j.Level; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java index 4843fc455..1c58938ba 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.engine.api.util.Colors; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import io.nosqlbench.api.testutils.Bounds; import io.nosqlbench.api.testutils.Perf; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java index 18692f880..00a5469df 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.testutils.Perf; import io.nosqlbench.api.testutils.Result; import org.junit.jupiter.api.Disabled; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java index 1ffc378d3..59004d832 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.testutils.Perf; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java index 6534afbbb..2ce9de5d5 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.testutils.Perf; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java index 4f08715e9..fd803d178 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.testutils.Result; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestableHybridRateLimiter.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestableHybridRateLimiter.java index 528c93b11..6b909e67c 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestableHybridRateLimiter.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestableHybridRateLimiter.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.util.concurrent.atomic.AtomicLong; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java index 022cd0894..c13ef72b3 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TokenPoolTest.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.activityimpl.ParameterMap; import org.junit.jupiter.api.Test; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java index 992133ec5..1530a586d 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityimpl.input; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import org.junit.jupiter.api.Test; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java index 7e7173ced..2c72d2f7d 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.metrics; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import io.nosqlbench.api.engine.metrics.HistoIntervalLogger; import io.nosqlbench.api.engine.metrics.instruments.NBMetricHistogram; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java index a568899eb..35a35bfef 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.metrics; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ConvenientSnapshot; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import io.nosqlbench.api.engine.metrics.instruments.NBMetricHistogram; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java index 40e230d8d..e4ede1693 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.ExponentiallyDecayingReservoir; import com.codahale.metrics.Snapshot; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index 5937bc347..416a47ffa 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -20,8 +20,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import io.nosqlbench.api.annotations.Annotation; import io.nosqlbench.api.annotations.Layer; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.content.Content; import io.nosqlbench.api.content.NBIO; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java index bf7026f03..2851c85ad 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.cli; -import io.nosqlbench.api.config.NBLabelSpec; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabelSpec; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.util.Unit; import io.nosqlbench.api.errors.BasicError; import io.nosqlbench.api.logging.NBLogLevel; diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java index 6367e3bd8..d317f9679 100644 --- a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java +++ b/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java @@ -18,8 +18,8 @@ package io.nosqlbench.engine.clients.grafana.annotator; import io.nosqlbench.api.annotations.Annotation; import io.nosqlbench.api.annotations.Layer; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.system.NBStatePath; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java index 2e6b519ae..fd66e87b6 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java @@ -19,6 +19,8 @@ package io.nosqlbench.engine.core.annotation; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import io.nosqlbench.api.config.standard.*; +import io.nosqlbench.api.labels.NBLabelsFilter; +import io.nosqlbench.api.labels.NBLabelsValidator; import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.api.annotations.Annotation; import io.nosqlbench.api.annotations.Annotator; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java index 72edc5212..ec5e191a2 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java @@ -15,8 +15,8 @@ */ package io.nosqlbench.engine.core.lifecycle.activity; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.api.activityimpl.MotorState; import io.nosqlbench.api.annotations.Annotation; @@ -30,7 +30,6 @@ import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally; import io.nosqlbench.engine.core.annotation.Annotators; import io.nosqlbench.engine.core.lifecycle.ExecutionResult; import io.nosqlbench.engine.core.lifecycle.IndexedThreadFactory; -import io.nosqlbench.engine.core.lifecycle.scenario.Scenario; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java index 81978b5e1..c679f5df4 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.activity; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivityType; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java index 6cce4bbfc..d8df12f13 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.activity; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java index 0774b5c6b..431a7653f 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java @@ -19,8 +19,8 @@ import com.codahale.metrics.MetricRegistry; import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine; import io.nosqlbench.api.annotations.Annotation; import io.nosqlbench.api.annotations.Layer; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.api.metadata.ScenarioMetadata; import io.nosqlbench.api.metadata.ScenarioMetadataAware; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java index fca84474e..fccc7f7b0 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/ScenarioController.java @@ -15,8 +15,8 @@ */ package io.nosqlbench.engine.core.lifecycle.scenario; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.activityimpl.ParameterMap; import io.nosqlbench.api.engine.metrics.ActivityMetrics; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/MetricsMapper.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/MetricsMapper.java index 3d0e1ce55..378ca2edf 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/MetricsMapper.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/MetricsMapper.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.scenario.script; import com.codahale.metrics.*; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.api.engine.activityimpl.ActivityDef; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioContext.java index e98a09f2c..8bf3cb8db 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioContext.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioContext.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.scenario.script; import io.nosqlbench.api.config.LabeledScenarioContext; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer; import io.nosqlbench.engine.core.lifecycle.scenario.ScenarioController; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java b/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java index 9801d326a..0adda87e4 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.metadata; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.core.lifecycle.activity.ActivityTypeLoader; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java index 654af310e..f00d25731 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.api.activityapi.input.Input; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java index bf904f72e..0d9f20fbf 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.Activity; diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java index 03ea46769..dad8428a4 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.core.metrics; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import org.junit.jupiter.api.Test; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java index 1f54fd92c..80f7249b3 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.extensions.computefunctions.relavency.*; import java.util.Map; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java index 512ebf1c4..d1c0167af 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions.relavency; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions; import java.util.Map; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java index b6d5c4f39..94d85b9ad 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions.relavency; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.wrappers.RelevancyFunction; public abstract class BaseRelevancyFunction implements RelevancyFunction { diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java index 443efc940..7c7d6d44f 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions.relavency; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions; import java.util.Map; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java index 255e75c83..d864a54ce 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions.relavency; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions; import java.util.Map; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java index ab832099f..2dc699af2 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions.relavency; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions; import java.util.Map; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java index cced4a7bf..da9a79fd4 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.extensions.computefunctions.relavency; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.engine.extensions.computefunctions.ComputeFunctions; import java.util.Map; diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java index 0c1d801e3..16ba1f7ba 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetrics.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.extensions.scriptingmetrics; import com.codahale.metrics.MetricRegistry; import io.nosqlbench.api.config.LabeledScenarioContext; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.api.engine.metrics.DoubleSummaryGauge; import io.nosqlbench.api.engine.metrics.wrappers.RelevancyMeasures; diff --git a/nb-api/src/main/java/io/nosqlbench/api/annotations/Annotation.java b/nb-api/src/main/java/io/nosqlbench/api/annotations/Annotation.java index 10033f2c8..180780736 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/annotations/Annotation.java +++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/Annotation.java @@ -16,8 +16,8 @@ package io.nosqlbench.api.annotations; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import java.util.Map; import java.util.function.Function; diff --git a/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilder.java b/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilder.java index 97a307b39..ccae0d382 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilder.java +++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilder.java @@ -16,7 +16,7 @@ package io.nosqlbench.api.annotations; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import java.time.ZoneId; import java.util.LinkedHashMap; diff --git a/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilderFacets.java b/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilderFacets.java index dbd36f25b..c96c725d9 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilderFacets.java +++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/AnnotationBuilderFacets.java @@ -16,7 +16,7 @@ package io.nosqlbench.api.annotations; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; public interface AnnotationBuilderFacets { diff --git a/nb-api/src/main/java/io/nosqlbench/api/annotations/MutableAnnotation.java b/nb-api/src/main/java/io/nosqlbench/api/annotations/MutableAnnotation.java index 26f86ede7..c166afd6d 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/annotations/MutableAnnotation.java +++ b/nb-api/src/main/java/io/nosqlbench/api/annotations/MutableAnnotation.java @@ -19,8 +19,8 @@ package io.nosqlbench.api.annotations; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import java.time.Instant; import java.time.ZoneId; diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/LabeledScenarioContext.java b/nb-api/src/main/java/io/nosqlbench/api/config/LabeledScenarioContext.java index 17b95f612..83d16cf8e 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/LabeledScenarioContext.java +++ b/nb-api/src/main/java/io/nosqlbench/api/config/LabeledScenarioContext.java @@ -16,6 +16,8 @@ package io.nosqlbench.api.config; +import io.nosqlbench.api.labels.NBLabeledElement; + import javax.script.ScriptContext; public interface LabeledScenarioContext extends ScriptContext, NBLabeledElement { diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java index 844b9231a..49877615d 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java @@ -17,10 +17,10 @@ package io.nosqlbench.api.engine.metrics; import com.codahale.metrics.*; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.config.NBNamedElement; -import io.nosqlbench.api.config.standard.NBLabelsFilter; +import io.nosqlbench.api.labels.NBLabelsFilter; import io.nosqlbench.api.engine.activityapi.core.MetricRegistryService; import io.nosqlbench.api.engine.metrics.instruments.*; import io.nosqlbench.api.engine.util.Unit; diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DeltaHdrHistogramReservoir.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DeltaHdrHistogramReservoir.java index 1fc9cb242..7a142912e 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DeltaHdrHistogramReservoir.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DeltaHdrHistogramReservoir.java @@ -18,8 +18,8 @@ package io.nosqlbench.api.engine.metrics; import com.codahale.metrics.Reservoir; import com.codahale.metrics.Snapshot; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import org.HdrHistogram.Histogram; import org.HdrHistogram.HistogramLogWriter; import org.HdrHistogram.Recorder; diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DoubleSummaryGauge.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DoubleSummaryGauge.java index 44896c0dc..2ae012dc6 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DoubleSummaryGauge.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/DoubleSummaryGauge.java @@ -16,7 +16,7 @@ package io.nosqlbench.api.engine.metrics; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.instruments.NBMetricGauge; import java.util.DoubleSummaryStatistics; diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBFunctionGauge.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBFunctionGauge.java index 87a9829c3..72841e246 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBFunctionGauge.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBFunctionGauge.java @@ -16,8 +16,8 @@ package io.nosqlbench.api.engine.metrics.instruments; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import java.util.function.Supplier; diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricCounter.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricCounter.java index a976ddc08..809e2207e 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricCounter.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricCounter.java @@ -17,8 +17,8 @@ package io.nosqlbench.api.engine.metrics.instruments; import com.codahale.metrics.Counter; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; public class NBMetricCounter extends Counter implements NBLabeledElement { diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGauge.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGauge.java index a99d1baf8..1d3ebd51c 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGauge.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGauge.java @@ -17,7 +17,7 @@ package io.nosqlbench.api.engine.metrics.instruments; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; public interface NBMetricGauge extends Gauge, NBLabeledElement { diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGaugeWrapper.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGaugeWrapper.java index 80314d394..c3f4ef650 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGaugeWrapper.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricGaugeWrapper.java @@ -17,7 +17,7 @@ package io.nosqlbench.api.engine.metrics.instruments; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; public class NBMetricGaugeWrapper implements NBMetricGauge { diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricHistogram.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricHistogram.java index b6c7a793a..2247a3c79 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricHistogram.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricHistogram.java @@ -17,8 +17,8 @@ package io.nosqlbench.api.engine.metrics.instruments; import com.codahale.metrics.Histogram; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.*; import java.util.List; diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricMeter.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricMeter.java index 9447b4f72..a374a889a 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricMeter.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricMeter.java @@ -17,8 +17,8 @@ package io.nosqlbench.api.engine.metrics.instruments; import com.codahale.metrics.Meter; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; public class NBMetricMeter extends Meter implements NBLabeledElement { diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricTimer.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricTimer.java index 90655d115..0802c0eb8 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricTimer.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/instruments/NBMetricTimer.java @@ -17,8 +17,8 @@ package io.nosqlbench.api.engine.metrics.instruments; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.*; import org.HdrHistogram.Histogram; diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormat.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormat.java index d028cee69..ca3d19608 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormat.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormat.java @@ -17,8 +17,8 @@ package io.nosqlbench.api.engine.metrics.reporters; import com.codahale.metrics.*; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; 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 index 3212bc3b8..54e9b2859 100644 --- 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 @@ -16,7 +16,7 @@ package io.nosqlbench.api.engine.metrics.wrappers; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; public interface RelevancyFunction extends NBLabeledElement { double apply(int[] relevant, int[] actual); 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 index 28f8d44ad..959fd83c8 100644 --- 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 @@ -16,8 +16,8 @@ package io.nosqlbench.api.engine.metrics.wrappers; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.api.engine.metrics.DoubleSummaryGauge; diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/MapLabels.java b/nb-api/src/main/java/io/nosqlbench/api/labels/MapLabels.java similarity index 99% rename from nb-api/src/main/java/io/nosqlbench/api/config/MapLabels.java rename to nb-api/src/main/java/io/nosqlbench/api/labels/MapLabels.java index f9f35009c..100fb3a7f 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/MapLabels.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/MapLabels.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.api.config; +package io.nosqlbench.api.labels; import org.jetbrains.annotations.NotNull; diff --git a/nb-api/src/main/java/io/nosqlbench/api/labels/MutableLabels.java b/nb-api/src/main/java/io/nosqlbench/api/labels/MutableLabels.java index 8068aeb36..922267634 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/labels/MutableLabels.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/MutableLabels.java @@ -16,9 +16,6 @@ package io.nosqlbench.api.labels; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBLabels; - import java.util.HashMap; import java.util.Map; diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/NBLabelSpec.java b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelSpec.java similarity index 98% rename from nb-api/src/main/java/io/nosqlbench/api/config/NBLabelSpec.java rename to nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelSpec.java index a67b26858..12f7cdb63 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/NBLabelSpec.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelSpec.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.api.config; +package io.nosqlbench.api.labels; import io.nosqlbench.api.errors.BasicError; diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/NBLabeledElement.java b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabeledElement.java similarity index 94% rename from nb-api/src/main/java/io/nosqlbench/api/config/NBLabeledElement.java rename to nb-api/src/main/java/io/nosqlbench/api/labels/NBLabeledElement.java index 471780d8d..a471baa18 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/NBLabeledElement.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabeledElement.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package io.nosqlbench.api.config; +package io.nosqlbench.api.labels; + +import io.nosqlbench.api.config.NBComponent; import java.util.Map; diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/NBLabels.java b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabels.java similarity index 99% rename from nb-api/src/main/java/io/nosqlbench/api/config/NBLabels.java rename to nb-api/src/main/java/io/nosqlbench/api/labels/NBLabels.java index f71be1f7a..e2cb2467e 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/NBLabels.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabels.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.api.config; +package io.nosqlbench.api.labels; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/standard/NBLabelsFilter.java b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsFilter.java similarity index 95% rename from nb-api/src/main/java/io/nosqlbench/api/config/standard/NBLabelsFilter.java rename to nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsFilter.java index 521e8f663..63596fbb7 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/standard/NBLabelsFilter.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.nosqlbench.api.config.standard; +package io.nosqlbench.api.labels; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.filtering.FilteringSieve; import io.nosqlbench.api.filtering.TristateFilter; diff --git a/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsResult.java b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsResult.java new file mode 100644 index 000000000..a004613dc --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsResult.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2023 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.api.labels; + +import java.util.List; + +public record NBLabelsResult(NBLabels labels, String config, List missingFields, List extraneousFields) { + public boolean isError() { + return !missingFields.isEmpty() || !extraneousFields.isEmpty(); + } + + @Override + public String toString() { + StringBuilder err = new StringBuilder(); + if (!missingFields.isEmpty()) { + err.append("The label set is missing required label names: ").append(missingFields).append("\n"); + } + if (!extraneousFields.isEmpty()) { + err.append("The label set has disallowed label names: ").append(extraneousFields).append("\n"); + } + if (!err.isEmpty()) { + err.append("This is controlled by the labeling policy: '").append(config).append("'\n"); + } + return err.toString(); + } +} diff --git a/nb-api/src/main/java/io/nosqlbench/api/config/standard/NBLabelsValidator.java b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsValidator.java similarity index 65% rename from nb-api/src/main/java/io/nosqlbench/api/config/standard/NBLabelsValidator.java rename to nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsValidator.java index ffe1192d9..5a3b167a3 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/config/standard/NBLabelsValidator.java +++ b/nb-api/src/main/java/io/nosqlbench/api/labels/NBLabelsValidator.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package io.nosqlbench.api.config.standard; +package io.nosqlbench.api.labels; -import io.nosqlbench.api.config.NBLabels; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,6 +25,14 @@ import java.util.List; import java.util.Set; import java.util.function.Function; +/** + * Validate a set of labels to ensure conformance to a labeling standard. + *
    + *
  1. Required label names are specified as "+label"
    2. + *
  2. Disallowed label names are specified as "-label"
    3. + *
  3. Other specifiers or formats are ignored by this validator.
    4. + *
+ */ public class NBLabelsValidator implements Function { private final static Logger logger = LogManager.getLogger(NBLabelsValidator.class); @@ -41,41 +48,24 @@ public class NBLabelsValidator implements Function { } } - @Override - public NBLabels apply(NBLabels labels) { + public NBLabelsResult applyForResult(NBLabels labels) { Set keyset = labels.asMap().keySet(); LinkedList missingFields = new LinkedList<>(requiredFields); LinkedList extraneousFields = new LinkedList<>(disallowedFields); missingFields.removeIf(keyset::contains); extraneousFields.removeIf(extra -> !keyset.contains(extra)); - - Result result = new Result(labels, config, missingFields, extraneousFields); + return new NBLabelsResult(labels, config, missingFields, extraneousFields); + } + @Override + public NBLabels apply(NBLabels labels) { + NBLabelsResult result = applyForResult(labels); if (!result.isError()) { return labels; } logger.warn(result); throw new RuntimeException(result.toString()); + } - record Result(NBLabels labels, String config, LinkedList missingFields, LinkedList extraneousFields) { - public boolean isError() { - return !missingFields.isEmpty() || !extraneousFields.isEmpty(); - } - - @Override - public String toString() { - StringBuilder err = new StringBuilder(); - if (!missingFields.isEmpty()) { - err.append("The label set is missing required label names: ").append(missingFields).append("\n"); - } - if (!extraneousFields.isEmpty()) { - err.append("The label set has disallowed label names: ").append(extraneousFields).append("\n"); - } - if (!err.isEmpty()) { - err.append("This is controlled by the labeling policy: '").append(config).append("'\n"); - } - return err.toString(); - } - } } diff --git a/nb-api/src/test/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormatTest.java b/nb-api/src/test/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormatTest.java index 2471623e6..5823f2411 100644 --- a/nb-api/src/test/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormatTest.java +++ b/nb-api/src/test/java/io/nosqlbench/api/engine/metrics/reporters/PromExpositionFormatTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.api.engine.metrics.reporters; import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import io.nosqlbench.api.engine.metrics.instruments.*; import org.junit.jupiter.api.Test; diff --git a/nb-api/src/test/java/io/nosqlbench/api/config/MapLabelsTest.java b/nb-api/src/test/java/io/nosqlbench/api/labels/MapLabelsTest.java similarity index 94% rename from nb-api/src/test/java/io/nosqlbench/api/config/MapLabelsTest.java rename to nb-api/src/test/java/io/nosqlbench/api/labels/MapLabelsTest.java index 64678c5c8..ab62f33d8 100644 --- a/nb-api/src/test/java/io/nosqlbench/api/config/MapLabelsTest.java +++ b/nb-api/src/test/java/io/nosqlbench/api/labels/MapLabelsTest.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package io.nosqlbench.api.config; +package io.nosqlbench.api.labels; +import io.nosqlbench.api.labels.MapLabels; import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/nb-api/src/test/java/io/nosqlbench/api/config/NBLabeledElementTest.java b/nb-api/src/test/java/io/nosqlbench/api/labels/NBLabeledElementTest.java similarity index 92% rename from nb-api/src/test/java/io/nosqlbench/api/config/NBLabeledElementTest.java rename to nb-api/src/test/java/io/nosqlbench/api/labels/NBLabeledElementTest.java index 6fac49231..940a2a811 100644 --- a/nb-api/src/test/java/io/nosqlbench/api/config/NBLabeledElementTest.java +++ b/nb-api/src/test/java/io/nosqlbench/api/labels/NBLabeledElementTest.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package io.nosqlbench.api.config; +package io.nosqlbench.api.labels; +import io.nosqlbench.api.labels.NBLabels; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb-api/src/test/java/io/nosqlbench/api/config/standard/NBLabelsFilterTest.java b/nb-api/src/test/java/io/nosqlbench/api/labels/NBLabelsFilterTest.java similarity index 94% rename from nb-api/src/test/java/io/nosqlbench/api/config/standard/NBLabelsFilterTest.java rename to nb-api/src/test/java/io/nosqlbench/api/labels/NBLabelsFilterTest.java index 50ef040d7..6a4f9e113 100644 --- a/nb-api/src/test/java/io/nosqlbench/api/config/standard/NBLabelsFilterTest.java +++ b/nb-api/src/test/java/io/nosqlbench/api/labels/NBLabelsFilterTest.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package io.nosqlbench.api.config.standard; +package io.nosqlbench.api.labels; -import io.nosqlbench.api.config.NBLabels; +import io.nosqlbench.api.labels.NBLabels; +import io.nosqlbench.api.labels.NBLabelsFilter; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nb-api/src/test/java/io/nosqlbench/api/config/standard/NBLabelsValidatorTest.java b/nb-api/src/test/java/io/nosqlbench/api/labels/NBLabelsValidatorTest.java similarity index 92% rename from nb-api/src/test/java/io/nosqlbench/api/config/standard/NBLabelsValidatorTest.java rename to nb-api/src/test/java/io/nosqlbench/api/labels/NBLabelsValidatorTest.java index 9e81d0a2c..dde7f8923 100644 --- a/nb-api/src/test/java/io/nosqlbench/api/config/standard/NBLabelsValidatorTest.java +++ b/nb-api/src/test/java/io/nosqlbench/api/labels/NBLabelsValidatorTest.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package io.nosqlbench.api.config.standard; +package io.nosqlbench.api.labels; -import io.nosqlbench.api.config.NBLabels; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertThrows; class NBLabelsValidatorTest { diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java index d019fe9d6..f255181a2 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java @@ -18,7 +18,7 @@ package io.nosqlbench.nb.api.annotations; import io.nosqlbench.api.annotations.Annotation; import io.nosqlbench.api.annotations.Layer; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nbr/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java b/nbr/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java index 43a039e2c..563052c25 100644 --- a/nbr/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java +++ b/nbr/src/test/java/io/nosqlbench/engine/core/script/MetricsIntegrationTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.core.script; import com.codahale.metrics.Histogram; -import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.labels.NBLabeledElement; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import org.junit.jupiter.api.Test;