IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix bad naming refactoring

Browse Source
This commit is contained in:
Jonathan Shook 2023-08-31 16:42:45 -05:00
parent 7f21b41494
commit f579fb638c
20 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.vectormath;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class,selector = "cql_utils")
public class CqlUtilsPluginInfo implements ComputeFunctionsPluginInfo<CqlUtils> {
@Service(value = ScriptingExtensionPluginInfo.class,selector = "cql_utils")
public class CqlUtilsPluginInfo implements ScriptingExtensionPluginInfo<CqlUtils> {
@Override
public String getDescription() {
return "various methods and utilities for working with vector math in a scripted environment";

6
adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/scriptingutils/PineconeScriptingUtilsPluginInfo.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.scriptingutils;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class,selector = "pinecone_utils")
public class PineconeScriptingUtilsPluginInfo implements ComputeFunctionsPluginInfo<PineconeScriptingUtils> {
@Service(value = ScriptingExtensionPluginInfo.class,selector = "pinecone_utils")
public class PineconeScriptingUtilsPluginInfo implements ScriptingExtensionPluginInfo<PineconeScriptingUtils> {
@Override
public String getDescription() {
return "various methods and utilities for working with vector math in a scripted environment";

4
adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyCycleFunction.java
View File

@ -21,7 +21,7 @@ import groovy.lang.GroovyShell;
import groovy.lang.Script;
import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser;
import io.nosqlbench.api.extensions.SandboxExtensionFinder;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.virtdata.core.bindings.Bindings;
import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
import io.nosqlbench.virtdata.core.templates.BindPoint;
@ -75,7 +75,7 @@ public class GroovyCycleFunction<T> implements CycleFunction<T> {
}
private void addServices() {
for (final ComputeFunctionsPluginInfo<?> extensionDescriptor : SandboxExtensionFinder.findAll()) {
for (final ScriptingExtensionPluginInfo<?> extensionDescriptor : SandboxExtensionFinder.findAll()) {
staticImports.addAll(extensionDescriptor.autoImportStaticMethodClasses());
if (!extensionDescriptor.isAutoLoading()) {
logger.info(() -> "Not loading " + extensionDescriptor + ", autoloading is false");

4
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
View File

@ -25,7 +25,7 @@ import io.nosqlbench.api.engine.metrics.ActivityMetrics;
import io.nosqlbench.api.metadata.ScenarioMetadata;
import io.nosqlbench.api.metadata.ScenarioMetadataAware;
import io.nosqlbench.api.metadata.SystemId;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer;
import io.nosqlbench.engine.core.annotation.Annotators;
import io.nosqlbench.engine.core.lifecycle.ExecutionMetricsResult;
@ -211,7 +211,7 @@ public class Scenario implements Callable<ExecutionMetricsResult>, NBLabeledElem
this.scriptEngine.put("metrics", new PolyglotMetricRegistryBindings(metricRegistry));
this.scriptEngine.put("activities", new ActivityBindings(scenarioController));
for (final ComputeFunctionsPluginInfo<?> extensionDescriptor : SandboxExtensionFinder.findAll()) {
for (final ScriptingExtensionPluginInfo<?> extensionDescriptor : SandboxExtensionFinder.findAll()) {
if (!extensionDescriptor.isAutoLoading()) {
this.logger.info(() -> "Not loading " + extensionDescriptor + ", autoloading is false");
continue;

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java
View File

@ -18,14 +18,14 @@ package io.nosqlbench.engine.extensions.computefunctions;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
import java.util.List;
@Service(value = ComputeFunctionsPluginInfo.class,selector = "compute")
public class ComputeFunctionPluginInfo implements ComputeFunctionsPluginInfo<ComputeFunctions> {
@Service(value = ScriptingExtensionPluginInfo.class,selector = "compute")
public class ComputeFunctionPluginInfo implements ScriptingExtensionPluginInfo<ComputeFunctions> {
@Override
public String getDescription() {
return "Various small math utilities.";

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/conversions/ConversionUtilsPluginInfo.java
View File

@ -18,14 +18,14 @@ package io.nosqlbench.engine.extensions.conversions;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
import java.util.List;
@Service(value = ComputeFunctionsPluginInfo.class,selector = "convert")
public class ConversionUtilsPluginInfo implements ComputeFunctionsPluginInfo<ConverterUtils> {
@Service(value = ScriptingExtensionPluginInfo.class,selector = "convert")
public class ConversionUtilsPluginInfo implements ScriptingExtensionPluginInfo<ConverterUtils> {
@Override
public String getDescription() {
return "Utilities to convert between common basic data types";

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvmetrics/CSVMetricsPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.csvmetrics;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "csvmetrics")
public class CSVMetricsPluginData implements ComputeFunctionsPluginInfo<CSVMetricsPlugin> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "csvmetrics")
public class CSVMetricsPluginData implements ScriptingExtensionPluginInfo<CSVMetricsPlugin> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.csvoutput;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class,selector = "csvoutput")
public class CsvOutputPluginData implements ComputeFunctionsPluginInfo<CsvOutputPluginInstance> {
@Service(value = ScriptingExtensionPluginInfo.class,selector = "csvoutput")
public class CsvOutputPluginData implements ScriptingExtensionPluginInfo<CsvOutputPluginInstance> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.example;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "adder")
public class ExamplePluginData implements ComputeFunctionsPluginInfo<ExamplePlugin> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "adder")
public class ExamplePluginData implements ScriptingExtensionPluginInfo<ExamplePlugin> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/files/FileAccessPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.files;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "files")
public class FileAccessPluginData implements ComputeFunctionsPluginInfo<FileAccess> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "files")
public class FileAccessPluginData implements ScriptingExtensionPluginInfo<FileAccess> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsComputeFunctionsPluginData.java → engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingExtensionPluginData.java
View File

@ -18,15 +18,15 @@ package io.nosqlbench.engine.extensions.globalvars;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import io.nosqlbench.virtdata.library.basics.core.threadstate.SharedState;
import org.apache.logging.log4j.Logger;
import java.util.concurrent.ConcurrentHashMap;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "globalvars")
public class GlobalVarsComputeFunctionsPluginData implements ComputeFunctionsPluginInfo<ConcurrentHashMap<String, Object>> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "globalvars")
public class GlobalVarsScriptingExtensionPluginData implements ScriptingExtensionPluginInfo<ConcurrentHashMap<String, Object>> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histologger/HdrHistoLogPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.histologger;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "histologger")
public class HdrHistoLogPluginData implements ComputeFunctionsPluginInfo<HdrHistoLogPlugin> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "histologger")
public class HdrHistoLogPluginData implements ScriptingExtensionPluginInfo<HdrHistoLogPlugin> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/histostatslogger/HistoStatsPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.histostatslogger;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "histostatslogger")
public class HistoStatsPluginData implements ComputeFunctionsPluginInfo<HistoStatsPlugin> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "histostatslogger")
public class HistoStatsPluginData implements ScriptingExtensionPluginInfo<HistoStatsPlugin> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.http;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "http")
public class HttpPluginData implements ComputeFunctionsPluginInfo<HttpPlugin> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "http")
public class HttpPluginData implements ScriptingExtensionPluginInfo<HttpPlugin> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/BobyqaOptimizerPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.optimizers;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "optimos")
public class BobyqaOptimizerPluginData implements ComputeFunctionsPluginInfo<BobyqaOptimizerPlugin> {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "optimos")
public class BobyqaOptimizerPluginData implements ScriptingExtensionPluginInfo<BobyqaOptimizerPlugin> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3UploaderPluginData.java
View File

@ -18,14 +18,14 @@ package io.nosqlbench.engine.extensions.s3uploader;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import io.nosqlbench.api.metadata.ScenarioMetadata;
import io.nosqlbench.api.metadata.ScenarioMetadataAware;
import org.apache.logging.log4j.Logger;
@Service(value = ComputeFunctionsPluginInfo.class, selector = "s3")
public class S3UploaderPluginData implements ComputeFunctionsPluginInfo<S3Uploader>, ScenarioMetadataAware {
@Service(value = ScriptingExtensionPluginInfo.class, selector = "s3")
public class S3UploaderPluginData implements ScriptingExtensionPluginInfo<S3Uploader>, ScenarioMetadataAware {
private ScenarioMetadata scenarioMetadata;
@Override

6
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingMetricsPluginData.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.extensions.scriptingmetrics;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value= ComputeFunctionsPluginInfo.class, selector="scriptingmetrics")
public class ScriptingMetricsPluginData implements ComputeFunctionsPluginInfo<ScriptingMetrics> {
@Service(value= ScriptingExtensionPluginInfo.class, selector="scriptingmetrics")
public class ScriptingMetricsPluginData implements ScriptingExtensionPluginInfo<ScriptingMetrics> {
@Override
public String getDescription() {

6
engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPluginMetadata.java
View File

@ -18,12 +18,12 @@ package io.nosqlbench.engine.shutdown;
import com.codahale.metrics.MetricRegistry;
import io.nosqlbench.api.config.LabeledScenarioContext;
import io.nosqlbench.api.extensions.ComputeFunctionsPluginInfo;
import io.nosqlbench.api.extensions.ScriptingExtensionPluginInfo;
import io.nosqlbench.nb.annotations.Service;
import org.apache.logging.log4j.Logger;
@Service(value= ComputeFunctionsPluginInfo.class,selector = "shutdown")
public class ShutdownHookPluginMetadata implements ComputeFunctionsPluginInfo<ShutdownHookPlugin> {
@Service(value= ScriptingExtensionPluginInfo.class,selector = "shutdown")
public class ShutdownHookPluginMetadata implements ScriptingExtensionPluginInfo<ShutdownHookPlugin> {
@Override
public String getDescription() {

8
nb-api/src/main/java/io/nosqlbench/api/extensions/SandboxExtensionFinder.java
View File

@ -23,14 +23,14 @@ import java.util.ServiceLoader;
public class SandboxExtensionFinder {
private final static List<ComputeFunctionsPluginInfo<?>> extensionDescriptors = new ArrayList<>();
private final static List<ScriptingExtensionPluginInfo<?>> extensionDescriptors = new ArrayList<>();
public static List<ComputeFunctionsPluginInfo<?>> findAll() {
public static List<ScriptingExtensionPluginInfo<?>> findAll() {
if (extensionDescriptors.isEmpty()) {
synchronized (SandboxExtensionFinder.class) {
if (extensionDescriptors.isEmpty()) {
ServiceLoader<ComputeFunctionsPluginInfo> loader =
ServiceLoader.load(ComputeFunctionsPluginInfo.class);
ServiceLoader<ScriptingExtensionPluginInfo> loader =
ServiceLoader.load(ScriptingExtensionPluginInfo.class);
loader.iterator().forEachRemaining(extensionDescriptors::add);
}
}

2
nb-api/src/main/java/io/nosqlbench/api/extensions/ComputeFunctionsPluginInfo.java → nb-api/src/main/java/io/nosqlbench/api/extensions/ScriptingExtensionPluginInfo.java
View File

@ -32,7 +32,7 @@ import java.util.List;
* Each scenario gets its own instance of an object from this SandboxPlugin
* </p>
*/
public interface ComputeFunctionsPluginInfo<T> {
public interface ScriptingExtensionPluginInfo<T> {
/**
* @return a brief description of this extension.