From e1f9545abd75ceefb1455c5025d053999a91b019 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 7 Dec 2023 09:40:40 -0600 Subject: [PATCH] change all references of context to container --- adapter-cqld4/pom.xml | 2 +- .../api/activityimpl/BaseOpDispenser.java | 3 +- .../api/activityimpl/OpDispenser.java | 2 +- .../CompoundCycleFunction.java | 2 +- .../CycleFunction.java | 2 +- .../CycleFunctions.java | 2 +- .../ExpressionDetails.java | 2 +- .../GroovyBooleanCycleFunction.java | 2 +- .../GroovyCycleFunction.java | 2 +- .../GroovyObjectEqualityFunction.java | 2 +- .../ResultMismatchError.java | 2 +- .../ResultVerificationError.java | 2 +- .../VariableInjectable.java | 2 +- .../CompoundCycleFunctionTest.java | 2 + .../GroovyBooleanCycleFunctionTest.java | 2 + .../engine/cli/NBJavaNativeResolver.java | 8 +-- .../cli/NBCLIScenarioPreprocessorTest.java | 6 +-- .../engine/api/activityapi/core/Activity.java | 4 +- .../api/activityapi/core/AsyncAction.java | 2 +- .../uniform/actions/StandardAction.java | 2 +- .../scenarios/NBCLIScenarioPreprocessor.java | 4 +- .../api/scripting/GraalJsEvaluator.java | 14 +++--- .../io/nosqlbench/engine/cmdstream/Cmd.java | 6 +-- .../nosqlbench/engine/cmdstream/CmdType.java | 2 +- .../activity/ActivitiesExceptionHandler.java | 6 +-- .../activity/ActivitiesProgressIndicator.java | 6 +-- .../ActivityBindings.java | 10 ++-- .../ContainerActivitiesController.java} | 8 +-- .../ContainerBuilderFacets.java} | 8 +-- .../{context => container}/DiagReader.java | 2 +- .../{context => container}/DiagWriter.java | 2 +- .../{context => container}/FanWriter.java | 2 +- .../InterjectingCharArrayWriter.java | 3 +- .../NBBufferedContainer.java} | 48 +++++++++--------- .../NBCommandParams.java | 2 +- .../NBContainer.java} | 12 ++--- .../NBScenarioContainerBuilder.java} | 42 ++++++++-------- .../ScriptEnvBuffer.java | 6 +-- .../execution/ContextShutdownHook.java | 10 ++-- .../scenario/execution/NBBaseCommand.java | 20 +++----- .../scenario/execution/NBCommandInfo.java | 4 +- .../scenario/execution/NBCommandResult.java | 6 +-- .../execution/NBInvokableCommand.java | 18 +++---- ...iptContext.java => BufferedScriptCtx.java} | 6 +-- .../scenario/script/NBScriptedCommand.java | 24 ++++----- .../scenario/script/ScenarioScriptShell.java | 6 +-- .../bindings/PolyglotScenarioController.java | 6 +-- .../session/NBAutoScriptResolver.java | 6 +-- .../lifecycle/session/NBCommandAssembly.java | 32 ++++++------ .../lifecycle/session/NBCommandInvoker.java | 19 ++++--- .../session/NBCoreInvokableResolver.java | 6 +-- .../session/NBInvokableResolver.java | 6 +-- .../session/NBScriptCommandResolver.java | 7 +-- .../core/lifecycle/session/NBSession.java | 30 +++++------ .../core/lifecycle/session/ResultContext.java | 2 +- .../engine/core/NBBaseCommandTest.java | 9 ++-- .../core/script/NBBaseCommandParamsTest.java | 2 +- mvn-defaults/pom.xml | 4 +- .../injava/DirectRuntimeScenarioTests.java | 50 +++++++++---------- .../examples/injava/NB_activity_error.java | 11 ++-- .../injava/NB_activity_init_error.java | 11 ++-- .../examples/injava/NB_await_finished.java | 11 ++-- .../nbr/examples/injava/NB_basicdiag.java | 11 ++-- .../nbr/examples/injava/NB_blockingrun.java | 11 ++-- .../injava/NB_cocycledelay_bursty.java | 20 ++++---- .../injava/NB_cocycledelay_bursty_backup.java | 11 ++-- .../injava/NB_cocycledelay_strict.java | 11 ++-- .../nbr/examples/injava/NB_cycle_rate.java | 11 ++-- .../examples/injava/NB_cycle_rate_change.java | 11 ++-- .../injava/NB_extension_csvmetrics.java | 11 ++-- .../injava/NB_extension_csvoutput.java | 11 ++-- .../examples/injava/NB_extension_example.java | 11 ++-- .../injava/NB_extension_histostatslogger.java | 11 ++-- .../injava/NB_extension_shutdown_hook.java | 11 ++-- .../nbr/examples/injava/NB_histologger.java | 11 ++-- .../nbr/examples/injava/NB_linkedinput.java | 11 ++-- .../nbr/examples/injava/NB_optimo_test.java | 11 ++-- .../examples/injava/NB_params_variable.java | 11 ++-- .../nbr/examples/injava/NB_readmetrics.java | 11 ++-- .../nbr/examples/injava/NB_speedcheck.java | 11 ++-- .../examples/injava/NB_start_stop_diag.java | 11 ++-- .../nbr/examples/injava/NB_threadchange.java | 11 ++-- .../nbr/examples/injava/NB_threadspeeds.java | 11 ++-- .../nbr/examples/injava/NB_undef_param.java | 11 ++-- .../injavascript/ScriptExampleTests.java | 8 +-- .../io/nosqlbench/scenarios/diag/NB_diag.java | 11 ++-- .../simframe/findmax/FindmaxSearchParams.java | 2 +- .../simframe/findmax/NB_findmax.java | 10 ++-- .../findmax/planners/FindmaxPlannerType.java | 2 +- .../findmax/planners/FindmaxRampup.java | 2 +- .../planners/ratchet/FindmaxRatchet.java | 5 +- .../planners/ratchet/RatchetConfig.java | 2 +- .../scenarios/simframe/optimo/NB_optimo.java | 14 ++---- .../simframe/optimo/OptimoFrameFunction.java | 6 +-- .../simframe/optimo/OptimoSearchSettings.java | 2 +- .../simframe/optimo/SimFrameUtils.java | 4 +- .../simframe/planning/SimFramePlanner.java | 6 +-- virtdata-lang/pom.xml | 2 +- .../to_bigdecimal/ToBigDecimal.java | 6 +-- .../to_bigdecimal/ToBigDecimal.java | 12 ++--- 100 files changed, 412 insertions(+), 475 deletions(-) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/CompoundCycleFunction.java (98%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/CycleFunction.java (96%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/CycleFunctions.java (97%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/ExpressionDetails.java (93%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/GroovyBooleanCycleFunction.java (95%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/GroovyCycleFunction.java (99%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/GroovyObjectEqualityFunction.java (97%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/ResultMismatchError.java (97%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/ResultVerificationError.java (97%) rename adapters-api/src/main/java/io/nosqlbench/adapters/api/{evalcontext => evalctx}/VariableInjectable.java (94%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/ActivityBindings.java (91%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context/ContextActivitiesController.java => container/ContainerActivitiesController.java} (98%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context/ContextBuilderFacets.java => container/ContainerBuilderFacets.java} (90%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/DiagReader.java (96%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/DiagWriter.java (96%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/FanWriter.java (95%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/InterjectingCharArrayWriter.java (96%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context/NBBufferedCommandContext.java => container/NBBufferedContainer.java} (81%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/NBCommandParams.java (99%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context/NBCommandContext.java => container/NBContainer.java} (73%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context/NBScenarioContextBuilder.java => container/NBScenarioContainerBuilder.java} (53%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/{context => container}/ScriptEnvBuffer.java (91%) rename engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/{BufferedScriptContext.java => BufferedScriptCtx.java} (84%) diff --git a/adapter-cqld4/pom.xml b/adapter-cqld4/pom.xml index 943478c4d..f3508377a 100644 --- a/adapter-cqld4/pom.xml +++ b/adapter-cqld4/pom.xml @@ -113,7 +113,7 @@ org.antlr antlr4-maven-plugin - 4.13.0 + 4.13.1 src/main/java/io/nosqlbench/cqlgen/grammars 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 2df21331c..47c5ffb58 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 @@ -20,7 +20,8 @@ import com.codahale.metrics.Timer; import groovy.lang.Binding; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op; -import io.nosqlbench.adapters.api.evalcontext.*; +import io.nosqlbench.adapters.api.evalctx.*; +import io.nosqlbench.adapters.api.evalctx.*; import io.nosqlbench.adapters.api.metrics.ThreadLocalNamedTimers; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.nb.api.labels.NBLabels; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java index 3723c3e2b..c4fbe5864 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java @@ -16,7 +16,7 @@ package io.nosqlbench.adapters.api.activityimpl; -import io.nosqlbench.adapters.api.evalcontext.CycleFunction; +import io.nosqlbench.adapters.api.evalctx.CycleFunction; import java.util.function.LongFunction; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunction.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java similarity index 98% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunction.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java index 00b747e45..8a4590d3e 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunction.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import java.util.ArrayList; import java.util.Arrays; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CycleFunction.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java similarity index 96% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CycleFunction.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java index dce32ad17..c92a2ae91 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CycleFunction.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import java.util.function.LongFunction; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CycleFunctions.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java similarity index 97% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CycleFunctions.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java index 6481e341c..80cc2a7c7 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/CycleFunctions.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import java.util.List; import java.util.function.BinaryOperator; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ExpressionDetails.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java similarity index 93% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ExpressionDetails.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java index c5b49c816..1e38e6884 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ExpressionDetails.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; public interface ExpressionDetails { String getExpressionDetails(); diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunction.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java similarity index 95% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunction.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java index 79cb33763..a1123b2ff 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunction.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import groovy.lang.Binding; import io.nosqlbench.virtdata.core.templates.ParsedTemplateString; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyCycleFunction.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java similarity index 99% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyCycleFunction.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java index efdc0e0eb..2aff7ac1b 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyCycleFunction.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import groovy.lang.Binding; import groovy.lang.GroovyShell; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyObjectEqualityFunction.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java similarity index 97% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyObjectEqualityFunction.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java index 70c1a5027..60df02eba 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/GroovyObjectEqualityFunction.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import groovy.lang.Binding; import io.nosqlbench.virtdata.core.templates.ParsedTemplateString; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ResultMismatchError.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java similarity index 97% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ResultMismatchError.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java index 9b4b9e760..593f05bdc 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ResultMismatchError.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import java.io.Serializable; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ResultVerificationError.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java similarity index 97% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ResultVerificationError.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java index 15c8ad7c3..fee2df20f 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/ResultVerificationError.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; import java.io.Serializable; diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/VariableInjectable.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java similarity index 94% rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/VariableInjectable.java rename to adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java index d4980614c..fa4ba72c1 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalcontext/VariableInjectable.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.adapters.api.evalcontext; +package io.nosqlbench.adapters.api.evalctx; /** * Implementors of this type can have variables set on them for later use. diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java b/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java index 8ef62a497..2c3f6e1e8 100644 --- a/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java +++ b/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java @@ -16,6 +16,8 @@ package io.nosqlbench.adapters.api.evalcontext; +import io.nosqlbench.adapters.api.evalctx.CompoundCycleFunction; +import io.nosqlbench.adapters.api.evalctx.GroovyCycleFunction; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java b/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java index 6b85c5554..b7318eece 100644 --- a/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java +++ b/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java @@ -17,6 +17,8 @@ package io.nosqlbench.adapters.api.evalcontext; import groovy.lang.MissingPropertyException; +import io.nosqlbench.adapters.api.evalctx.GroovyBooleanCycleFunction; +import io.nosqlbench.adapters.api.evalctx.GroovyCycleFunction; import io.nosqlbench.virtdata.core.templates.ParsedTemplateString; import org.junit.jupiter.api.Test; diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java index 5347b4097..27357cc77 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java @@ -19,19 +19,15 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdType; import io.nosqlbench.engine.cmdstream.NBJavaCommandLoader; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; import io.nosqlbench.engine.core.lifecycle.session.NBInvokableResolver; import io.nosqlbench.nb.annotations.Service; -import io.nosqlbench.nb.api.components.NBComponent; - -import java.util.List; @Service(value= NBInvokableResolver.class,selector = "java") public class NBJavaNativeResolver implements NBInvokableResolver { @Override - public NBInvokableCommand resolve(Cmd cmd, NBBufferedCommandContext parent, String phaseName) { + public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName) { return switch (cmd.getCmdType()) { case CmdType.indirect -> NBJavaCommandLoader.init(cmd.getArgValue("_impl"), parent, phaseName, cmd.getTargetContext()); case CmdType.java -> NBJavaCommandLoader.init(cmd.getArgValue("class"), parent, phaseName, cmd.getTargetContext()); diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java index 52a5c84e2..d8c82867b 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java @@ -106,7 +106,7 @@ public class NBCLIScenarioPreprocessorTest { assertThat(cmds.size()).isEqualTo(1); assertThat(cmds.get(0).getArgMap()).isEqualTo(Map.of( "alias", "with_template", - "context", "template_test", + "container", "template_test", "cycles", "20", "cycles-test", "20", "driver", "stdout", @@ -123,7 +123,7 @@ public class NBCLIScenarioPreprocessorTest { assertThat(cmds.size()).isEqualTo(1); assertThat(cmds.get(0).getArgMap()).isEqualTo(Map.of( "alias", "schema", - "context", "schema_only", + "container", "schema_only", "cycles-test", "20", "driver", "stdout", "labels", "workload:scenario_test,scenario:schema_only", @@ -177,7 +177,7 @@ public class NBCLIScenarioPreprocessorTest { assertThat(cmds.size()).isEqualTo(1); assertThat(cmds.get(0).getArgMap()).isEqualTo(Map.of( "alias", "schema", - "context", "schema_only", + "container", "schema_only", "cycles-test", "20", "driver", "stdout", "labels", "workload:scenario_test,scenario:schema_only", diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java b/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java index aa48bf9a0..1476e2e95 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java @@ -108,7 +108,7 @@ public interface Activity extends Comparable, ActivityDefObserver, Pro /** * Set the cycle rate limiter for this activity. This method should only - * be used in a non-concurrent context. Otherwise, the supplier version + * be used non-concurrently. Otherwise, the supplier version * {@link #getCycleRateLimiter(Supplier)} should be used. * @param rateLimiter The cycle {@link RateLimiter} for this activity */ @@ -133,7 +133,7 @@ public interface Activity extends Comparable, ActivityDefObserver, Pro /** * Set the stride rate limiter for this activity. This method should only - * be used in a non-concurrent context. Otherwise, the supplier version + * be used non-concurrently. Otherwise, the supplier version * {@link #getStrideRateLimiter(Supplier)}} should be used. * @param rateLimiter The stride {@link RateLimiter} for this activity. */ diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java b/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java index 1ec2d8d03..76ac9e9a1 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java @@ -56,7 +56,7 @@ public interface AsyncAction extends Action { * be started (according to the configured concurrency limits), * then it can signal such by returning true from this method. * - * @param opc The op context that holds state for this operation + * @param opc The op ctx that holds state for this operation * @return true, if the action is ready immediately for another operation */ boolean enqueue(TrackedOp opc); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java b/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java index a331b3211..c07c5e7fe 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java @@ -20,7 +20,7 @@ import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.*; -import io.nosqlbench.adapters.api.evalcontext.CycleFunction; +import io.nosqlbench.adapters.api.evalctx.CycleFunction; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.errors.ResultVerificationError; import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java b/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java index cd492e9b2..21f1a69c2 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java @@ -204,8 +204,8 @@ public class NBCLIScenarioPreprocessor { buildingCmd.put("alias", "alias=" + WORKLOAD_SCENARIO_STEP); } - if (!buildingCmd.containsKey("context")) { - buildingCmd.put("context","context="+scenarioName); + if (!buildingCmd.containsKey("container")) { + buildingCmd.put("container","container="+scenarioName); } if (!buildingCmd.containsKey("step")) { buildingCmd.put("step","step="+stepName); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java b/engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java index 67e7a9099..7ef59011b 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java @@ -21,15 +21,15 @@ import org.graalvm.polyglot.*; public class GraalJsEvaluator implements ExprEvaluator { private final Class resultType; - private Context context; + private Context ctx; private Source script; public GraalJsEvaluator(Class resultType) { this.resultType = resultType; } - private Context getContext() { - if (context == null) { + private Context getCtx() { + if (ctx == null) { Context.Builder contextSettings = Context.newBuilder("js") .allowHostAccess(HostAccess.ALL) .allowNativeAccess(true) @@ -43,14 +43,14 @@ public class GraalJsEvaluator implements ExprEvaluator { .allowPolyglotAccess(PolyglotAccess.ALL) .option("js.ecmascript-version", "2020") .option("js.nashorn-compat", "true"); - context = contextSettings.build(); + ctx = contextSettings.build(); } - return context; + return ctx; } @Override public T eval() { - Value result = getContext().eval(this.script); + Value result = getCtx().eval(this.script); T asType = result.as(resultType); return asType; } @@ -63,7 +63,7 @@ public class GraalJsEvaluator implements ExprEvaluator { @Override public ExprEvaluator put(String varName, Object var) { - getContext().getBindings("js").putMember(varName, var); + getCtx().getBindings("js").putMember(varName, var); return this; } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java b/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java index 4a6494bce..89df1b96d 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java @@ -16,13 +16,11 @@ package io.nosqlbench.engine.cmdstream; -import io.nosqlbench.engine.core.lifecycle.session.CmdParser; import io.nosqlbench.nb.api.errors.BasicError; import jakarta.validation.constraints.NotNull; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import java.security.InvalidParameterException; import java.util.*; /** @@ -44,8 +42,8 @@ public class Cmd { return targetContextName; } - public Cmd forTargetContext(String contextName, String stepName) { - return new Cmd(cmdType, cmdArgs, contextName, stepName); + public Cmd forContainer(String containerName, String stepName) { + return new Cmd(cmdType, cmdArgs, containerName, stepName); } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java b/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java index 57708d319..044fa406e 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java @@ -32,7 +32,7 @@ public enum CmdType { await(CmdParam.of("activity")), waitMillis(CmdParam.of("ms", Long::parseLong)), fragment(CmdParam.ofFreeform("fragment")), - context(CmdParam.of("name")), + container(CmdParam.of("name")), indirect(CmdParam.of("indirect")); private final CmdParam[] positional; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java index 770b1a00d..b113e43ef 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.activity; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,9 +24,9 @@ public class ActivitiesExceptionHandler implements Thread.UncaughtExceptionHandl private static final Logger logger = LogManager.getLogger(ActivitiesExceptionHandler.class); - private final ContextActivitiesController controller; + private final ContainerActivitiesController controller; - public ActivitiesExceptionHandler(ContextActivitiesController controller) { + public ActivitiesExceptionHandler(ContainerActivitiesController controller) { this.controller = controller; logger.debug(() -> "Activities exception handler starting up for executor '" + this.controller + "'"); } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java index 97022f841..b6c034b04 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java @@ -20,9 +20,9 @@ import io.nosqlbench.engine.api.activityapi.core.RunState; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; import io.nosqlbench.engine.api.activityapi.core.progress.StateCapable; import io.nosqlbench.engine.api.metrics.IndicatorMode; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.nb.api.engine.metrics.PeriodicRunnable; import io.nosqlbench.nb.api.engine.util.Unit; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,14 +35,14 @@ public class ActivitiesProgressIndicator implements Runnable { private final static Logger logger = LogManager.getLogger("PROGRESS"); private final String indicatorSpec; - private final ContextActivitiesController sc; + private final ContainerActivitiesController sc; private PeriodicRunnable runnable; private IndicatorMode indicatorMode = IndicatorMode.console; private final Set seen = new HashSet<>(); private long intervalMillis = 1L; - public ActivitiesProgressIndicator(ContextActivitiesController sc, String indicatorSpec) { + public ActivitiesProgressIndicator(ContainerActivitiesController sc, String indicatorSpec) { this.sc = sc; this.indicatorSpec = indicatorSpec; start(); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivityBindings.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java similarity index 91% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivityBindings.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java index ae3184f03..c0d447076 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivityBindings.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import org.graalvm.polyglot.Value; @@ -28,11 +28,11 @@ import java.util.stream.Collectors; */ public class ActivityBindings implements Bindings, ProxyObject { - private final ContextActivitiesController scenario; + private final ContainerActivitiesController scenario; private final Map elementMap = new HashMap(); - public ActivityBindings(ContextActivitiesController contextActivitiesController) { - this.scenario = contextActivitiesController; + public ActivityBindings(ContainerActivitiesController containerActivitiesController) { + this.scenario = containerActivitiesController; } @Override @@ -41,7 +41,7 @@ public class ActivityBindings implements Bindings, ProxyObject { } @Override - public void putAll(Map toMerge) { + public void putAll(Map toMerge) { throw new RuntimeException("ScenarioBindings do not allow putAll(...)"); } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ContextActivitiesController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java similarity index 98% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ContextActivitiesController.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java index f0e737db2..a51930cb9 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ContextActivitiesController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; @@ -40,9 +40,9 @@ import java.util.stream.Collectors; * A ScenarioController provides a way to start Activities, * modify them while running, and forceStopMotors, pause or restart them. */ -public class ContextActivitiesController extends NBBaseComponent { +public class ContainerActivitiesController extends NBBaseComponent { - private static final Logger logger = LogManager.getLogger(ContextActivitiesController.class); + private static final Logger logger = LogManager.getLogger(ContainerActivitiesController.class); private static final Logger scenariologger = LogManager.getLogger("SCENARIO"); private final ActivityLoader activityLoader; @@ -51,7 +51,7 @@ public class ContextActivitiesController extends NBBaseComponent { private final ExecutorService executorService; - public ContextActivitiesController(NBComponent parent) { + public ContainerActivitiesController(NBComponent parent) { super(parent); this.activityLoader = new ActivityLoader(); ActivitiesExceptionHandler exceptionHandler = new ActivitiesExceptionHandler(this); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ContextBuilderFacets.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java similarity index 90% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ContextBuilderFacets.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java index f2cb641a9..1321639a8 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ContextBuilderFacets.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java @@ -1,4 +1,4 @@ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; /* * Copyright (c) 2022 nosqlbench @@ -24,7 +24,7 @@ import java.io.PrintWriter; import java.io.Reader; import java.util.Map; -public interface ContextBuilderFacets { +public interface ContainerBuilderFacets { public interface ALL extends WantsName, WantsController, @@ -41,7 +41,7 @@ public interface ContextBuilderFacets { } public interface WantsController extends WantsStdin, WantsIoType { - public WantsStdin controller(ContextActivitiesController controller); + public WantsStdin controller(ContainerActivitiesController controller); } @@ -82,7 +82,7 @@ public interface ContextBuilderFacets { } public interface CanBuild { - NBBufferedCommandContext build(NBComponent forComponent); + NBBufferedContainer build(NBComponent forComponent); } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/DiagReader.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java similarity index 96% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/DiagReader.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java index 9a0a91f75..4abf9f652 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/DiagReader.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import java.io.CharArrayWriter; import java.io.IOException; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/DiagWriter.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java similarity index 96% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/DiagWriter.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java index f935462ea..f72339beb 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/DiagWriter.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import java.io.PrintWriter; import java.io.Writer; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/FanWriter.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java similarity index 95% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/FanWriter.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java index bef36ad73..9bdd1ac7d 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/FanWriter.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import org.jetbrains.annotations.NotNull; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/InterjectingCharArrayWriter.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java similarity index 96% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/InterjectingCharArrayWriter.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java index c3f059b2b..e36d4c243 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/InterjectingCharArrayWriter.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import org.jetbrains.annotations.NotNull; import java.io.CharArrayWriter; import java.io.IOException; import java.io.Writer; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; public class InterjectingCharArrayWriter extends CharArrayWriter { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBBufferedCommandContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java similarity index 81% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBBufferedCommandContext.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java index 19e2bac30..1b6add0a0 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBBufferedCommandContext.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import io.nosqlbench.engine.core.annotation.Annotators; import io.nosqlbench.engine.core.lifecycle.activity.ActivitiesProgressIndicator; @@ -38,12 +38,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class NBBufferedCommandContext extends NBBaseComponent implements NBCommandContext { +public class NBBufferedContainer extends NBBaseComponent implements NBContainer { - private final static Logger logger = LogManager.getLogger(NBBufferedCommandContext.class); - private final ContextActivitiesController controller; + private final static Logger logger = LogManager.getLogger(NBBufferedContainer.class); + private final ContainerActivitiesController controller; private final ActivitiesProgressIndicator activitiesProgressIndicator; - private ContextShutdownHook contextShutdownHook; + private ContextShutdownHook containerShutdownHook; private long startedAtMillis; private Exception error; private long endedAtMillis; @@ -60,10 +60,10 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma private DiagWriter stderrBuffer; private DiagReader stdinBuffer; - public NBBufferedCommandContext(NBComponent parent, String name, IOType ioTypes) { - super(parent, NBLabels.forKV("context",name)); + public NBBufferedContainer(NBComponent parent, String name, IOType ioTypes) { + super(parent, NBLabels.forKV("container",name)); this.iotype = ioTypes; - this.controller = new ContextActivitiesController(this); + this.controller = new ContainerActivitiesController(this); switch (iotype) { case traced: @@ -83,9 +83,9 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma break; } - this.contextShutdownHook = new ContextShutdownHook(this); + this.containerShutdownHook = new ContextShutdownHook(this); - Runtime.getRuntime().addShutdownHook(this.contextShutdownHook); + Runtime.getRuntime().addShutdownHook(this.containerShutdownHook); Annotators.recordAnnotation( Annotation.newBuilder() @@ -100,7 +100,7 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma @Override - public ContextActivitiesController controller() { + public ContainerActivitiesController controller() { return controller; } @@ -123,13 +123,13 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma return this.stdoutBuffer.getTimedLog() + this.stderrBuffer.getTimedLog(); } - public NBCommandContext asFixtures() { - return (NBCommandContext) this; + public NBContainer asFixtures() { + return (NBContainer) this; } - public static ContextBuilderFacets.WantsName builder() { - return new NBScenarioContextBuilder(); + public static ContainerBuilderFacets.WantsName builder() { + return new NBScenarioContainerBuilder(); } @Override @@ -168,11 +168,11 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma // ignore // } else { // -// RuntimeException error = new RuntimeException("Unrecognizable type to set context vars with:" + object.getClass().getCanonicalName()); +// RuntimeException error = new RuntimeException("Unrecognizable type to set container vars with:" + object.getClass().getCanonicalName()); // logger.error(error); -//// throw new RuntimeException("Unrecognizable type to set context vars with:" + object.getClass().getCanonicalName()); +//// throw new RuntimeException("Unrecognizable type to set container vars with:" + object.getClass().getCanonicalName()); } else { - logger.debug("no object was provided to set the context result"); + logger.debug("no object was provided to set the container result"); } return safeCmdResult; @@ -180,7 +180,7 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma @Override public void doShutdown() { - NBCommandContext.super.doShutdown(); + NBContainer.super.doShutdown(); } @Override @@ -190,11 +190,11 @@ public class NBBufferedCommandContext extends NBBaseComponent implements NBComma @Override public void beforeDetach() { - // TODO, shutdown hooks need to be moved to context - Runtime.getRuntime().removeShutdownHook(this.contextShutdownHook); - final var retiringScenarioShutdownHook = this.contextShutdownHook; - this.contextShutdownHook = null; + // TODO, shutdown hooks need to be moved to container + Runtime.getRuntime().removeShutdownHook(this.containerShutdownHook); + final var retiringScenarioShutdownHook = this.containerShutdownHook; + this.containerShutdownHook = null; retiringScenarioShutdownHook.run(); - this.logger.debug("removing context shutdown hook"); + this.logger.debug("removing container shutdown hook"); } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBCommandParams.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java similarity index 99% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBCommandParams.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java index 67495cad3..cbf1cbf4f 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBCommandParams.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBCommandContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java similarity index 73% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBCommandContext.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java index 1e421ac55..ff0b126ba 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBCommandContext.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java @@ -14,27 +14,25 @@ * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBCommandResult; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; import io.nosqlbench.nb.api.components.NBComponent; -import os.CommandResult; import java.io.PrintWriter; import java.io.Reader; import java.util.Map; import java.util.function.BiFunction; -import java.util.function.Function; -public interface NBCommandContext extends NBComponent, BiFunction { +public interface NBContainer extends NBComponent, BiFunction { // ScenarioPhaseParams params(); - ContextActivitiesController controller(); + ContainerActivitiesController controller(); PrintWriter out(); PrintWriter err(); Reader in(); - public static ContextBuilderFacets.WantsName builder() { - return new NBScenarioContextBuilder(); + public static ContainerBuilderFacets.WantsName builder() { + return new NBScenarioContainerBuilder(); } default void doShutdown() { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBScenarioContextBuilder.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java similarity index 53% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBScenarioContextBuilder.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java index 22d3f6640..84b97b72e 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/NBScenarioContextBuilder.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java @@ -1,4 +1,4 @@ -package io.nosqlbench.engine.core.lifecycle.scenario.context; +package io.nosqlbench.engine.core.lifecycle.scenario.container; /* * Copyright (c) 2022 nosqlbench @@ -25,74 +25,74 @@ import java.io.PrintWriter; import java.io.Reader; import java.util.Map; -public class NBScenarioContextBuilder implements ContextBuilderFacets.ALL { +public class NBScenarioContainerBuilder implements ContainerBuilderFacets.ALL { private Map params = Map.of(); - private ContextActivitiesController controller; + private ContainerActivitiesController controller; private PrintWriter out = new PrintWriter(System.out); private PrintWriter err = new PrintWriter(System.err); private Reader in = new InputStreamReader(System.in); - private NBBufferedCommandContext.IOType iotype = NBBufferedCommandContext.IOType.traced; - private String contextName; + private NBBufferedContainer.IOType iotype = NBBufferedContainer.IOType.traced; + private String containerName; - public NBScenarioContextBuilder() {} - public NBBufferedCommandContext build(NBComponent contextParentComponent) { - return new NBBufferedCommandContext(contextParentComponent,contextName,iotype); + public NBScenarioContainerBuilder() {} + public NBBufferedContainer build(NBComponent contextParentComponent) { + return new NBBufferedContainer(contextParentComponent, containerName,iotype); } @Override - public NBScenarioContextBuilder controller(ContextActivitiesController controller) { + public NBScenarioContainerBuilder controller(ContainerActivitiesController controller) { this.controller = controller; return this; } @Override - public NBScenarioContextBuilder out(PrintWriter out) { + public NBScenarioContainerBuilder out(PrintWriter out) { this.out = out; return this; } @Override - public ContextBuilderFacets.WantsParams err(PrintWriter err) { + public ContainerBuilderFacets.WantsParams err(PrintWriter err) { this.err = err; return this; } @Override - public NBScenarioContextBuilder in(Reader in) { + public NBScenarioContainerBuilder in(Reader in) { this.in = in; return this; } @Override - public NBScenarioContextBuilder params(Map params) { + public NBScenarioContainerBuilder params(Map params) { this.params=params; return this; } @Override - public ContextBuilderFacets.WantsParams virtualIO() { - this.iotype= NBBufferedCommandContext.IOType.virtual; + public ContainerBuilderFacets.WantsParams virtualIO() { + this.iotype= NBBufferedContainer.IOType.virtual; return this; } @Override - public ContextBuilderFacets.WantsParams connectedIO() { - this.iotype = NBBufferedCommandContext.IOType.connected; + public ContainerBuilderFacets.WantsParams connectedIO() { + this.iotype = NBBufferedContainer.IOType.connected; return this; } @Override - public ContextBuilderFacets.WantsParams tracedIO() { - this.iotype= NBBufferedCommandContext.IOType.traced; + public ContainerBuilderFacets.WantsParams tracedIO() { + this.iotype= NBBufferedContainer.IOType.traced; return this; } @Override - public ContextBuilderFacets.WantsController name(String contextName) { - this.contextName = contextName; + public ContainerBuilderFacets.WantsController name(String contextName) { + this.containerName = contextName; return this; } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ScriptEnvBuffer.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java similarity index 91% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ScriptEnvBuffer.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java index f273c8d33..36b6ab4af 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ScriptEnvBuffer.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java @@ -13,11 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.nosqlbench.engine.core.lifecycle.scenario.context; - -import io.nosqlbench.engine.core.lifecycle.scenario.context.DiagReader; -import io.nosqlbench.engine.core.lifecycle.scenario.context.DiagWriter; -import io.nosqlbench.engine.core.lifecycle.scenario.context.InterjectingCharArrayWriter; +package io.nosqlbench.engine.core.lifecycle.scenario.container; import javax.script.SimpleScriptContext; import java.io.Reader; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java index d4bfc4ae6..e8f990a0e 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java @@ -16,19 +16,19 @@ package io.nosqlbench.engine.core.lifecycle.scenario.execution; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBContainer; public class ContextShutdownHook extends Thread { - private final NBCommandContext context; + private final NBContainer container; - public ContextShutdownHook(NBCommandContext context) { - this.context = context; + public ContextShutdownHook(NBContainer container) { + this.container = container; } @Override public void run() { - context.doShutdown(); + container.doShutdown(); } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java index af0d69c6b..f855ac0be 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java @@ -16,16 +16,10 @@ package io.nosqlbench.engine.core.lifecycle.scenario.execution; -import io.nosqlbench.nb.api.annotations.Annotation; -import io.nosqlbench.nb.api.annotations.Layer; import io.nosqlbench.nb.api.labels.NBLabels; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.nb.api.components.NBComponentErrorHandler; -import io.nosqlbench.engine.core.annotation.Annotators; -import io.nosqlbench.engine.core.lifecycle.activity.ActivitiesProgressIndicator; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,12 +31,12 @@ public abstract class NBBaseCommand extends NBInvokableCommand { private final String targetScenario; protected Logger logger = LogManager.getLogger("COMMAND"); - public NBBaseCommand(NBBufferedCommandContext parentComponent, String stepName, String targetScenario) { + public NBBaseCommand(NBBufferedContainer parentComponent, String stepName, String targetScenario) { super(parentComponent, NBLabels.forKV("step", stepName)); this.targetScenario = targetScenario; } - public NBBaseCommand(NBBufferedCommandContext parentComponent, String commandLabel) { + public NBBaseCommand(NBBufferedContainer parentComponent, String commandLabel) { this(parentComponent, commandLabel, "_testing_"); } @@ -55,7 +49,7 @@ public abstract class NBBaseCommand extends NBInvokableCommand { } @Override - public final Object apply(NBBufferedCommandContext sctx, NBCommandParams params) { + public final Object apply(NBBufferedContainer sctx, NBCommandParams params) { return invoke(params, sctx.out(), sctx.err(), sctx.in(), sctx.controller()); } @@ -69,7 +63,7 @@ public abstract class NBBaseCommand extends NBInvokableCommand { PrintWriter stdout, PrintWriter stderr, Reader stdin, - ContextActivitiesController controller + ContainerActivitiesController controller ); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java index ad94b209b..5c0fc9078 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.scenario.execution; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.nb.api.components.NBComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ public abstract class NBCommandInfo { public NBInvokableCommand create(NBComponent parent, String cmdName, String ctxName) { Constructor cmdCtor; try { - cmdCtor = getType().getConstructor(NBBufferedCommandContext.class, String.class, String.class); + cmdCtor = getType().getConstructor(NBBufferedContainer.class, String.class, String.class); return cmdCtor.newInstance(parent, cmdName, ctxName); } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) { throw new RuntimeException("Unable to instantiate command via ctor(parent,name,ctx): " + e,e); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java index a7bb0eeca..ad4beb879 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.core.lifecycle.scenario.execution; import io.nosqlbench.engine.core.lifecycle.ExecutionResult; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import java.util.function.Supplier; @@ -25,11 +25,11 @@ public class NBCommandResult implements Supplier { private final long startedAt; private final long endedAt; private final Exception exception; - private final NBBufferedCommandContext fixtures; + private final NBBufferedContainer fixtures; private Object resultObject; - public NBCommandResult(NBBufferedCommandContext fixtures, long start, long end, Exception exception) { + public NBCommandResult(NBBufferedContainer fixtures, long start, long end, Exception exception) { this.fixtures = fixtures; this.startedAt=start; this.endedAt=end; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java index 58c1d4e2e..b94310980 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java @@ -16,35 +16,33 @@ package io.nosqlbench.engine.core.lifecycle.scenario.execution; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.api.components.NBBaseComponent; -import io.nosqlbench.nb.api.components.NBComponent; import io.nosqlbench.nb.api.labels.NBLabels; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.Objects; import java.util.function.BiFunction; -public abstract class NBInvokableCommand extends NBBaseComponent implements BiFunction { +public abstract class NBInvokableCommand extends NBBaseComponent implements BiFunction { private static final Logger logger = LogManager.getLogger(NBInvokableCommand.class); - public NBInvokableCommand(NBBufferedCommandContext parentComponent, NBLabels componentSpecificLabelsOnly) { + public NBInvokableCommand(NBBufferedContainer parentComponent, NBLabels componentSpecificLabelsOnly) { super(parentComponent, componentSpecificLabelsOnly); } @Override - public abstract Object apply(NBBufferedCommandContext nbBufferedCommandContext, NBCommandParams nbCommandParams); + public abstract Object apply(NBBufferedContainer nbBufferedContainer, NBCommandParams nbCommandParams); - public NBCommandResult invokeSafe(NBBufferedCommandContext context, NBCommandParams params) { + public NBCommandResult invokeSafe(NBBufferedContainer container, NBCommandParams params) { Object resultObject = null; Exception exception = null; long startAt = System.currentTimeMillis(); NBCommandResult result = null; try { logger.debug("invoking command: " + this); - resultObject=apply(context, params); + resultObject=apply(container, params); logger.debug("cmd produced: " + (resultObject==null ? "NULL" : resultObject.toString())); } catch (Exception e) { exception = e; @@ -52,7 +50,7 @@ public abstract class NBInvokableCommand extends NBBaseComponent implements BiFu exception.printStackTrace(System.out); } finally { long endAt = System.currentTimeMillis(); - result = new NBCommandResult(context, startAt, endAt, exception); + result = new NBCommandResult(container, startAt, endAt, exception); if (resultObject!=null) { result.setResultObject(resultObject); } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java similarity index 84% rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptContext.java rename to engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java index 41ee766a3..dcfac789d 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptContext.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java @@ -16,19 +16,17 @@ package io.nosqlbench.engine.core.lifecycle.scenario.script; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; - import javax.script.SimpleScriptContext; import java.io.Reader; import java.io.Writer; -public class BufferedScriptContext extends SimpleScriptContext { +public class BufferedScriptCtx extends SimpleScriptContext { Reader reader; Writer writer; Writer errorWriter; - public BufferedScriptContext(Writer writer, Writer errorWriter,Reader reader) { + public BufferedScriptCtx(Writer writer, Writer errorWriter, Reader reader) { this.writer = writer; this.errorWriter = errorWriter; this.reader = reader; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java index e3474fe77..3e32998e9 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java @@ -18,12 +18,12 @@ package io.nosqlbench.engine.core.lifecycle.scenario.script; import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine; import io.nosqlbench.engine.cmdstream.BasicScriptBuffer; import io.nosqlbench.engine.cmdstream.Cmd; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.engine.core.lifecycle.ExecutionMetricsResult; import io.nosqlbench.engine.core.lifecycle.activity.ActivitiesProgressIndicator; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine.Builder; import org.graalvm.polyglot.EnvironmentAccess; @@ -43,7 +43,7 @@ public class NBScriptedCommand extends NBBaseCommand { private Exception error; private ExecutionMetricsResult result; - private BufferedScriptContext context; + private BufferedScriptCtx ctx; private GraalJSScriptEngine _engine; public Optional getResultIfComplete() { @@ -77,7 +77,7 @@ public class NBScriptedCommand extends NBBaseCommand { } public NBScriptedCommand( - NBBufferedCommandContext parentComponent, + NBBufferedContainer parentComponent, String phaseName, String targetScenario ) { @@ -87,7 +87,7 @@ public class NBScriptedCommand extends NBBaseCommand { this.buffer = new BasicScriptBuffer(); } - public static NBScriptedCommand ofScripted(String name, Map params, NBBufferedCommandContext parent, Invocation invocation) { + public static NBScriptedCommand ofScripted(String name, Map params, NBBufferedContainer parent, Invocation invocation) { return new NBScriptedCommand(parent, name, "default"); } public NBScriptedCommand add(Cmd... cmds) { @@ -118,10 +118,10 @@ public class NBScriptedCommand extends NBBaseCommand { // return this; // } - private BufferedScriptContext initializeScriptContext(PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { - BufferedScriptContext ctx = new BufferedScriptContext(stdout, stderr, stdin); + private BufferedScriptCtx initializeScriptContext(PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { + BufferedScriptCtx ctx = new BufferedScriptCtx(stdout, stderr, stdin); ctx.getBindings(ScriptContext.ENGINE_SCOPE).put("this", this); - ctx.getBindings(ScriptContext.ENGINE_SCOPE).put("context", context); + ctx.getBindings(ScriptContext.ENGINE_SCOPE).put("container", this.ctx); ctx.getBindings(ScriptContext.ENGINE_SCOPE).put("controller", controller); ctx.getBindings(ScriptContext.ENGINE_SCOPE).put("stdout", stdout); ctx.getBindings(ScriptContext.ENGINE_SCOPE).put("stderr", stderr); @@ -155,13 +155,13 @@ public class NBScriptedCommand extends NBBaseCommand { } @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { try { this.logger.debug("Initializing scripting engine for {}.", phaseName); GraalJSScriptEngine engine = this.initializeScriptingEngine(); - this.context = this.initializeScriptContext(stdout, stderr, stdin, controller); + this.ctx = this.initializeScriptContext(stdout, stderr, stdin, controller); this.logger.debug("Running control script for {}.", phaseName); - engine.setContext(context); + engine.setContext(ctx); engine.getContext().getBindings(ScriptContext.ENGINE_SCOPE).put("params", params); Object resultObject = null; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java index 5762c00f4..48a78669a 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java @@ -15,12 +15,12 @@ */ package io.nosqlbench.engine.core.lifecycle.scenario.script; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ScriptEnvBuffer; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ScriptEnvBuffer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBContainer; public class ScenarioScriptShell extends ScriptEnvBuffer { - public ScenarioScriptShell(NBCommandContext fixtures) { + public ScenarioScriptShell(NBContainer fixtures) { } @Override diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java index f40c3b935..fc0c1a246 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.core.lifecycle.scenario.script.bindings; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.graalvm.polyglot.Value; @@ -29,9 +29,9 @@ public class PolyglotScenarioController { private static final Logger logger = LogManager.getLogger("SCENARIO/POLYGLOT"); - private final ContextActivitiesController controller; + private final ContainerActivitiesController controller; - public PolyglotScenarioController(ContextActivitiesController inner) { + public PolyglotScenarioController(ContainerActivitiesController inner) { this.controller = inner; } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java index a84e95e36..7fb6bad01 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java @@ -19,8 +19,7 @@ package io.nosqlbench.engine.core.lifecycle.session; import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdArg; import io.nosqlbench.engine.cmdstream.CmdParam; -import io.nosqlbench.engine.cmdstream.CmdType; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; import io.nosqlbench.engine.core.lifecycle.scenario.script.NBScriptedCommand; import io.nosqlbench.nb.annotations.Service; @@ -29,14 +28,13 @@ import io.nosqlbench.nb.api.nbio.NBIO; import java.nio.file.Path; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import java.util.Optional; @Service(value = NBInvokableResolver.class, selector = "autojs") public class NBAutoScriptResolver implements NBInvokableResolver { @Override - public NBInvokableCommand resolve(Cmd cmd, NBBufferedCommandContext parent, String phaseName) { + public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName) { Optional> scriptfile = NBIO.local() .searchPrefixes("scripts/auto") diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java index 2a23a11bc..f3b3fea93 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java @@ -17,9 +17,9 @@ package io.nosqlbench.engine.core.lifecycle.session; import io.nosqlbench.engine.cmdstream.*; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.api.errors.BasicError; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,10 +31,10 @@ public class NBCommandAssembly { private final static Logger logger = LogManager.getLogger(NBCommandAssembly.class); - public static record CommandInvocation(NBInvokableCommand command, NBCommandParams params, String contextName) { + public static record CommandInvocation(NBInvokableCommand command, NBCommandParams params, String containerName) { } - public static List assemble(List cmds, Function ctxprovider) { + public static List assemble(List cmds, Function ctxprovider) { List mappedCmds = tagCommandsWithContext(cmds); List invocations = prepareMappedPhases(mappedCmds, ctxprovider); return invocations; @@ -42,27 +42,27 @@ public class NBCommandAssembly { private static List tagCommandsWithContext(List cmds) { LinkedList tagged = new LinkedList<>(); - String contextName = Cmd.DEFAULT_TARGET_CONTEXT; + String containerName = Cmd.DEFAULT_TARGET_CONTEXT; for (Cmd cmd : cmds) { - if (cmd.getArgs().containsKey("context")) { - String ctx = cmd.getArgs().remove("context").getValue(); + if (cmd.getArgs().containsKey("container")) { + String ctx = cmd.getArgs().remove("container").getValue(); String step = cmd.getArgs().containsKey("step") ? cmd.getArgs().remove("step").getValue() : "no-step"; - tagged.add(cmd.forTargetContext(ctx, step)); - } else if (cmd.getCmdType() == CmdType.context) { - contextName = cmd.getArgValue("context_name"); - if (contextName.equals(Cmd.DEFAULT_TARGET_CONTEXT)) { + tagged.add(cmd.forContainer(ctx, step)); + } else if (cmd.getCmdType() == CmdType.container) { + containerName = cmd.getArgValue("container"); + if (containerName.equals(Cmd.DEFAULT_TARGET_CONTEXT)) { logger.warn("You are explicitly setting the scenario name to " + Cmd.DEFAULT_TARGET_CONTEXT + "'. This is likely an error. " + "This is the default scenario name, and if you are using different scenario names you should pick something that is different and specific."); } } else { - tagged.add(cmd.forTargetContext(contextName, null)); + tagged.add(cmd.forContainer(containerName, null)); } } return new ArrayList<>(tagged); } - private static List prepareMappedPhases(List mappedCmds, Function ctxProvider) { + private static List prepareMappedPhases(List mappedCmds, Function ctxProvider) { List parameterizedInvocations = new ArrayList<>(); NBCoreInvokableResolver core_resolver = new NBCoreInvokableResolver(); String basename = "phase_"; @@ -72,7 +72,7 @@ public class NBCommandAssembly { String phaseName = basename + count; NBCommandParams params = switch (cmd.getCmdType()) { - case indirect, java, context -> NBCommandParams.of(cmd.getArgMap()); + case indirect, java, container -> NBCommandParams.of(cmd.getArgMap()); default -> NBCommandParams.of(Map.of()); }; @@ -81,8 +81,8 @@ public class NBCommandAssembly { if (command==null) { throw new BasicError("Found zero commands for spec;" + cmd); } - String contextName = cmd.getTargetContext(); - parameterizedInvocations.add(new CommandInvocation(command, params, contextName)); + String containerName = cmd.getTargetContext(); + parameterizedInvocations.add(new CommandInvocation(command, params, containerName)); } return parameterizedInvocations; } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java index 2ce443cea..f98520773 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java @@ -16,9 +16,9 @@ package io.nosqlbench.engine.core.lifecycle.session; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBCommandResult; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; import io.nosqlbench.nb.api.config.standard.TestComponent; @@ -26,7 +26,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Map; -import java.util.Objects; public class NBCommandInvoker { private final static Logger logger = LogManager.getLogger(NBCommandInvoker.class); @@ -35,15 +34,15 @@ public class NBCommandInvoker { return invoke(createContext(),command,params); } - public static NBCommandResult invoke(NBBufferedCommandContext context, NBInvokableCommand command) { - return invoke(context, command, NBCommandParams.of(Map.of())); + public static NBCommandResult invoke(NBBufferedContainer container, NBInvokableCommand command) { + return invoke(container, command, NBCommandParams.of(Map.of())); } - private static NBBufferedCommandContext createContext() { - return NBCommandContext.builder().name("testing").build(TestComponent.EMPTY_COMPONENT); + private static NBBufferedContainer createContext() { + return NBContainer.builder().name("testing").build(TestComponent.EMPTY_COMPONENT); } - public static NBCommandResult invoke(NBBufferedCommandContext context, NBInvokableCommand command, NBCommandParams params) { - return command.invokeSafe(context,params); + public static NBCommandResult invoke(NBBufferedContainer container, NBInvokableCommand command, NBCommandParams params) { + return command.invokeSafe(container,params); } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java index f02a754b7..a1edc4f4c 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java @@ -17,11 +17,9 @@ package io.nosqlbench.engine.core.lifecycle.session; import io.nosqlbench.engine.cmdstream.Cmd; -import io.nosqlbench.engine.cmdstream.CmdType; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; import io.nosqlbench.nb.annotations.Service; -import io.nosqlbench.nb.api.components.NBComponent; import java.util.*; @@ -35,7 +33,7 @@ public class NBCoreInvokableResolver implements NBInvokableResolver { private SequencedMap resolvers = new LinkedHashMap<>(); @Override - public NBInvokableCommand resolve(Cmd cmd, NBBufferedCommandContext parent, String phaseName) { + public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName) { for (NBInvokableResolver resolver : getResolvers().values()) { NBInvokableCommand loadedCommand = resolver.resolve(cmd, parent, phaseName); if (loadedCommand!=null) { diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java index 576e643a5..86b803882 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java @@ -17,12 +17,10 @@ package io.nosqlbench.engine.core.lifecycle.session; import io.nosqlbench.engine.cmdstream.Cmd; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; -import java.util.List; - public interface NBInvokableResolver { - NBInvokableCommand resolve(Cmd cmd, NBBufferedCommandContext parent, String phaseName); + NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName); } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java index 43ab9d621..c178e18fb 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java @@ -16,19 +16,16 @@ package io.nosqlbench.engine.core.lifecycle.session; -import io.nosqlbench.engine.cmdstream.BasicScriptBuffer; import io.nosqlbench.engine.cmdstream.Cmd; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBInvokableCommand; import io.nosqlbench.engine.core.lifecycle.scenario.script.NBScriptedCommand; import io.nosqlbench.nb.annotations.Service; -import java.util.List; - @Service(value = NBInvokableResolver.class, selector = "js") public class NBScriptCommandResolver implements NBInvokableResolver { @Override - public NBInvokableCommand resolve(Cmd cmd, NBBufferedCommandContext parent, String phaseName) { + public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName) { return switch (cmd.getCmdType()) { case run, await, forceStop, stop, start, waitMillis, fragment, script-> new NBScriptedCommand(parent, phaseName, cmd.getTargetContext()).add(cmd); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java index dd8f581bd..4a9f5a580 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java @@ -26,8 +26,8 @@ import io.nosqlbench.nb.api.components.decorators.NBTokenWords; import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.core.clientload.*; import io.nosqlbench.engine.core.lifecycle.ExecutionResult; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBCommandResult; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -47,7 +47,7 @@ public class NBSession extends NBBaseComponent implements Function, Ex private final String sessionName; private final ClientSystemMetricChecker clientMetricChecker; - private final Map contexts = new ConcurrentHashMap<>(); + private final Map containers = new ConcurrentHashMap<>(); public enum STATUS { OK, @@ -55,10 +55,10 @@ public class NBSession extends NBBaseComponent implements Function, Ex ERROR } - private NBBufferedCommandContext getContext(String name) { - return contexts.computeIfAbsent( + private NBBufferedContainer getContext(String name) { + return containers.computeIfAbsent( name, - n -> NBCommandContext.builder().name(n).build(this) + n -> NBContainer.builder().name(n).build(this) ); } @@ -99,19 +99,19 @@ public class NBSession extends NBBaseComponent implements Function, Ex */ public ExecutionResult apply(List cmds) { - // TODO: add context closing command - // TODO: inject context closing commands after the last command referencing each context + // TODO: add container closing command + // TODO: inject container closing commands after the last command referencing each container List invocationCalls = NBCommandAssembly.assemble(cmds, this::getContext); ResultCollector collector = new ResultCollector(); try (ResultContext results = new ResultContext(collector).ok()) { for (NBCommandAssembly.CommandInvocation invocation : invocationCalls) { try { - String targetContext = invocation.contextName(); - NBBufferedCommandContext context = getContext(targetContext); - NBCommandResult cmdResult = context.apply(invocation.command(), invocation.params()); + String targetContext = invocation.containerName(); + NBBufferedContainer container = getContext(targetContext); + NBCommandResult cmdResult = container.apply(invocation.command(), invocation.params()); results.apply(cmdResult); } catch (Exception e) { - String msg = "While running command '" + invocation.command() + "' in context '" + invocation.contextName() + "', an error occurred: " + e.toString(); + String msg = "While running command '" + invocation.command() + "' in container '" + invocation.containerName() + "', an error occurred: " + e.toString(); logger.error(msg); results.error(e); break; @@ -119,9 +119,9 @@ public class NBSession extends NBBaseComponent implements Function, Ex } } - for (String ctxName : contexts.keySet()) { - NBBufferedCommandContext ctx = contexts.get(ctxName); - logger.debug("awaiting end of activities in context '" + ctxName + "':" + + for (String containerName : containers.keySet()) { + NBBufferedContainer ctx = containers.get(containerName); + logger.debug("awaiting end of activities in container '" + containerName + "':" + ctx.controller().getActivityDefs().stream().map(ActivityDef::getAlias).toList()); ctx.controller().shutdown(); ctx.controller().awaitCompletion(Long.MAX_VALUE); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java index cb75d6982..8bcfedc1c 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java @@ -55,7 +55,7 @@ public class ResultContext implements AutoCloseable { if (this.status==null) { this.status= ExecutionResult.Status.ERROR; if (this.error!=null) { - this.error=new RuntimeException("early execution result with no asserted status. Call setStatus on your result context or end with `return ctx.ok() or ctx.error(...)`"); + this.error=new RuntimeException("early execution result with no asserted status. Call setStatus on your result object or end with `return ctx.ok() or ctx.error(...)`"); } } receiver.accept(this); diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java index 2cf59736f..06da29283 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java @@ -20,12 +20,9 @@ import io.nosqlbench.engine.cmdstream.Cmd; import io.nosqlbench.engine.cmdstream.CmdArg; import io.nosqlbench.engine.cmdstream.CmdParam; import io.nosqlbench.engine.core.lifecycle.session.NBCommandInvoker; -import io.nosqlbench.engine.core.lifecycle.session.NBSession; -import io.nosqlbench.nb.api.config.standard.TestComponent; import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBCommandResult; import io.nosqlbench.engine.core.lifecycle.scenario.script.NBScriptedCommand; import org.apache.logging.log4j.LogManager; @@ -41,7 +38,7 @@ public class NBBaseCommandTest { @Test public void shouldLoadScriptText() { - NBBufferedCommandContext ctx = NBCommandContext.builder().name("testing").build(NBComponent.EMPTY_COMPONENT); + NBBufferedContainer ctx = NBContainer.builder().name("testing").build(NBComponent.EMPTY_COMPONENT); NBScriptedCommand cmd = NBScriptedCommand.ofScripted("testing", Map.of(),ctx, NBScriptedCommand.Invocation.EXECUTE_SCRIPT); cmd.add(new Cmd("fragment",Map.of( "fragment",new CmdArg(new CmdParam("fragment",s->s,false),"=","print('loaded script environment...');") diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java index a2bd1a10c..9d454f266 100644 --- a/engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.core.script; import io.nosqlbench.nb.api.errors.BasicError; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 87933d78a..724e0c9ea 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -335,7 +335,7 @@ org.antlr antlr4-runtime - 4.13.0 + 4.13.1 org.apache.commons @@ -792,7 +792,7 @@ org.antlr antlr4-maven-plugin - 4.13.0 + 4.13.1 org.codehaus.mojo diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java index 15cb246d8..1eec7b701 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java @@ -16,10 +16,10 @@ package io.nosqlbench.nbr.examples.injava; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.engine.core.lifecycle.session.NBCommandInvoker; import io.nosqlbench.nb.api.config.standard.TestComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBCommandResult; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ public class DirectRuntimeScenarioTests { private final TestComponent testC = new TestComponent("testroot", "testroot"); @Test public void test_SC_linkedinput() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_linkedinput").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_linkedinput").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_linkedinput(testC,"test_SC_linkedinput"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); Pattern p = Pattern.compile(".*started leader.*started follower.*stopped leader.*stopped follower.*", Pattern.DOTALL); @@ -41,7 +41,7 @@ public class DirectRuntimeScenarioTests { } @Test public void testSC_activity_init_error() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("testSC_activity_init_error").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("testSC_activity_init_error").build(TestComponent.EMPTY_COMPONENT); NB_activity_init_error command = new NB_activity_init_error(testC, "SC_activity_init_error"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); assertThat(result.getException()).isNotNull(); @@ -52,7 +52,7 @@ public class DirectRuntimeScenarioTests { @Test public void test_SC_activity_error() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_activity_error").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_activity_error").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_activity_error(testC,"test_SC_activity_error"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); assertThat(result.getException()).isNotNull(); @@ -61,14 +61,14 @@ public class DirectRuntimeScenarioTests { } @Test public void test_SC_await_finished() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_await_finished").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_await_finished").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_await_finished(testC,"test_SC_await_finished"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); assertThat(result.getIOLog()).contains("awaited activity"); } @Test public void test_SC_basicdiag() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_basicdiag").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_basicdiag").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_basicdiag(testC,"test_SC_basicdiag"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); assertThat(result.getIOLog().indexOf("starting activity basic_diag")).isGreaterThanOrEqualTo(0); @@ -77,7 +77,7 @@ public class DirectRuntimeScenarioTests { } @Test public void test_SC_blockingrun() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_blockingrun").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_blockingrun").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_blockingrun(testC,"test_SC_blockingrun"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); assertThat(result.getIOLog()).matches(Pattern.compile(".*running.*finished.*running.*finished.*",Pattern.DOTALL)); @@ -87,7 +87,7 @@ public class DirectRuntimeScenarioTests { @Test public void test_SC_cocycledelay_bursty() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_cocycledelay_bursty").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_cocycledelay_bursty").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_cocycledelay_bursty(testC,"test_SC_cocycledelay_bursty"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); result.report(); @@ -97,7 +97,7 @@ public class DirectRuntimeScenarioTests { @Disabled("enable before merge") @Test public void test_SC_cocycledelay_strict() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("testest_SC_cocycledelay_strictting").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("testest_SC_cocycledelay_strictting").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_cocycledelay_strict(testC,"test_SC_cocycledelay_strict"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @@ -105,48 +105,48 @@ public class DirectRuntimeScenarioTests { @Disabled("enable before merge") @Test public void test_SC_cycle_rate() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_cycle_rate").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_cycle_rate").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_cycle_rate(testC,"test_SC_cycle_rate"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_cycle_rate_change() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_cycle_rate_change").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_cycle_rate_change").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_cycle_rate_change(testC,"test_SC_cycle_rate_change"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_extension_csvmetrics() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_extension_csvmetrics").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_extension_csvmetrics").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_extension_csvmetrics(testC,"test_SC_extension_csvmetrics"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_extension_csvoutput() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_extension_csvoutput").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_extension_csvoutput").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_extension_csvoutput(testC,"test_SC_extension_csvoutput"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_extension_histostatslogger() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_extension_histostatslogger").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_extension_histostatslogger").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_extension_histostatslogger(testC,"test_SC_extension_histostatslogger"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_extension_shutdown_hook() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_extension_shutdown_hook").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_extension_shutdown_hook").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_extension_shutdown_hook(testC,"test_SC_extension_shutdown_hook"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Test public void test_SC_extension_example() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_extension_example").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_extension_example").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_extension_example(testC,"test_SC_extension_example"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); // samples.exitWithCode(); @@ -155,14 +155,14 @@ public class DirectRuntimeScenarioTests { @Disabled("enable before merge") @Test public void test_SC_histologger() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("tetest_SC_histologgersting").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("tetest_SC_histologgersting").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_histologger(testC,"test_SC_histologger"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_optimo() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_optimo").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_optimo").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_optimo_test(testC,"test_SC_optimo"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); System.out.println(result); @@ -170,41 +170,41 @@ public class DirectRuntimeScenarioTests { @Disabled("enable before merge") @Test public void test_SC_params_variable() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_params_variable").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_params_variable").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_params_variable(testC,"test_SC_params_variable"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_readmetrics() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_readmetrics").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_readmetrics").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_readmetrics(testC,"test_SC_readmetrics"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_speedcheck() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_speedcheck").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_speedcheck").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_speedcheck(testC,"test_SC_speedcheck"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_start_stop_diag() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_start_stop_diag").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_start_stop_diag").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_start_stop_diag(testC,"test_SC_start_stop_diag"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Test public void test_SC_threadchange() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_threadchange").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_threadchange").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_threadchange(testC,"test_SC_threadchange"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @Disabled("enable before merge") @Test public void test_SC_threadspeeds() { - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_threadspeeds").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_threadspeeds").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_threadspeeds(testC,"test_SC_threadspeeds"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); } @@ -212,7 +212,7 @@ public class DirectRuntimeScenarioTests { @Test public void test_SC_undef_param() { //.params(Map.of("one", "two", "three", "four") - NBBufferedCommandContext testC = NBBufferedCommandContext.builder().name("test_SC_undef_param").build(TestComponent.EMPTY_COMPONENT); + NBBufferedContainer testC = NBBufferedContainer.builder().name("test_SC_undef_param").build(TestComponent.EMPTY_COMPONENT); NBBaseCommand command = new NB_undef_param(testC, "test_SC_undef_param"); NBCommandResult result = NBCommandInvoker.invoke(testC,command); String out = result.getIOLog(); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java index 0f98ef14c..89c3ee3ee 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java @@ -16,11 +16,10 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import java.io.PrintWriter; @@ -28,7 +27,7 @@ import java.io.Reader; import java.util.Map; public class NB_activity_error extends NBBaseCommand { - public NB_activity_error(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_activity_error(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -53,7 +52,7 @@ public class NB_activity_error extends NBBaseCommand { * */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var activitydef1 = Map.of("alias", "activity_error", "driver", "diag", "cycles", "0..1500000", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java index 697ebd494..03cb740fc 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java @@ -16,11 +16,10 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.annotations.Service; @@ -30,7 +29,7 @@ import java.util.Map; @Service(value= NBBaseCommand.class,selector="activity_init_error") public class NB_activity_init_error extends NBBaseCommand { - public NB_activity_init_error(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_activity_init_error(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -53,7 +52,7 @@ public class NB_activity_init_error extends NBBaseCommand { * */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var activitydef1 = Map.of( "alias","activity_init_error", "driver","diag", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java index 5aaf7199e..14a9456df 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; @@ -28,7 +27,7 @@ import java.io.Reader; import java.util.Map; public class NB_await_finished extends NBBaseCommand { - public NB_await_finished(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_await_finished(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -50,7 +49,7 @@ public class NB_await_finished extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var activitydef1 = Map.of( "alias", "activity_to_await", "driver", "diag", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java index ac5512d36..73cbf8e54 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; @@ -28,7 +27,7 @@ import java.io.Reader; import java.util.Map; public class NB_basicdiag extends NBBaseCommand { - public NB_basicdiag(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_basicdiag(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -45,7 +44,7 @@ public class NB_basicdiag extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var basic_diag = params.withOverrides( Map.of("alias","basic_diag","driver","diag") ); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java index 5424dc022..2d56fbe0c 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; @@ -28,7 +27,7 @@ import java.io.Reader; import java.util.Map; public class NB_blockingrun extends NBBaseCommand { - public NB_blockingrun(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_blockingrun(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -60,7 +59,7 @@ public class NB_blockingrun extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var activitydef1 = Map.of( "alias","blockactivity1","driver","diag", "cycles","0..10000","threads","1", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java index cd558dad6..c571ab878 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java @@ -16,7 +16,8 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricGauge; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; @@ -24,8 +25,7 @@ import io.nosqlbench.nb.api.components.NBComponent; import io.nosqlbench.nb.api.components.events.ParamChange; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.CycleRateSpec; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import java.io.PrintWriter; @@ -33,7 +33,7 @@ import java.io.Reader; import java.util.Map; public class NB_cocycledelay_bursty extends NBBaseCommand { - public NB_cocycledelay_bursty(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_cocycledelay_bursty(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -89,7 +89,7 @@ public class NB_cocycledelay_bursty extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { int diagrate = 500; var co_cycle_delay_bursty = Map.of( "alias", "co_cycle_delay_bursty", @@ -100,9 +100,9 @@ public class NB_cocycledelay_bursty extends NBBaseCommand { "op", "diagrate: diagrate=" + diagrate // "dryrun", "op" // silent ); - NBComponent context = this; - while (context.getParent()!=null) { - context=context.getParent(); + NBComponent container = this; + while (container.getParent()!=null) { + container=container.getParent(); } controller.waitMillis(500); @@ -110,8 +110,8 @@ public class NB_cocycledelay_bursty extends NBBaseCommand { Activity activity = controller.start(co_cycle_delay_bursty); controller.waitMillis(1000); - NBMetricTimer service_time_counter = context.find().topMetric("activity=co_cycle_delay_bursty,name=cycles_servicetime", NBMetricTimer.class); - NBMetricGauge wait_time_gauge = context.find().topMetric("activity=co_cycle_delay_bursty,name=cycles_waittime",NBMetricGauge.class); + NBMetricTimer service_time_counter = container.find().topMetric("activity=co_cycle_delay_bursty,name=cycles_servicetime", NBMetricTimer.class); + NBMetricGauge wait_time_gauge = container.find().topMetric("activity=co_cycle_delay_bursty,name=cycles_waittime",NBMetricGauge.class); for (int i = 0; i < 5; i++) { controller.waitMillis(1000); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java index 54577ebdd..0902c7337 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java @@ -16,13 +16,12 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricCounter; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricGauge; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import java.io.PrintWriter; @@ -30,7 +29,7 @@ import java.io.Reader; import java.util.Map; public class NB_cocycledelay_bursty_backup extends NBBaseCommand { - public NB_cocycledelay_bursty_backup(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_cocycledelay_bursty_backup(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -86,7 +85,7 @@ public class NB_cocycledelay_bursty_backup extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var co_cycle_delay_bursty = Map.of( "alias", "co_cycle_delay_bursty", "driver", "diag", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java index c9ef0caab..ae0c09fe0 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_cocycledelay_strict extends NBBaseCommand { - public NB_cocycledelay_strict(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_cocycledelay_strict(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -63,7 +62,7 @@ public class NB_cocycledelay_strict extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java index 8012d3a40..78120c1f5 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_cycle_rate extends NBBaseCommand { - public NB_cycle_rate(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_cycle_rate(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -48,7 +47,7 @@ public class NB_cycle_rate extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java index 7e58b5749..d2d14e611 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_cycle_rate_change extends NBBaseCommand { - public NB_cycle_rate_change(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_cycle_rate_change(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -70,7 +69,7 @@ public class NB_cycle_rate_change extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java index b7c054e09..9f26b1aca 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java @@ -16,18 +16,17 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import java.io.PrintWriter; import java.io.Reader; public class NB_extension_csvmetrics extends NBBaseCommand { - public NB_extension_csvmetrics(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_extension_csvmetrics(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -55,7 +54,7 @@ public class NB_extension_csvmetrics extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { // TODO create().csvmetrics.... return null; diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java index d1b6f7249..b65a94e25 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_extension_csvoutput extends NBBaseCommand { - public NB_extension_csvoutput(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_extension_csvoutput(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -38,7 +37,7 @@ public class NB_extension_csvoutput extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java index 613fe16e9..482d53a64 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java @@ -16,11 +16,10 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.engine.extensions.example.ExamplePlugin; @@ -28,7 +27,7 @@ import java.io.PrintWriter; import java.io.Reader; public class NB_extension_example extends NBBaseCommand { - public NB_extension_example(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_extension_example(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -39,7 +38,7 @@ public class NB_extension_example extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { ExamplePlugin examplePlugin = create().requiredExtension("example", ExamplePlugin.class); long sum = examplePlugin.getSum(3, 5); stdout.println("3+5=" + sum); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java index cb3b8327b..11ee12a18 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java @@ -16,18 +16,17 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import java.io.PrintWriter; import java.io.Reader; public class NB_extension_histostatslogger extends NBBaseCommand { - public NB_extension_histostatslogger(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_extension_histostatslogger(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -50,7 +49,7 @@ public class NB_extension_histostatslogger extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java index 69224447b..c7569ed4e 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_extension_shutdown_hook extends NBBaseCommand { - public NB_extension_shutdown_hook(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_extension_shutdown_hook(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -38,7 +37,7 @@ public class NB_extension_shutdown_hook extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java index dadea5dae..b42661026 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_histologger extends NBBaseCommand { - public NB_histologger(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_histologger(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -52,7 +51,7 @@ public class NB_histologger extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java index 19238a539..849886670 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; import java.util.Map; public class NB_linkedinput extends NBBaseCommand { - public NB_linkedinput(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_linkedinput(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -61,7 +60,7 @@ public class NB_linkedinput extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var leader = Map.of( "driver", "diag", "alias", "leader", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java index 3f4940129..b6fa795b4 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java @@ -16,12 +16,11 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.nb.api.optimizers.BobyqaOptimizerInstance; import io.nosqlbench.nb.api.optimizers.MVResult; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; @@ -30,7 +29,7 @@ import java.io.Reader; import java.util.function.ToDoubleFunction; public class NB_optimo_test extends NBBaseCommand { - public NB_optimo_test(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_optimo_test(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -63,7 +62,7 @@ public class NB_optimo_test extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { BobyqaOptimizerInstance bobby = create().bobyqaOptimizer(); bobby.param("pa", 0.0d, 200000.0d); bobby.param("pb", 0.0d, 2000000d); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java index dfb10ab0c..8ab0c5c6e 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java @@ -16,18 +16,17 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import java.io.PrintWriter; import java.io.Reader; public class NB_params_variable extends NBBaseCommand { - public NB_params_variable(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_params_variable(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -54,7 +53,7 @@ public class NB_params_variable extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java index 2fe62cc12..bfda17618 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java @@ -17,10 +17,9 @@ package io.nosqlbench.nbr.examples.injava; import io.nosqlbench.engine.api.activityapi.core.Activity; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; @@ -30,7 +29,7 @@ import java.util.Map; public class NB_readmetrics extends NBBaseCommand { - public NB_readmetrics(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_readmetrics(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -57,7 +56,7 @@ public class NB_readmetrics extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { Activity activity = controller.start(Map.of( "alias", "testactivity", "driver", "diag", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java index 86ef83a4e..f599cbad4 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import java.io.PrintWriter; @@ -27,7 +26,7 @@ import java.io.Reader; public class NB_speedcheck extends NBBaseCommand { - public NB_speedcheck(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_speedcheck(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -63,7 +62,7 @@ public class NB_speedcheck extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java index 710a83c4b..d8bdc3d0b 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; @@ -28,7 +27,7 @@ import java.io.Reader; import java.util.Map; public class NB_start_stop_diag extends NBBaseCommand { - public NB_start_stop_diag(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_start_stop_diag(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -58,7 +57,7 @@ public class NB_start_stop_diag extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var activitydef = Map.of( "alias" , "teststartstopdiag", diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java index 624c4d3a0..7636131c5 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java @@ -16,18 +16,17 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import java.io.PrintWriter; import java.io.Reader; public class NB_threadchange extends NBBaseCommand { - public NB_threadchange(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_threadchange(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -45,7 +44,7 @@ public class NB_threadchange extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { var activity = controller.start("driver=diag;alias=threadchange;cycles=0..60000;threads=1;interval=2000;op='noop';rate=1000"); activity.getActivityDef().setThreads(1); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java index 6dc2abefb..f24556e5c 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java @@ -16,18 +16,17 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import java.io.PrintWriter; import java.io.Reader; public class NB_threadspeeds extends NBBaseCommand { - public NB_threadspeeds(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_threadspeeds(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -85,7 +84,7 @@ public class NB_threadspeeds extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { return null; } } diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java index 934036bd8..d55f66b9b 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java @@ -16,10 +16,9 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; @@ -28,7 +27,7 @@ import java.io.Reader; import java.util.Map; public class NB_undef_param extends NBBaseCommand { - public NB_undef_param(NBBufferedCommandContext parentComponent, String scenarioName) { + public NB_undef_param(NBBufferedContainer parentComponent, String scenarioName) { super(parentComponent, scenarioName); } @@ -50,7 +49,7 @@ public class NB_undef_param extends NBBaseCommand { * } */ @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { stdout.println("paramValues from command line:"); stdout.println(params.toString()); stdout.println("before: paramValues.get(\"three\"):" + params.get("three")); diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java index bc705b7ab..0e69c3a9c 100644 --- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java +++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java @@ -17,11 +17,11 @@ package io.nosqlbench.nbr.examples.injavascript; import io.nosqlbench.engine.cmdstream.BasicScriptBuffer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.nb.api.config.standard.TestComponent; import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandContext; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBContainer; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBCommandResult; import io.nosqlbench.engine.core.lifecycle.scenario.script.NBScriptedCommand; import org.apache.commons.compress.utils.IOUtils; @@ -62,7 +62,7 @@ public class ScriptExampleTests { System.out.println("=".repeat(29) + " Running integration test for example scenario: " + scenarioName); NBComponent root = new TestComponent("exampletest",scriptname); - NBBufferedCommandContext ctx = NBCommandContext.builder().name(scriptname).build(root); + NBBufferedContainer ctx = NBContainer.builder().name(scriptname).build(root); NBScriptedCommand s = NBScriptedCommand.ofScripted(scenarioName,Map.of(),ctx, NBScriptedCommand.Invocation.EXECUTE_SCRIPT); ClassLoader cl = ScriptExampleTests.class.getClassLoader(); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/diag/NB_diag.java b/nbr/src/main/java/io/nosqlbench/scenarios/diag/NB_diag.java index 846a744b7..676a230f6 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/diag/NB_diag.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/diag/NB_diag.java @@ -16,11 +16,10 @@ package io.nosqlbench.scenarios.diag; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; -import io.nosqlbench.nb.api.components.NBComponent; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.annotations.Service; import java.io.PrintWriter; @@ -28,12 +27,12 @@ import java.io.Reader; @Service(value = NBBaseCommand.class, selector = "diag") public class NB_diag extends NBBaseCommand { - public NB_diag(NBBufferedCommandContext parentComponent, String scenarioName, String targetScenario) { + public NB_diag(NBBufferedContainer parentComponent, String scenarioName, String targetScenario) { super(parentComponent, scenarioName, targetScenario); } @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { stdout.println("diagnostic scenario writing params to stdout:"); params.forEach((k, v) -> { stdout.println(k + ":" + v); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/FindmaxSearchParams.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/FindmaxSearchParams.java index 08fdc4a9c..31e1197b2 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/FindmaxSearchParams.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/FindmaxSearchParams.java @@ -16,7 +16,7 @@ package io.nosqlbench.scenarios.simframe.findmax; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; /** * These search parameters are based on the original findmax algorithm, and diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/NB_findmax.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/NB_findmax.java index 3439dd506..2f29e26a4 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/NB_findmax.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/NB_findmax.java @@ -16,11 +16,11 @@ package io.nosqlbench.scenarios.simframe.findmax; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.engine.api.activityapi.core.Activity; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.scenarios.simframe.capture.SimFrameCapture; import io.nosqlbench.scenarios.simframe.findmax.planners.FindmaxPlannerType; @@ -56,12 +56,12 @@ import java.io.Reader; public class NB_findmax extends NBBaseCommand { private final static Logger logger = LogManager.getLogger(NB_findmax.class); - public NB_findmax(NBBufferedCommandContext parentComponent, String scenarioName, String context) { + public NB_findmax(NBBufferedContainer parentComponent, String scenarioName, String context) { super(parentComponent, scenarioName, context); } @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { Activity flywheel = SimFrameUtils.findFlywheelActivity(controller, params.get("activity")); stdout.println("starting analysis on activity '" + flywheel.getAlias() + "'"); SimFrameUtils.awaitActivity(flywheel); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxPlannerType.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxPlannerType.java index 864e0f65f..807898495 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxPlannerType.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxPlannerType.java @@ -16,7 +16,7 @@ package io.nosqlbench.scenarios.simframe.findmax.planners; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.scenarios.simframe.findmax.planners.ratchet.FindmaxRatchet; import io.nosqlbench.scenarios.simframe.planning.SimFramePlanner; diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxRampup.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxRampup.java index b21df92f4..7d43be33b 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxRampup.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/FindmaxRampup.java @@ -19,7 +19,7 @@ package io.nosqlbench.scenarios.simframe.findmax.planners; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.SimRateSpec; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.api.components.events.ParamChange; import io.nosqlbench.scenarios.simframe.capture.JournalView; import io.nosqlbench.scenarios.simframe.findmax.FindMaxFrameParams; diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/FindmaxRatchet.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/FindmaxRatchet.java index d799a5362..7ebc309a6 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/FindmaxRatchet.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/FindmaxRatchet.java @@ -19,7 +19,7 @@ package io.nosqlbench.scenarios.simframe.findmax.planners.ratchet; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.SimRateSpec; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.api.components.events.ParamChange; import io.nosqlbench.scenarios.simframe.capture.JournalView; import io.nosqlbench.scenarios.simframe.planning.SimFrame; @@ -27,9 +27,6 @@ import io.nosqlbench.scenarios.simframe.planning.SimFramePlanner; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.ArrayList; -import java.util.List; - public class FindmaxRatchet extends SimFramePlanner { private final Logger logger = LogManager.getLogger(FindmaxRatchet.class); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/RatchetConfig.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/RatchetConfig.java index d20acd38e..cdbf6c615 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/RatchetConfig.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/findmax/planners/ratchet/RatchetConfig.java @@ -16,7 +16,7 @@ package io.nosqlbench.scenarios.simframe.findmax.planners.ratchet; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; /** * These search parameters are based on the original findmax algorithm, and diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/NB_optimo.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/NB_optimo.java index 558a62467..e04891c32 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/NB_optimo.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/NB_optimo.java @@ -16,19 +16,18 @@ package io.nosqlbench.scenarios.simframe.optimo; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBBufferedCommandContext; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricGauge; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricHistogram; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; -import io.nosqlbench.nb.api.components.NBComponent; import io.nosqlbench.nb.api.components.events.ParamChange; import io.nosqlbench.nb.api.components.events.SetThreads; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.SimRateSpec; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.scenarios.simframe.capture.SimFrameCapture; import io.nosqlbench.scenarios.simframe.capture.SimFrameJournal; import io.nosqlbench.scenarios.simframe.findmax.NB_findmax; @@ -46,9 +45,6 @@ import org.apache.logging.log4j.Logger; import java.io.PrintWriter; import java.io.Reader; import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.locks.LockSupport; /** * If the initial trust radius is not large enough with respect to the stopping trust radius, then the search will stop @@ -69,12 +65,12 @@ import java.util.concurrent.locks.LockSupport; public class NB_optimo extends NBBaseCommand { private final static Logger logger = LogManager.getLogger(NB_findmax.class); - public NB_optimo(NBBufferedCommandContext parentComponent, String phaseName, String targetScenario) { + public NB_optimo(NBBufferedContainer parentComponent, String phaseName, String targetScenario) { super(parentComponent, phaseName, targetScenario); } @Override - public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContextActivitiesController controller) { + public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { // TODO: having "scenario" here as well as in "named scenario" in workload templates is confusing. Make this clearer. Activity flywheel = SimFrameUtils.findFlywheelActivity(controller, params.get("activity")); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoFrameFunction.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoFrameFunction.java index 0738f2a01..df6106950 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoFrameFunction.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoFrameFunction.java @@ -18,7 +18,7 @@ package io.nosqlbench.scenarios.simframe.optimo; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.RunState; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.scenarios.simframe.capture.SimFrameCapture; import io.nosqlbench.scenarios.simframe.capture.SimFrameJournal; import io.nosqlbench.scenarios.simframe.planning.SimFrameFunction; @@ -29,10 +29,10 @@ public class OptimoFrameFunction implements SimFrameFunction { private final SimFrameCapture capture; private final SimFrameJournal journal; private final OptimoSearchSettings settings; - private final ContextActivitiesController controller; + private final ContainerActivitiesController controller; public OptimoFrameFunction( - ContextActivitiesController controller, + ContainerActivitiesController controller, OptimoSearchSettings settings, Activity flywheel, SimFrameCapture capture, diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoSearchSettings.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoSearchSettings.java index 1480126e2..787df48f1 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoSearchSettings.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/OptimoSearchSettings.java @@ -16,7 +16,7 @@ package io.nosqlbench.scenarios.simframe.optimo; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; public record OptimoSearchSettings( long sample_time_ms, diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/SimFrameUtils.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/SimFrameUtils.java index 5aaac8c14..ba93cd721 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/SimFrameUtils.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimo/SimFrameUtils.java @@ -19,7 +19,7 @@ package io.nosqlbench.scenarios.simframe.optimo; import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.ratelimits.simrate.SimRateSpec; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.nb.api.components.events.ParamChange; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; @@ -44,7 +44,7 @@ public class SimFrameUtils { } } - public static Activity findFlywheelActivity(ContextActivitiesController controller, String providedActivityName) { + public static Activity findFlywheelActivity(ContainerActivitiesController controller, String providedActivityName) { Optional optionalActivity = Optional.ofNullable(providedActivityName).flatMap(controller::getActivity); if (providedActivityName!=null && optionalActivity.isEmpty()) { throw new RuntimeException("you specified activity '" + providedActivityName + "' but it was not found."); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/planning/SimFramePlanner.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/planning/SimFramePlanner.java index 048886cf3..0b5907b65 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/planning/SimFramePlanner.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/planning/SimFramePlanner.java @@ -17,8 +17,8 @@ package io.nosqlbench.scenarios.simframe.planning; import io.nosqlbench.engine.api.activityapi.core.Activity; -import io.nosqlbench.engine.core.lifecycle.scenario.context.ContextActivitiesController; -import io.nosqlbench.engine.core.lifecycle.scenario.context.NBCommandParams; +import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; +import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.scenarios.simframe.capture.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -62,7 +62,7 @@ public abstract class SimFramePlanner { public abstract P nextStep(JournalView

journal); public abstract void applyParams(P params, Activity activity); - public P analyze(Activity flywheel, SimFrameCapture capture, PrintWriter stdout, PrintWriter stderr, ContextActivitiesController controller) { + public P analyze(Activity flywheel, SimFrameCapture capture, PrintWriter stdout, PrintWriter stderr, ContainerActivitiesController controller) { var frameParams = initialStep(); while (frameParams != null) { diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 378328821..cd97583c8 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -43,7 +43,7 @@ org.antlr antlr4-maven-plugin - 4.13.0 + 4.13.1 src/main/java/io/nosqlbench/virtdata/lang/grammars diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java index 2d364141b..134b6a142 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java @@ -41,7 +41,7 @@ public class ToBigDecimal implements DoubleFunction { /** * Convert all input values to BigDecimal values with a specific MathContext. - * The value for context can be one of UNLIMITED, + * The value for mathCtx can be one of UNLIMITED, * DECIMAL32, DECIMAL64, DECIMAL128, or any valid configuration supported by * {@link MathContext#MathContext(String)}, such as {@code "precision=32 roundingMode=CEILING"}. * In the latter form, roundingMode can be any valid value for {@link RoundingMode}, like @@ -52,8 +52,8 @@ public class ToBigDecimal implements DoubleFunction { @Example({"ToBigDecimal('DECIMAL128')", "IEEE 754R Decimal128 format, 34 digits, HALF_EVEN"}) @Example({"ToBigDecimal('UNLIMITED')", "unlimited precision, HALF_UP"}) @Example({"ToBigDecimal('precision=17 roundingMode=UNNECESSARY')", "Custom precision with no rounding performed"}) - public ToBigDecimal(String context) { - this.mathContext = MathContextReader.getMathContext(context); + public ToBigDecimal(String mathCtx) { + this.mathContext = MathContextReader.getMathContext(mathCtx); } @Override diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java index 3348e3231..0a6995ea2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java @@ -31,11 +31,11 @@ import java.util.function.Function; @Categories(Category.conversion) public class ToBigDecimal implements Function { - private final MathContext context; + private final MathContext mathCtx; @Example({"Convert strings to BigDecimal according to default precision (unlimited) and rounding (HALF_UP)"}) public ToBigDecimal() { - this.context = MathContext.UNLIMITED; + this.mathCtx = MathContext.UNLIMITED; } /** @@ -46,14 +46,14 @@ public class ToBigDecimal implements Function { * In the latter form, roundingMode can be any valid value for {@link RoundingMode}, like * UP, DOWN, CEILING, FLOOR, HALF_UP, HALF_DOWN, HALF_EVEN, or UNNECESSARY. */ - public ToBigDecimal(String context) { - this.context = - MathContextReader.getMathContext(context); + public ToBigDecimal(String mathCtx) { + this.mathCtx = + MathContextReader.getMathContext(mathCtx); } @Override public BigDecimal apply(String s) { - return new BigDecimal(s, context); + return new BigDecimal(s, mathCtx); } }