From cbc9e5484f4146c1bc1361324a1c2f0d125ed87f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 Dec 2023 17:16:28 -0600 Subject: [PATCH] remove dead code --- .../adapters/api/activityimpl/BaseOpDispenser.java | 1 - .../activityapi/core/ComponentActivityInstrumentation.java | 6 ------ .../nosqlbench/engine/api/activityimpl/motor/CoreMotor.java | 3 --- .../api/activityimpl/uniform/actions/StandardAction.java | 5 ----- 4 files changed, 15 deletions(-) diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java index f514c240d..a171a1bdb 100644 --- a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java +++ b/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java @@ -126,7 +126,6 @@ public abstract class BaseOpDispenser extends NBBaseComponent i Binding variables = new Binding(); Map initBlocks = op.getTemplateMap().takeAsNamedTemplates(VERIFIER_INIT); - List> verifierInitFunctions = new ArrayList<>(); try { initBlocks.forEach((initName, stringTemplate) -> { GroovyCycleFunction initFunction = diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java b/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java index c371f8109..36b26cce9 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java @@ -41,7 +41,6 @@ public class ComponentActivityInstrumentation implements ActivityInstrumentation private NBMetricTimer cyclesServiceTimer; private NBMetricTimer cyclesResponseTimer; private NBMetricCounter pendingOpsCounter; - private NBMetricCounter opTrackerBlockedCounter; private NBMetricTimer bindTimer; private NBMetricTimer executeTimer; private NBMetricTimer resultTimer; @@ -120,11 +119,6 @@ public class ComponentActivityInstrumentation implements ActivityInstrumentation return pendingOpsCounter; } - @Override - public Counter getOrCreateOpTrackerBlockedCounter() { - return opTrackerBlockedCounter; - } - @Override public Timer getOrCreateBindTimer() { return bindTimer; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java b/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java index 94a764651..82d76c614 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java @@ -75,8 +75,6 @@ public class CoreMotor implements ActivityDefObserver, Motor, Stoppable { private int stride = 1; private OpTracker opTracker; - private Counter optrackerBlockCounter; - /** * Create an ActivityMotor. @@ -194,7 +192,6 @@ public class CoreMotor implements ActivityDefObserver, Motor, Stoppable { inputTimer = activity.getInstrumentation().getOrCreateInputTimer(); strideServiceTimer = activity.getInstrumentation().getOrCreateStridesServiceTimer(); stridesResponseTimer = activity.getInstrumentation().getStridesResponseTimerOrNull(); - optrackerBlockCounter = activity.getInstrumentation().getOrCreateOpTrackerBlockedCounter(); strideRateLimiter = activity.getStrideLimiter(); cycleRateLimiter = activity.getCycleLimiter(); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java b/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java index 3e0b2eedc..aad0e8d51 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java @@ -48,9 +48,6 @@ import java.util.concurrent.TimeUnit; */ public class StandardAction, R extends Op> implements SyncAction, ActivityDefObserver { private final static Logger logger = LogManager.getLogger("ACTION"); - - private final A activity; - private final int slot; private final Timer executeTimer; private final Histogram triesHistogram; private final Timer resultSuccessTimer; @@ -62,9 +59,7 @@ public class StandardAction, R extends Op> impl private final Timer verifierTimer; public StandardAction(A activity, int slot) { - this.activity = activity; this.opsequence = activity.getOpSequence(); - this.slot = slot; this.maxTries = activity.getMaxTries(); bindTimer = activity.getInstrumentation().getOrCreateBindTimer(); executeTimer = activity.getInstrumentation().getOrCreateExecuteTimer();