From ced01b132bdeef011e75e9abd1517ad90dfc886d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 19 Dec 2024 14:26:43 -0600 Subject: [PATCH] this commit fully replaces Activity with StandardActivity --- .../mongodb/core/MongodbDriverAdapter.java | 2 +- .../adapters/api/templating/ParsedOp.java | 4 +- .../api/engine/activityimpl/ActivityDef.java | 2 +- .../analyzer/GrafanaRegionAnalyzer.java | 2 +- .../api/activityapi/core/ActionDispenser.java | 2 +- .../api/activityapi/core/ActivitiesAware.java | 4 +- .../engine/api/activityapi/core/Activity.java | 123 ------------------ .../api/activityapi/core/BaseAsyncAction.java | 6 +- .../ComponentActivityInstrumentation.java | 5 +- .../api/activityapi/core/IActivityWiring.java | 2 +- .../api/activityapi/core/MotorDispenser.java | 2 +- .../core/ops/fluent/OpTrackerImpl.java | 4 - .../progress/ActivityMetricProgressMeter.java | 5 +- .../filters/ExperimentalResultFilterType.java | 4 +- .../inputs/cyclelog/CycleLogInput.java | 3 - .../outputs/cyclelog/CycleLogOutput.java | 2 - .../outputs/cyclelog/CycleLogOutputType.java | 1 - .../logger/LoggingMarkerDispenser.java | 6 +- .../api/activityapi/input/InputDispenser.java | 2 +- .../api/activityapi/input/InputType.java | 3 - .../api/activityapi/output/OutputType.java | 1 - .../api/activityimpl/ActivityDispenser.java | 4 +- .../engine/api/activityimpl/CoreServices.java | 11 +- .../action/CoreActionDispenser.java | 2 - .../input/CoreInputDispenser.java | 5 +- .../input/TargetRateInputType.java | 5 +- .../marker/ContiguousOutputChunker.java | 4 +- .../api/activityimpl/motor/CoreMotor.java | 4 +- .../uniform/StandardActionDispenser.java | 3 +- .../uniform/StandardActivity.java | 57 ++++---- .../uniform/StandardActivityType.java | 10 +- .../engine/api/util/ConfigTuples.java | 6 +- .../engine/api/util/SimpleConfig.java | 6 +- .../lifecycle/activity/ActivityExecutor.java | 12 +- .../lifecycle/activity/ActivityLoader.java | 8 +- .../activity/ActivityRuntimeInfo.java | 9 +- .../core/lifecycle/commands/CMD_example.java | 3 - .../lifecycle/commands/CMD_forceStop.java | 3 - .../core/lifecycle/commands/CMD_start.java | 3 - .../core/lifecycle/commands/CMD_stop.java | 4 +- .../ContainerActivitiesController.java | 20 +-- .../engine/core/ActivityExecutorTest.java | 4 +- .../nosqlbench/engine/core/CoreMotorTest.java | 3 - .../injava/NB_cocycledelay_bursty.java | 4 +- .../nbr/examples/injava/NB_readmetrics.java | 4 +- .../nbr/examples/injava/NB_threadchange.java | 4 +- .../scenarios/simframe/SimFrameUtils.java | 10 +- .../simframe/capture/SimFrameValueData.java | 5 +- .../simframe/optimizers/CMD_optimize.java | 4 +- .../simframe/optimizers/CMD_reset.java | 7 +- .../optimizers/findmax/CMD_findmax.java | 4 +- .../findmax/FindmaxFrameFunction.java | 6 +- .../optimizers/optimo/CMD_optimo.java | 6 +- .../optimo/OptimoFrameFunction.java | 6 +- .../planners/findmax/FindmaxPlanner.java | 4 +- .../planners/ratchet/RatchetPlanner.java | 4 +- .../planners/rcurve/RCurvePlanner.java | 4 +- .../simframe/planning/SimFramePlanner.java | 6 +- 58 files changed, 151 insertions(+), 298 deletions(-) delete mode 100644 nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java diff --git a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java index 7f591e77c..1b5c1e9ce 100644 --- a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java +++ b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java @@ -30,7 +30,7 @@ import io.nosqlbench.nb.annotations.Service; import java.util.function.LongFunction; /** - * Special thanks to Justin Chu who authored the original NoSQLBench MongoDB ActivityType. + * Special thanks to Justin Chu who authored the original NoSQLBench MongoDB StandardActivityType. */ @Service(value = DriverAdapter.class, selector = "mongodb") public class MongodbDriverAdapter extends BaseDriverAdapter, MongoSpace> { diff --git a/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java index b45f52dae..1b66c0ec4 100644 --- a/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java +++ b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java @@ -225,7 +225,7 @@ opfield1: value1

-

Enabling Activity Params

+

Enabling StandardActivity Params

If a user wants to allow an activity param as an default for an fields, they must publish the op field name in the configuration model for the activity. Otherwise it is an error to specify the value at @@ -353,7 +353,7 @@ prepared: false document level, down to each block and then down to each statement. -

Activity Params

+

StandardActivity Params

{@code
 ./nb run driver=... workload=... cl=LOCAL_QUORUM
 }
diff --git a/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java index 088cb589a..775971a98 100644 --- a/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java +++ b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java @@ -106,7 +106,7 @@ public class ActivityDef implements NBNamedElement { } /** - * Return tbe Activity Driver Adapter Name + * Return tbe StandardActivity Driver Adapter Name * * @return the driver adapter name */ diff --git a/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java index 53df19426..d966482bb 100644 --- a/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java +++ b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java @@ -76,7 +76,7 @@ public class GrafanaRegionAnalyzer implements Runnable { //details: // params: ActivityDef:(4)/{keycount=5000000000L, hosts=node1, main-cycles=500, threads=1, workload=./keyvalue.yaml, cycles=2, stride=2, tags=block:'schema.*', password=cassandra, rf=3, pooling=16:16:500, driver=cql, rampup-cycles=5000000000, alias=keyvalue_default_schema, valuecount=5000000000L, errors=count, username=cassandra} //labels: - // layer: Activity + // layer: StandardActivity // alias: keyvalue_default_schema // driver: cql // workload: ./keyvalue.yaml diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java index 353880d20..9a09c6cb7 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.api.activityapi.core; /** - * An ActionDispenser is created for each Activity instance within a scenario. + * An ActionDispenser is created for each StandardActivity instance within a scenario. * When a thread is created, the motor and its input and action instances are resolved. * The ActionDispenser is responsible for choosing how the action is resolved, * whether that is a shared thread-safe action or an action per slot. diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java index c9a66459f..280a6ab88 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java @@ -16,6 +16,8 @@ package io.nosqlbench.engine.api.activityapi.core; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; + import java.util.Map; /** @@ -23,5 +25,5 @@ import java.util.Map; * activities that are present in a configuration. Those dispensers will have th */ public interface ActivitiesAware { - void setActivitiesMap(Map activities); + void setActivitiesMap(Map activities); } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java deleted file mode 100644 index 36165f735..000000000 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2022-2023 nosqlbench - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.nosqlbench.engine.api.activityapi.core; - -import com.codahale.metrics.Counting; -import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; -import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; -import io.nosqlbench.nb.api.components.core.NBComponent; -import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; -import io.nosqlbench.engine.api.activityapi.core.progress.ProgressCapable; -import io.nosqlbench.engine.api.activityapi.core.progress.StateCapable; -import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; -import io.nosqlbench.engine.api.activityapi.simrate.RateLimiter; -import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally; -import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; - -import java.io.InputStream; -import java.io.PrintWriter; - -/** - * Provides the components needed to build and run an activity a runtime. - * The easiest way to build a useful Activity is to extend {@link StandardActivity}. - */ -public interface Activity extends Comparable, ActivityDefObserver, ProgressCapable, StateCapable, NBComponent { - - /** - * Register an object which should be closed after this activity is shutdown. - * - * @param closeable An Autocloseable object - */ - void registerAutoCloseable(AutoCloseable closeable); - - ActivityDef getActivityDef(); - - default String getAlias() { - return this.getActivityDef().getAlias(); - } - - default ParameterMap getParams() { - return this.getActivityDef().getParams(); - } - - default void initActivity() { - } - - /** - * Close all autocloseables that have been registered with this Activity. - */ - void closeAutoCloseables(); - - @Override - RunState getRunState(); - - void setRunState(RunState runState); - - long getStartedAtMillis(); - - default void shutdownActivity() { - } - - default String getCycleSummary() { - return this.getActivityDef().getCycleSummary(); - } - - /** - * Get the current cycle rate limiter for this activity. - * The cycle rate limiter is used to throttle the rate at which - * cycles are dispatched across all threads in the activity - * @return the cycle {@link RateLimiter} - */ - RateLimiter getCycleLimiter(); - - - /** - * Get the current stride rate limiter for this activity. - * The stride rate limiter is used to throttle the rate at which - * new strides are dispatched across all threads in an activity. - * @return The stride {@link RateLimiter} - */ - RateLimiter getStrideLimiter(); - - PrintWriter getConsoleOut(); - - InputStream getConsoleIn(); - - void setConsoleOut(PrintWriter writer); - - ErrorMetrics getExceptionMetrics(); - -// /** -// * When a driver needs to identify an error uniquely for the purposes of -// * routing it to the correct error handler, or naming it in logs, or naming -// * metrics, override this method in your activity. -// * @return A function that can reliably and safely map an instance of Throwable to a stable name. -// */ -// default Function getErrorNameMapper() { -// return t -> t.getClass().getSimpleName(); -// } -// - - int getMaxTries(); - default int getHdrDigits() { - return this.getParams().getOptionalInteger("hdr_digits").orElse(4); - } - RunStateTally getRunStateTally(); - ActivityWiring getWiring(); - -} diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java index b3fe09394..ee86e8f6d 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java @@ -17,6 +17,7 @@ package io.nosqlbench.engine.api.activityapi.core; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; import org.apache.logging.log4j.Logger; @@ -25,9 +26,10 @@ import org.apache.logging.log4j.LogManager; /** * * @param An type of state holder for an operation, holding everything unique to that cycle and operation - * @param An type of of an Activity, a state holder for a runtime instance of an Activity + * @param An type of of an Activity, a state holder for a runtime instance of an StandardActivity */ -public abstract class BaseAsyncAction implements AsyncAction, Stoppable, ActivityDefObserver { +public abstract class BaseAsyncAction implements AsyncAction, + Stoppable, ActivityDefObserver { private final static Logger logger = LogManager.getLogger("BaseAsyncAction"); protected final A activity; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java index 3e6cf6679..b9364e155 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java @@ -21,6 +21,7 @@ import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; import io.nosqlbench.nb.api.engine.metrics.instruments.*; @@ -33,7 +34,7 @@ public class ComponentActivityInstrumentation { private static final String SERVICE_TIME = "_servicetime"; private static final String RESPONSE_TIME = "_responsetime"; - private final Activity activity; + private final StandardActivity activity; private final ActivityDef def; private final ParameterMap params; private final int hdrdigits; @@ -55,7 +56,7 @@ public class ComponentActivityInstrumentation { private NBMetricGauge errorRateTotal; private NBMetricGauge errorsTotal; - public ComponentActivityInstrumentation(final Activity activity) { + public ComponentActivityInstrumentation(final StandardActivity activity) { this.activity = activity; def = activity.getActivityDef(); params = this.def.getParams(); diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/IActivityWiring.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/IActivityWiring.java index 004240767..992644ca9 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/IActivityWiring.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/IActivityWiring.java @@ -34,7 +34,7 @@ import java.io.PrintWriter; /** * Provides the components needed to build and run an activity a runtime. - * The easiest way to build a useful Activity is to extend {@link StandardActivity}. + * The easiest way to build a useful StandardActivity is to extend {@link StandardActivity}. */ public interface IActivityWiring extends Comparable, ActivityDefObserver, ProgressCapable, StateCapable, NBComponent { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java index f92e833f6..cce1b5d28 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.core; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; /** - * A MotorDispenser is created for each Activity instance within a scenario. + * A MotorDispenser is created for each StandardActivity instance within a scenario. * When a thread is created, the motor and its input and action instances are resolved. * The MotorDispenser is responsible for choosing how the motor is resolved, * whether that is a shared thread-safe motor or, more conventionally, a separate motor per slot. diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java index fdda125b8..c58bf457e 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java @@ -17,15 +17,11 @@ package io.nosqlbench.engine.api.activityapi.core.ops.fluent; import com.codahale.metrics.Counter; -import com.codahale.metrics.Counting; import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.*; -import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricCounter; -import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java index ed6550ef0..9b404f597 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java @@ -16,18 +16,15 @@ package io.nosqlbench.engine.api.activityapi.core.progress; -import com.codahale.metrics.Counting; -import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; import io.nosqlbench.nb.api.engine.util.Unit; -import io.nosqlbench.engine.api.activityapi.core.Activity; import java.time.Instant; public class ActivityMetricProgressMeter implements ProgressMeterDisplay, CompletedMeter, RemainingMeter, ActiveMeter { - private final Activity activity; + private final StandardActivity activity; private final Instant startInstant; private final NBMetricTimer bindTimer; private final NBMetricTimer cyclesTimer; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java index 6db163319..01b084d28 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.api.util.SimpleConfig; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.nb.annotations.Maturity; import io.nosqlbench.nb.api.spi.SimpleServiceLoader; @@ -28,7 +28,7 @@ public interface ExperimentalResultFilterType { SimpleServiceLoader FINDER = new SimpleServiceLoader<>(ExperimentalResultFilterType.class, Maturity.Any); - default IntPredicateDispenser getFilterDispenser(Activity activity) { + default IntPredicateDispenser getFilterDispenser(StandardActivity activity) { SimpleConfig conf = new SimpleConfig(activity.getWiring(), "resultfilter"); return getFilterDispenser(conf); } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java index 1987ae218..e8bc7be5b 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java @@ -16,9 +16,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog; -import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; -import io.nosqlbench.engine.api.activityimpl.uniform.actions.StandardAction; import io.nosqlbench.nb.api.components.core.NBBaseComponent; import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.labels.NBLabeledElement; @@ -29,7 +27,6 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegmen import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.util.SimpleConfig; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.input.Input; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java index 409cf9405..d166cd264 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java @@ -22,13 +22,11 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleRe import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleSpanResults; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import io.nosqlbench.engine.api.util.SimpleConfig; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog.CanFilterResultValue; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.nb.api.components.core.NBBaseComponent; import io.nosqlbench.nb.api.components.core.NBComponent; -import io.nosqlbench.nb.api.config.standard.TestComponent; import io.nosqlbench.nb.api.labels.NBLabels; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java index 3961c40be..505a8fad6 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java @@ -16,7 +16,6 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.ReorderingConcurrentResultBuffer; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.output.Output; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java index 1cc7d6235..3000edcad 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java @@ -18,7 +18,7 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.logger; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.annotations.Service; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,9 +27,9 @@ import org.apache.logging.log4j.Logger; public class LoggingMarkerDispenser implements OutputDispenser { private final static Logger logger = LogManager.getLogger(LoggingMarkerDispenser.class); - private final Activity activity; + private final StandardActivity activity; - public LoggingMarkerDispenser(Activity activity) { + public LoggingMarkerDispenser(StandardActivity activity) { this.activity = activity; } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java index 159561d4e..d0d3acfdb 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java @@ -17,7 +17,7 @@ package io.nosqlbench.engine.api.activityapi.input; /** - * An InputDispenser is created for each Activity instance within a scenario. + * An InputDispenser is created for each StandardActivity instance within a scenario. * When a thread is created, the motor and its input and action instances are resolved. * The InputDispenser is responsible for choosing how the input is resolved, * whether that is a shared thread-safe input or an input per slot. diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java index 960e25724..0b6c91fdf 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java @@ -16,11 +16,8 @@ package io.nosqlbench.engine.api.activityapi.input; -import io.nosqlbench.engine.api.activityapi.core.Activity; -import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.annotations.Maturity; -import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.spi.SimpleServiceLoader; public interface InputType { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java index 4fb9d1c62..d41194c90 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java @@ -16,7 +16,6 @@ package io.nosqlbench.engine.api.activityapi.output; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import io.nosqlbench.nb.annotations.Maturity; import io.nosqlbench.nb.api.components.core.NBComponent; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java index 65a0234ad..bcb5dba30 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java @@ -16,9 +16,9 @@ package io.nosqlbench.engine.api.activityimpl; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.activityapi.core.Activity; public interface ActivityDispenser { - Activity getActivity(ActivityDef activityDef); + StandardActivity getActivity(ActivityDef activityDef); } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java index c862b45b3..eb96e1b90 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java @@ -19,9 +19,7 @@ package io.nosqlbench.engine.api.activityimpl; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; -import io.nosqlbench.engine.api.activityimpl.uniform.actions.StandardAction; import io.nosqlbench.engine.api.util.SimpleConfig; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultFilterDispenser; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; @@ -29,7 +27,6 @@ import io.nosqlbench.engine.api.activityapi.input.InputType; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; import io.nosqlbench.engine.api.activityapi.output.OutputType; import io.nosqlbench.nb.api.components.core.NBComponent; -import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import java.util.Optional; import java.util.function.Predicate; @@ -38,7 +35,7 @@ public class CoreServices { private static StandardActivity parent; - public static Optional getOutputDispenser( + public static Optional getOutputDispenser( NBComponent parent, ActivityWiring activity) { OutputDispenser outputDispenser = new SimpleConfig(activity, "output").getString("type") .flatMap(OutputType.FINDER::get) @@ -55,7 +52,7 @@ public class CoreServices { return Optional.ofNullable(outputDispenser); } - public static Optional> getOutputFilter(ActivityWiring activity) { + public static Optional> getOutputFilter(ActivityWiring activity) { String paramdata= activity.getParams().getOptionalString("of") .orElse(activity.getParams().getOptionalString("outputfilter").orElse(null)); if (paramdata==null) { @@ -72,7 +69,7 @@ public class CoreServices { // return intPredicateDispenser; // } // - public static InputDispenser getInputDispenser(StandardActivity activity) { + public static InputDispenser getInputDispenser(StandardActivity activity) { String inputTypeName = new SimpleConfig(activity, "input").getString("type").orElse("atomicseq"); InputType inputType = InputType.FINDER.getOrThrow(inputTypeName); InputDispenser dispenser = inputType.getInputDispenser(activity); @@ -83,7 +80,7 @@ public class CoreServices { return dispenser; } - public static Optional> getInputFilter(Activity activity) { + public static Optional> getInputFilter(StandardActivity activity) { String paramdata= activity.getParams().getOptionalString("if") .orElse(activity.getParams().getOptionalString("inputfilter").orElse(null)); if (paramdata==null) { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java index 5d5e9e172..4a9902dc5 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java @@ -15,9 +15,7 @@ */ package io.nosqlbench.engine.api.activityimpl.action; -import io.nosqlbench.engine.api.activityapi.core.Action; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import org.apache.logging.log4j.Logger; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java index 27a2fe8d8..8fd3035ca 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java @@ -19,7 +19,6 @@ package io.nosqlbench.engine.api.activityimpl.input; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.api.util.SimpleConfig; import io.nosqlbench.engine.api.activityapi.core.ActivitiesAware; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.input.InputType; @@ -29,7 +28,7 @@ import java.util.Map; public class CoreInputDispenser implements InputDispenser, ActivitiesAware { private final StandardActivity activity; - private Map activities; + private Map activities; private Input input; public CoreInputDispenser(StandardActivity activity) { @@ -57,7 +56,7 @@ public class CoreInputDispenser implements InputDispenser, ActivitiesAware { } @Override - public void setActivitiesMap(Map activities) { + public void setActivitiesMap(Map activities) { this.activities = activities; } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java index f3967dc1c..d0267dd8a 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java @@ -16,7 +16,6 @@ package io.nosqlbench.engine.api.activityimpl.input; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.input.InputType; @@ -33,10 +32,10 @@ public class TargetRateInputType implements InputType { public static class Dispenser implements InputDispenser { - private final Activity activity; + private final StandardActivity activity; private final AtomicInput input; - public Dispenser(Activity activity) { + public Dispenser(StandardActivity activity) { this.activity = activity; this.input = new AtomicInput(activity, activity.getActivityDef()); } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java index c0ff373fe..b913e12a0 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java @@ -17,10 +17,10 @@ package io.nosqlbench.engine.api.activityimpl.marker; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsIntervalSegment; import io.nosqlbench.engine.api.activityapi.output.Output; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -71,7 +71,7 @@ public class ContiguousOutputChunker implements Output { initExtents(); } - public ContiguousOutputChunker(Activity activity) { + public ContiguousOutputChunker(StandardActivity activity) { if (!(activity.getWiring().getInputDispenserDelegate().getInput(0).isContiguous())) { throw new RuntimeException("This type of output may not be used with non-contiguous inputs yet."); diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java index 5a8184590..0fcdf28d5 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java @@ -55,7 +55,7 @@ public class CoreMotor extends NBBaseComponent implements ActivityDefObserver private static final Logger logger = LogManager.getLogger(CoreMotor.class); private final long slotId; - private final Activity activity; + private final StandardActivity activity; private Timer inputTimer; @@ -69,7 +69,7 @@ public class CoreMotor extends NBBaseComponent implements ActivityDefObserver private Input input; private SyncAction action; - // private final Activity activity; + // private final StandardActivity activity; private Output output; private final MotorState motorState; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java index f3c3974af..7d9e1c0a2 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java @@ -17,13 +17,12 @@ package io.nosqlbench.engine.api.activityimpl.uniform; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityimpl.uniform.actions.StandardAction; public class StandardActionDispenser implements ActionDispenser { private final StandardActivity activity; - public StandardActionDispenser(StandardActivity activity) { + public StandardActionDispenser(StandardActivity activity) { this.activity = activity; } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java index b6ff59ed8..ce9b5bcda 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java @@ -32,7 +32,9 @@ import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.api.activityapi.core.progress.ActivityMetricProgressMeter; +import io.nosqlbench.engine.api.activityapi.core.progress.ProgressCapable; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; +import io.nosqlbench.engine.api.activityapi.core.progress.StateCapable; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler; import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner; @@ -44,8 +46,8 @@ import io.nosqlbench.engine.api.activityimpl.OpLookupService; import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally; import io.nosqlbench.engine.core.lifecycle.scenario.container.InvokableResult; import io.nosqlbench.nb.api.advisor.NBAdvisorOutput; -import io.nosqlbench.nb.api.components.core.NBBaseComponent; import io.nosqlbench.nb.api.components.status.NBStatusComponent; +import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; import io.nosqlbench.nb.api.engine.metrics.instruments.MetricCategory; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricCounter; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricHistogram; @@ -84,7 +86,9 @@ import java.util.function.LongFunction; @param The context type for the activity, AKA the 'space' for a named driver instance and its associated object graph */ -public class StandardActivity extends NBStatusComponent implements Activity, InvokableResult, SyntheticOpTemplateProvider, ActivityDefObserver { +public class StandardActivity + extends NBStatusComponent implements InvokableResult, SyntheticOpTemplateProvider, ActivityDefObserver, StateCapable, + ProgressCapable, Comparable { private static final Logger logger = LogManager.getLogger("ACTIVITY"); private final OpSequence>> sequence; private final ConcurrentHashMap, Space>> adapters = new ConcurrentHashMap<>(); @@ -126,10 +130,6 @@ public class StandardActivity exte this.activityDef = activityDef; this.wiring = wiring; - int hdrdigits = getComponentProp("hdr_digits") - .map(Integer::parseInt).orElse(3); - - this.pendingOpsCounter = create().counter( "pending_ops", MetricCategory.Core, @@ -142,6 +142,7 @@ public class StandardActivity exte /// {@link OpSequence} in conjunction with /// an {@link OpDispenser}. This is named for "binding /// a cycle to an operation". + int hdrdigits = getHdrDigits(); this.bindTimer = create().timer( "bind", hdrdigits, MetricCategory.Core, "Time the step within a cycle which binds generated data to an op template to synthesize an executable operation." @@ -424,6 +425,10 @@ public class StandardActivity exte } + public ParameterMap getParams() { + return activityDef.getParams(); + } + private ParsedOp upconvert( OpTemplate ot, Optional defaultDriverOption, NBConfigModel yamlmodel, @@ -476,7 +481,6 @@ public class StandardActivity exte } - @Override public void initActivity() { initOrUpdateRateLimiters(this.activityDef); setDefaultsFromOpSequence(sequence); @@ -548,7 +552,6 @@ public class StandardActivity exte dedicated state space types. Any space which implements {@link Shutdownable} will be closed when this activity shuts down. */ - @Override public void shutdownActivity() { for (Map.Entry, Space>> entry : adapters.entrySet()) { String adapterName = entry.getKey(); @@ -832,7 +835,6 @@ public class StandardActivity exte return runState; } - @Override public synchronized void setRunState(RunState runState) { this.runState = runState; if (RunState.Running == runState) { @@ -840,12 +842,10 @@ public class StandardActivity exte } } - @Override public long getStartedAtMillis() { return startedAtMillis; } - @Override public ActivityDef getActivityDef() { return activityDef; } @@ -874,7 +874,12 @@ public class StandardActivity exte cycleLimiterSource = ThreadLocalRateLimiters.createOrUpdate(this, cycleLimiterSource, spec); } - @Override + /** + * Get the current cycle rate limiter for this activity. + * The cycle rate limiter is used to throttle the rate at which + * cycles are dispatched across all threads in the activity + * @return the cycle {@link RateLimiter} + */ public RateLimiter getCycleLimiter() { if (cycleLimiterSource!=null) { return cycleLimiterSource.get(); @@ -882,7 +887,12 @@ public class StandardActivity exte return null; } } - @Override + /** + * Get the current stride rate limiter for this activity. + * The stride rate limiter is used to throttle the rate at which + * new strides are dispatched across all threads in an activity. + * @return The stride {@link RateLimiter} + */ public synchronized RateLimiter getStrideLimiter() { if (strideLimiterSource!=null) { return strideLimiterSource.get(); @@ -891,19 +901,17 @@ public class StandardActivity exte } } - @Override public RunStateTally getRunStateTally() { return tally; } - @Override public ActivityWiring getWiring() { return this.wiring; } @Override public Map asResult() { - return Map.of("activity",this.getAlias()); + return Map.of("activity",this.getActivityDef().getAlias()); } /** @@ -913,7 +921,6 @@ public class StandardActivity exte * * @return The number of allowable retries */ - @Override public int getMaxTries() { return this.activityDef.getParams().getOptionalInteger("maxtries").orElse(10); } @@ -927,7 +934,6 @@ public class StandardActivity exte return errorHandler; } - @Override public void closeAutoCloseables() { for (AutoCloseable closeable : closeables) { logger.debug(() -> "CLOSING " + closeable.getClass().getCanonicalName() + ": " + closeable); @@ -941,16 +947,14 @@ public class StandardActivity exte } @Override - public int compareTo(Activity o) { - return getAlias().compareTo(o.getAlias()); + public int compareTo(StandardActivity o) { + return this.getActivityDef().getAlias().compareTo(o.getActivityDef().getAlias()); } - @Override public void registerAutoCloseable(AutoCloseable closeable) { this.closeables.add(closeable); } - @Override public synchronized PrintWriter getConsoleOut() { if (null == console) { this.console = new PrintWriter(System.out, false, StandardCharsets.UTF_8); @@ -958,17 +962,14 @@ public class StandardActivity exte return this.console; } - @Override public synchronized InputStream getConsoleIn() { return System.in; } - @Override public void setConsoleOut(PrintWriter writer) { this.console = writer; } - @Override public synchronized ErrorMetrics getExceptionMetrics() { if (null == this.errorMetrics) { errorMetrics = new ErrorMetrics(this); @@ -977,6 +978,12 @@ public class StandardActivity exte } + public String getAlias() { + return getActivityDef().getAlias(); + } + public int getHdrDigits() { + return getComponentProp("hdr_digits").map(Integer::parseInt).orElse(3); + } } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java index 2682de943..15e1f0c14 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java @@ -18,10 +18,8 @@ package io.nosqlbench.engine.api.activityimpl.uniform; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.engine.api.activityimpl.uniform.actions.StandardAction; import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.ActivitiesAware; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.MotorDispenser; @@ -68,7 +66,7 @@ public class StandardActivityType> { * Create an instance of an activity from the activity type. * * @param activityDef the definition that initializes and controls the activity. - * @return a distinct Activity instance for each call + * @return a distinct StandardActivity instance for each call */ @SuppressWarnings("unchecked") public A getActivity(final ActivityDef activityDef, @@ -96,9 +94,9 @@ public class StandardActivityType> { * @param activities a map of existing activities * @return a distinct activity instance for each call */ - public Activity getAssembledActivity( + public StandardActivity getAssembledActivity( final NBComponent parent, final ActivityDef activityDef, - final Map activities + final Map activities ) { // final A activity = this.getActivity(activityDef, parent); ActivityWiring wiring = new ActivityWiring(activityDef); @@ -141,7 +139,7 @@ public class StandardActivityType> { * Return the InputDispenser instance that will be used by the associated activity to create Input factories * for each thread slot. * - * @param activity the Activity instance which will parameterize this InputDispenser + * @param activity the StandardActivity instance which will parameterize this InputDispenser * @return the InputDispenser for the associated activity */ public InputDispenser getInputDispenser(final StandardActivity activity) { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java index 26117b133..b23062c8f 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.util; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import java.util.*; import java.util.regex.Pattern; @@ -34,13 +34,13 @@ public class ConfigTuples implements Iterable { this.sections = sections; } - public ConfigTuples(Activity activity, String param) { + public ConfigTuples(StandardActivity activity, String param) { this(activity.getParams().getOptionalString(param).orElse("")); } private List
parseParams(String configdata) { try { - List
sections = Arrays.stream(configdata.split("[,]")) + List
sections = Arrays.stream(configdata.split(",")) .filter(Objects::nonNull) .filter(s -> !s.isEmpty()) .map(s -> new Section(s, "[:=]")) diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java index 9aa600711..590483c63 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.util; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; @@ -35,7 +35,7 @@ public class SimpleConfig { this.params = parseParams(configdata); } - public SimpleConfig(Activity activity, String params) { + public SimpleConfig(StandardActivity activity, String params) { this(activity.getActivityDef(),params); } public SimpleConfig(ActivityWiring wiring, String param) { @@ -50,7 +50,7 @@ public class SimpleConfig { private Map parseParams(String configdata) { try { - return Arrays.stream(configdata.split("[,]")) + return Arrays.stream(configdata.split(",")) .filter(Objects::nonNull) .filter(s -> !s.isEmpty()) // .peek(System.out::println) diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java index 8332937f9..3b9281648 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java @@ -17,6 +17,7 @@ package io.nosqlbench.engine.core.lifecycle.activity; import com.codahale.metrics.Gauge; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.IndexedThreadFactory; import io.nosqlbench.nb.api.engine.metrics.instruments.MetricCategory; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricGauge; @@ -68,7 +69,7 @@ public class ActivityExecutor implements NBLabeledElement, ParameterMap.Listener private static final Logger activitylogger = LogManager.getLogger("ACTIVITY"); private final LinkedList> motors = new LinkedList<>(); - private final Activity activity; + private final StandardActivity activity; private final ActivityDef activityDef; private final RunStateTally tally; private final MotorDispenser motorSource; @@ -81,7 +82,7 @@ public class ActivityExecutor implements NBLabeledElement, ParameterMap.Listener private ActivityExecutorShutdownHook shutdownHook = null; private NBMetricGauge threadsGauge; - public ActivityExecutor(Activity activity) { + public ActivityExecutor(StandardActivity activity) { this.activity = activity; this.activityDef = activity.getActivityDef(); this.motorSource = activity.getWiring().getMotorDispenserDelegate(); @@ -145,7 +146,8 @@ public class ActivityExecutor implements NBLabeledElement, ParameterMap.Listener public Exception forceStopActivity(int initialMillisToWait) { - activitylogger.debug("FORCE STOP/before alias=(" + activity.getAlias() + ")"); + activitylogger.debug("FORCE STOP/before alias=(" + activity.getActivityDef().getAlias() + + ")"); activity.setRunState(RunState.Stopped); executorService.shutdownNow(); @@ -378,7 +380,7 @@ public class ActivityExecutor implements NBLabeledElement, ParameterMap.Listener return motors.stream().anyMatch(m -> m.getState().get() == RunState.Running); } - public Activity getActivity() { + public StandardActivity getActivity() { return activity; } @@ -542,7 +544,7 @@ public class ActivityExecutor implements NBLabeledElement, ParameterMap.Listener */ private void startRunningActivityThreads() { - logger.info(() -> "starting activity " + activity.getAlias() + " for cycles " + activity.getCycleSummary()); + logger.info(() -> "starting activity " + activity.getAlias() + " for cycles " + activity.getActivityDef().getCycleSummary()); Annotators.recordAnnotation(Annotation.newBuilder() .element(this) .now() diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java index 20722943b..9c3c8fe5b 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java @@ -16,9 +16,9 @@ package io.nosqlbench.engine.core.lifecycle.activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.components.core.NBComponent; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivityType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,14 +33,14 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ActivityLoader { private static final Logger logger = LogManager.getLogger("ACTIVITIES"); - private final Map activityMap = new ConcurrentHashMap<>(); + private final Map activityMap = new ConcurrentHashMap<>(); public ActivityLoader() { } - public synchronized Activity loadActivity(ActivityDef activityDef, final NBComponent parent) { + public synchronized StandardActivity loadActivity(ActivityDef activityDef, final NBComponent parent) { activityDef= activityDef.deprecate("yaml","workload").deprecate("type","driver"); - final Activity activity = + final StandardActivity activity = new StandardActivityType<>(activityDef, parent).getAssembledActivity(parent, activityDef, this.activityMap);this.activityMap.put(activity.getAlias(),activity); ActivityLoader.logger.debug("Resolved activity for alias '{}'", activityDef.getAlias()); return activity; diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java index 67cfae398..db0eb0566 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java @@ -16,10 +16,10 @@ package io.nosqlbench.engine.core.lifecycle.activity; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.RunState; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressCapable; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.ExecutionResult; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -32,11 +32,12 @@ import java.util.concurrent.TimeoutException; public class ActivityRuntimeInfo implements ProgressCapable { private final static Logger logger = LogManager.getLogger(ActivityRuntimeInfo.class); - private final Activity activity; + private final StandardActivity activity; private final Future future; private final ActivityExecutor executor; - public ActivityRuntimeInfo(Activity activity, Future result, ActivityExecutor executor) { + public ActivityRuntimeInfo(StandardActivity activity, Future result, + ActivityExecutor executor) { this.activity = activity; this.future = result; @@ -72,7 +73,7 @@ public class ActivityRuntimeInfo implements ProgressCapable { return result; } - public Activity getActivity() { + public StandardActivity getActivity() { return this.activity; } diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java index c92e141b7..06fedc206 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java @@ -16,19 +16,16 @@ package io.nosqlbench.engine.core.lifecycle.commands; -import io.nosqlbench.engine.api.activityapi.core.Activity; 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.annotations.Service; -import io.nosqlbench.nb.api.errors.BasicError; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.PrintWriter; import java.io.Reader; -import java.util.Optional; @Service(value = NBBaseCommand.class,selector = "example") public class CMD_example extends NBBaseCommand { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java index 02d76f296..c01f418b0 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java @@ -16,19 +16,16 @@ package io.nosqlbench.engine.core.lifecycle.commands; -import io.nosqlbench.engine.api.activityapi.core.Activity; 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.annotations.Service; -import io.nosqlbench.nb.api.errors.BasicError; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.PrintWriter; import java.io.Reader; -import java.util.Optional; @Service(value = NBBaseCommand.class,selector = "force_stop") public class CMD_forceStop extends NBBaseCommand { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java index 6c919426c..e900b09c3 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java @@ -16,19 +16,16 @@ package io.nosqlbench.engine.core.lifecycle.commands; -import io.nosqlbench.engine.api.activityapi.core.Activity; 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.annotations.Service; -import io.nosqlbench.nb.api.errors.BasicError; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.PrintWriter; import java.io.Reader; -import java.util.Optional; @Service(value = NBBaseCommand.class,selector = "start") public class CMD_start extends NBBaseCommand { diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java index 4c6ae8feb..70f7d2150 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java @@ -16,7 +16,7 @@ package io.nosqlbench.engine.core.lifecycle.commands; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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; @@ -44,7 +44,7 @@ public class CMD_stop extends NBBaseCommand { = params.maybeGet("activity").orElseThrow( () -> new RuntimeException("The stop command requires an 'activity' parameter") ); - Optional activity = controller.getActivity(activityName); + Optional activity = controller.getActivity(activityName); if (activity.isEmpty()) { BasicError error = new BasicError("Activity '" + activityName + "' was not found for stop command."); logger.warn(error); diff --git a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java index b01ae51b7..db19501ff 100644 --- a/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java +++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java @@ -15,12 +15,12 @@ */ package io.nosqlbench.engine.core.lifecycle.scenario.container; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; import io.nosqlbench.nb.api.engine.activityimpl.ParameterMap; import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.components.core.NBBaseComponent; import io.nosqlbench.nb.api.components.core.NBComponentErrorHandler; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; import io.nosqlbench.engine.core.lifecycle.ExecutionResult; import io.nosqlbench.engine.core.lifecycle.IndexedThreadFactory; @@ -65,7 +65,7 @@ public class ContainerActivitiesController extends NBBaseComponent { * * @param activityDef string in alias=value1;driver=value2;... format */ - public Activity start(ActivityDef activityDef) { + public StandardActivity start(ActivityDef activityDef) { ActivityRuntimeInfo ari = doStartActivity(activityDef); return ari.getActivity(); } @@ -73,7 +73,7 @@ public class ContainerActivitiesController extends NBBaseComponent { private ActivityRuntimeInfo doStartActivity(ActivityDef activityDef) { if (!this.activityInfoMap.containsKey(activityDef.getAlias())) { - Activity activity = this.activityLoader.loadActivity(activityDef, this); + StandardActivity activity = this.activityLoader.loadActivity(activityDef, this); activity.initActivity(); ActivityExecutor executor = new ActivityExecutor(activity); Future startedActivity = executorService.submit(executor); @@ -91,9 +91,9 @@ public class ContainerActivitiesController extends NBBaseComponent { * * @param activityDefMap A map containing the activity definition */ - public Activity start(Map activityDefMap) { + public StandardActivity start(Map activityDefMap) { ActivityDef ad = new ActivityDef(new ParameterMap(activityDefMap)); - Activity started = start(ad); + StandardActivity started = start(ad); awaitAllThreadsOnline(started,30000L); return started; } @@ -104,7 +104,7 @@ public class ContainerActivitiesController extends NBBaseComponent { * * @param alias the alias of an activity that is already known to the scenario */ - public Activity start(String alias) { + public StandardActivity start(String alias) { return start(ActivityDef.parseActivityDef(alias)); } @@ -186,12 +186,12 @@ public class ContainerActivitiesController extends NBBaseComponent { return runtimeInfo.awaitAllThreadsOnline(timeoutMs); } - public synchronized void stop(Activity activity) { + public synchronized void stop(StandardActivity activity) { stop(activity.getActivityDef()); } - public boolean awaitAllThreadsOnline(Activity activity, long timeoutMs) { + public boolean awaitAllThreadsOnline(StandardActivity activity, long timeoutMs) { return awaitAllThreadsOnline(activity.getActivityDef(), timeoutMs); } @@ -442,13 +442,13 @@ public class ContainerActivitiesController extends NBBaseComponent { // ActivityMetrics.reportTo(System.out); } - public Optional getSoloActivity() { + public Optional getSoloActivity() { if (this.getActivityExecutorMap().size()==1) { return Optional.of(activityInfoMap.values().iterator().next().getActivity()); } return Optional.empty(); } - public Optional getActivity(String activityName) { + public Optional getActivity(String activityName) { return Optional.ofNullable(this.activityInfoMap.get(activityName)).map(ActivityRuntimeInfo::getActivity); } diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java index 3c0ae00bb..0bd802ed6 100644 --- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java +++ b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java @@ -53,7 +53,7 @@ class ActivityExecutorTest { // ActivityDef activityDef = ActivityDef.parseActivityDef("driver=diag;alias=test-restart;cycles=1000;cyclerate=10;op=initdelay:initdelay=5000;"); // new ActivityTypeLoader().load(activityDef); // -// final Activity activity = new DelayedInitActivity(activityDef); +// final StandardActivity activity = new DelayedInitActivity(activityDef); // InputDispenser inputDispenser = new CoreInputDispenser(activity); // ActionDispenser adisp = new CoreActionDispenser(activity); // OutputDispenser tdisp = CoreServices.getOutputDispenser(activity).orElse(null); @@ -108,7 +108,7 @@ class ActivityExecutorTest { Optional standardActivityType = new ActivityTypeLoader().load( activityDef, TestComponent.INSTANCE); -// Activity activity = new DelayedInitActivity(activityDef); +// StandardActivity activity = new DelayedInitActivity(activityDef); ActivityWiring wiring = new ActivityWiring(activityDef); StandardActivity activity = standardActivityType.get().getActivity( activityDef, TestComponent.INSTANCE, wiring); diff --git a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java index 94f82fe5d..41daa7387 100644 --- a/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java +++ b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java @@ -18,11 +18,8 @@ package io.nosqlbench.engine.core; import io.nosqlbench.engine.api.activityimpl.uniform.ActivityWiring; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; -import io.nosqlbench.engine.api.activityimpl.uniform.actions.StandardAction; import io.nosqlbench.nb.api.config.standard.TestComponent; import io.nosqlbench.nb.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.activityapi.core.Action; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.Motor; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor; diff --git a/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java index 1f31b3a56..9325ebd85 100644 --- a/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java +++ b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java @@ -16,6 +16,7 @@ package io.nosqlbench.nbr.examples.injava; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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; @@ -23,7 +24,6 @@ import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricGauge; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.components.events.ParamChange; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.simrate.CycleRateSpec; import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; @@ -107,7 +107,7 @@ public class NB_cocycledelay_bursty extends NBBaseCommand { controller.waitMillis(500); stdout.println("starting activity co_cycle_delay_bursty"); - Activity activity = controller.start(co_cycle_delay_bursty); + StandardActivity activity = controller.start(co_cycle_delay_bursty); controller.waitMillis(1000); NBMetricTimer service_time_counter = container.find().topMetric("activity=co_cycle_delay_bursty,name=cycles_servicetime", NBMetricTimer.class); diff --git a/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java index 549673829..a5557924d 100644 --- a/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java +++ b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java @@ -16,7 +16,7 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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; @@ -57,7 +57,7 @@ public class NB_readmetrics extends NBBaseCommand { */ @Override public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { - Activity activity = controller.start(Map.of( + StandardActivity activity = controller.start(Map.of( "alias", "testactivity", "driver", "diag", "cycles", "0..1000000000", diff --git a/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java index ae149ec04..595439efd 100644 --- a/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java +++ b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java @@ -16,7 +16,7 @@ package io.nosqlbench.nbr.examples.injava; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBBaseCommand; import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; @@ -47,7 +47,7 @@ public class NB_threadchange extends NBBaseCommand { @Override public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { - Activity activity = controller.start( + StandardActivity activity = controller.start( "driver=diag;alias=threadchange;cycles=0..60000;threads=1;interval=2000;op='noop';rate=1000"); activity.getActivityDef().setThreads(1); stdout.println("threads now " + activity.getActivityDef().getThreads()); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/SimFrameUtils.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/SimFrameUtils.java index 960f9f659..814794a0a 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/SimFrameUtils.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/SimFrameUtils.java @@ -16,9 +16,9 @@ package io.nosqlbench.scenarios.simframe; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.simrate.SimRateSpec; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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; @@ -29,7 +29,7 @@ import java.util.concurrent.locks.LockSupport; public class SimFrameUtils { public static final String SIM_CYCLES = "sim_cycles"; - public static void awaitActivity(Activity flywheel) { + public static void awaitActivity(StandardActivity flywheel) { // await flywheel actually spinning, or timeout with error NBMetricTimer result_success_timer = flywheel.find().timer("name:result_success"); for (int i = 0; i < 1000; i++) { @@ -44,12 +44,12 @@ public class SimFrameUtils { } } - public static Activity findFlywheelActivity(ContainerActivitiesController controller, String providedActivityName) { - Optional optionalActivity = Optional.ofNullable(providedActivityName).flatMap(controller::getActivity); + public static StandardActivity 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."); } - Activity flywheel = optionalActivity.or(controller::getSoloActivity) + StandardActivity flywheel = optionalActivity.or(controller::getSoloActivity) .orElseThrow(() -> new RuntimeException("You didn't provide the name of an activity to attach to, nor was there a solo activity available in this context")); // Start the flywheel at an "idle" speed, even if the user hasn't set it diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/SimFrameValueData.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/SimFrameValueData.java index 814df6deb..45d328a03 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/SimFrameValueData.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/SimFrameValueData.java @@ -16,14 +16,13 @@ package io.nosqlbench.scenarios.simframe.capture; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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.scenarios.simframe.capture.SimFrameCapture; public class SimFrameValueData extends SimFrameCapture { - public SimFrameValueData(Activity activity) { + public SimFrameValueData(StandardActivity activity) { NBMetricTimer result_timer = activity.find().timer("name:result"); NBMetricTimer result_success_timer = activity.find().timer("name:result_success"); NBMetricGauge cyclerate_gauge = activity.find().gauge("name=config_cyclerate"); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_optimize.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_optimize.java index a4e4087fa..e88c6ab15 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_optimize.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_optimize.java @@ -16,9 +16,9 @@ package io.nosqlbench.scenarios.simframe.optimizers; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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.container.ContainerActivitiesController; import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.annotations.Service; @@ -63,7 +63,7 @@ public class CMD_optimize extends NBBaseCommand { @Override public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { - Activity flywheel = SimFrameUtils.findFlywheelActivity(controller, params.get("activity")); + StandardActivity flywheel = SimFrameUtils.findFlywheelActivity(controller, params.get("activity")); stdout.println("starting analysis on activity '" + flywheel.getAlias() + "'"); SimFrameUtils.awaitActivity(flywheel); SimFrameCapture capture = new SimFrameValueData(flywheel); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java index c2196d90d..9165260ff 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/CMD_reset.java @@ -17,9 +17,9 @@ package io.nosqlbench.scenarios.simframe.optimizers; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.simrate.SimRateSpec; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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; @@ -60,11 +60,12 @@ public class CMD_reset extends NBBaseCommand { */ @Override public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { - Optional optionalActivity = Optional.ofNullable(params.get("activity")).flatMap(controller::getActivity); + Optional optionalActivity = + Optional.ofNullable(params.get("activity")).flatMap(controller::getActivity); if (params.get("activity")!=null && optionalActivity.isEmpty()) { throw new RuntimeException("you specified activity '" + params.get("activity") + "' but it was not found."); } - try (Activity flywheel = optionalActivity.or(controller::getSoloActivity) + try (StandardActivity flywheel = optionalActivity.or(controller::getSoloActivity) .orElseThrow(() -> new RuntimeException("You didn't provide the name of an activity to attach to, nor was there a solo activity available in this context"))) { params.forEach((key, value) -> { diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/CMD_findmax.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/CMD_findmax.java index de16bb986..8b614c630 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/CMD_findmax.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/CMD_findmax.java @@ -16,9 +16,9 @@ package io.nosqlbench.scenarios.simframe.optimizers.findmax; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.simrate.SimRateSpec; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.engine.core.lifecycle.scenario.container.InvokableResult; import io.nosqlbench.engine.core.lifecycle.scenario.container.NBBufferedContainer; @@ -48,7 +48,7 @@ public class CMD_findmax extends NBBaseCommand { @Override public Object invoke(NBCommandParams params, PrintWriter stdout, PrintWriter stderr, Reader stdin, ContainerActivitiesController controller) { - Activity flywheel = SimFrameUtils.findFlywheelActivity(controller, params.get("activity")); + StandardActivity 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/optimizers/findmax/FindmaxFrameFunction.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java index 3a64fd2cd..e7da581cf 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/findmax/FindmaxFrameFunction.java @@ -16,8 +16,8 @@ package io.nosqlbench.scenarios.simframe.optimizers.findmax; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.RunState; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.scenarios.simframe.capture.SimFrameCapture; import io.nosqlbench.scenarios.simframe.capture.SimFrameJournal; @@ -25,7 +25,7 @@ import io.nosqlbench.scenarios.simframe.planning.SimFrameFunction; public class FindmaxFrameFunction implements SimFrameFunction { - private final Activity flywheel; + private final StandardActivity flywheel; private final SimFrameCapture capture; private final SimFrameJournal journal; private final FindmaxConfig settings; @@ -35,7 +35,7 @@ public class FindmaxFrameFunction implements SimFrameFunction journal, FindmaxParamModel model diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/CMD_optimo.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/CMD_optimo.java index 6dbad1895..22c3a9620 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/CMD_optimo.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/CMD_optimo.java @@ -16,6 +16,7 @@ package io.nosqlbench.scenarios.simframe.optimizers.optimo; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; 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; @@ -23,7 +24,6 @@ import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricHistogram; import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricTimer; 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.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.simrate.SimRateSpec; import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; @@ -74,7 +74,7 @@ public class CMD_optimo extends NBBaseCommand { 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")); + StandardActivity flywheel = SimFrameUtils.findFlywheelActivity(controller, params.get("activity")); stdout.println("starting analysis on activity '" + flywheel.getAlias() + "'"); SimFrameUtils.awaitActivity(flywheel); @@ -125,7 +125,7 @@ public class CMD_optimo extends NBBaseCommand { // could be a better result if the range is arbitrarily limiting the parameter space. } - private SimFrameCapture perfValueMeasures(Activity activity, OptimoSearchSettings settings) { + private SimFrameCapture perfValueMeasures(StandardActivity activity, OptimoSearchSettings settings) { SimFrameCapture sampler = new SimFrameCapture(); NBMetricTimer result_timer = activity.find().timer("name:result"); diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/OptimoFrameFunction.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/OptimoFrameFunction.java index 1b3e68f95..4e8435f35 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/OptimoFrameFunction.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/optimo/OptimoFrameFunction.java @@ -16,8 +16,8 @@ package io.nosqlbench.scenarios.simframe.optimizers.optimo; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.RunState; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.scenario.container.ContainerActivitiesController; import io.nosqlbench.scenarios.simframe.capture.SimFrameCapture; import io.nosqlbench.scenarios.simframe.capture.SimFrameJournal; @@ -25,7 +25,7 @@ import io.nosqlbench.scenarios.simframe.planning.SimFrameFunction; public class OptimoFrameFunction implements SimFrameFunction { - private final Activity flywheel; + private final StandardActivity flywheel; private final SimFrameCapture capture; private final SimFrameJournal journal; private final OptimoSearchSettings settings; @@ -34,7 +34,7 @@ public class OptimoFrameFunction implements SimFrameFunction public OptimoFrameFunction( ContainerActivitiesController controller, OptimoSearchSettings settings, - Activity flywheel, + StandardActivity flywheel, SimFrameCapture capture, SimFrameJournal journal ) { diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/planners/findmax/FindmaxPlanner.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/planners/findmax/FindmaxPlanner.java index 0099ac754..d688d4371 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/planners/findmax/FindmaxPlanner.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/optimizers/planners/findmax/FindmaxPlanner.java @@ -16,9 +16,9 @@ package io.nosqlbench.scenarios.simframe.optimizers.planners.findmax; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.simrate.CycleRateSpec; import io.nosqlbench.engine.api.activityapi.simrate.SimRateSpec; +import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; import io.nosqlbench.engine.core.lifecycle.scenario.container.NBCommandParams; import io.nosqlbench.nb.api.components.core.NBBaseComponent; import io.nosqlbench.nb.api.components.events.ParamChange; @@ -102,7 +102,7 @@ public class FindmaxPlanner extends SimFramePlanner extends NBBaseComponen */ 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, ContainerActivitiesController controller) { + public abstract void applyParams(P params, StandardActivity activity); + public P analyze(StandardActivity flywheel, SimFrameCapture capture, PrintWriter stdout, PrintWriter stderr, ContainerActivitiesController controller) { var frameParams = initialStep(); while (frameParams != null) {