From bbc5844671313eccbcfe331f51c61080ecd26919 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 25 Jul 2023 11:50:39 -0500 Subject: [PATCH] package refactoring --- .../engine/api/activityapi/core/Activity.java | 10 ++--- .../core/ActivityInstrumentation.java | 8 ++-- .../api/activityapi/core/ActivityType.java | 8 ++-- .../engine/api/activityapi/core/Motor.java | 2 +- .../core/ops/fluent/OpTrackerImpl.java | 4 +- .../buffers/CycleResultSegmentsReadable.java | 4 +- .../CycleResultsRLEBufferReadable.java | 4 +- .../CycleResultsRLEBufferTarget.java | 4 +- .../buffers/results_rle/CycleSpanResults.java | 6 +-- .../filters/ExperimentalResultFilterType.java | 4 +- .../inputs/cyclelog/CycleLogInput.java | 10 ++--- .../cyclelog/CycleLogDumperUtility.java | 4 +- .../outputs/cyclelog/CycleLogOutput.java | 8 ++-- .../logger/LoggingMarkerDispenser.java | 1 - .../modular/handlers/CounterErrorHandler.java | 4 +- .../handlers/HistogramErrorHandler.java | 4 +- .../engine/api/activityapi/output/Output.java | 4 +- .../api/activityapi/planning/OpSource.java | 4 +- .../ratelimits/HybridRateLimiter.java | 5 --- .../ratelimits/InlineTokenPool.java | 4 +- .../engine/api/activityimpl/CoreServices.java | 6 +-- .../activityimpl/ProgressAndStateMeter.java | 4 +- .../api/activityimpl/SimpleActivity.java | 42 +++++++++---------- .../api/activityimpl/input/AtomicInput.java | 6 +-- .../input/CoreInputDispenser.java | 4 +- .../marker/ByteTrackerExtent.java | 6 +-- .../marker/ContiguousOutputChunker.java | 4 +- .../activityimpl/marker/OldCoreTracker.java | 3 +- .../api/activityimpl/motor/CoreMotor.java | 6 +-- .../motor/CoreMotorDispenser.java | 4 +- .../api/activityimpl/motor/StrideTracker.java | 4 +- .../uniform/StandardActivity.java | 17 ++++---- .../uniform/StandardActivityType.java | 7 ++-- .../uniform/actions/StandardAction.java | 19 +++++---- .../api/scenarios/NBCLIScenarioParser.java | 10 ++--- .../CycleResultsArraySegmentReadableTest.java | 6 +-- .../CycleResultsRLEBufferReadableTest.java | 4 +- .../CycleResultsRLEBufferTargetTest.java | 4 +- .../tristate/CoreResultFilterTest.java | 6 +-- .../tristate/ResultFilteringSieveTest.java | 6 +-- .../modular/NBErrorHandlerTest.java | 3 +- .../RateLimiterPerfTestMethods.java | 8 ++-- .../ratelimits/TestHybridRateLimiterPerf.java | 3 +- .../ratelimits/TestRateLimiterPerf1E7.java | 3 +- .../ratelimits/TestRateLimiterPerf1E8.java | 3 +- .../ratelimits/TestRateLimiterPerfSingle.java | 3 +- .../marker/ByteTrackerExtentTest.java | 4 +- .../activityimpl/marker/CoreOutputTest.java | 7 ++-- .../engine/api/clireader/CLITest.java | 4 +- .../api/templating/CommandTemplateTest.java | 15 ++++--- 50 files changed, 155 insertions(+), 168 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java index 44c8c8f78..212317696 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java @@ -17,18 +17,18 @@ package io.nosqlbench.engine.api.activityapi.core; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.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.cyclelog.filters.IntPredicateDispenser; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; -import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally; +import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.api.engine.activityimpl.ActivityDef; +import io.nosqlbench.api.engine.activityimpl.ParameterMap; +import io.nosqlbench.engine.api.activityapi.input.InputDispenser; +import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter; import java.io.InputStream; import java.io.PrintWriter; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java index f0d4e8bda..11682c3c0 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -19,6 +19,8 @@ package io.nosqlbench.engine.api.activityapi.core; import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; +import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import java.util.concurrent.Future; @@ -80,8 +82,8 @@ public interface ActivityInstrumentation { /** * The bind timer keeps track of how long it takes for NoSQLBench to create an instance * of an executable operation, given the cycle. This is usually done by using an - * {@link io.nosqlbench.engine.api.activityapi.planning.OpSequence} in conjunction with - * an {@link io.nosqlbench.engine.api.activityimpl.OpDispenser}. This is named for "binding + * {@link OpSequence} in conjunction with + * an {@link OpDispenser}. This is named for "binding * a cycle to an operation". * @return a new or existing {@link Timer} */ diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java index caf022eb0..60b18b473 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java @@ -16,14 +16,14 @@ package io.nosqlbench.engine.api.activityapi.core; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; -import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.CoreServices; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.activityimpl.action.CoreActionDispenser; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser; +import io.nosqlbench.api.config.NBLabeledElement; +import io.nosqlbench.engine.api.activityapi.input.InputDispenser; +import io.nosqlbench.api.engine.activityimpl.ActivityDef; import java.util.Map; import java.util.Optional; @@ -120,7 +120,7 @@ public interface ActivityType { final InputDispenser inputDispenser, final ActionDispenser actionDispenser, final OutputDispenser outputDispenser) { - return new CoreMotorDispenser (activity, inputDispenser, actionDispenser, outputDispenser); + return new CoreMotorDispenser(activity, inputDispenser, actionDispenser, outputDispenser); } /** diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java index 995e58e6b..107fcb1f8 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.core; -import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityimpl.MotorState; +import io.nosqlbench.engine.api.activityapi.input.Input; /** * The core threading harness within an activity. diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java index eed80d722..a704c9742 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -18,10 +18,10 @@ package io.nosqlbench.engine.api.activityapi.core.ops.fluent; import com.codahale.metrics.Counter; import com.codahale.metrics.Timer; +import io.nosqlbench.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.api.engine.activityimpl.ActivityDef; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java index 06d006091..c20aca8a5 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import java.util.Iterator; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java index 517dfb0f0..5e729d879 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,9 +16,9 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.CycleResultSegmentsReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import java.nio.ByteBuffer; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java index 5fd6751cb..f7d5762f3 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; +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 org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java index f859b3624..07fbfdf68 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,10 +16,10 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; /** diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java index 6cbe65d67..d35a5f019 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.filters; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.util.SimpleConfig; +import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.nb.annotations.Maturity; import io.nosqlbench.api.spi.SimpleServiceLoader; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java index f0250a54f..af7ad192d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,15 +16,15 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.inputs.cyclelog; -import io.nosqlbench.engine.api.activityapi.core.Activity; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegmentBuffer; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; 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.activityapi.input.Input; 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; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java index 3dc2cff2e..4db29224a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,9 +16,9 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import java.io.File; import java.io.RandomAccessFile; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java index 876298592..6b7359d84 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,15 +16,15 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog; -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.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleSpanResults; +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.engine.api.util.SimpleConfig; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java index 45bf1f4fb..1cc7d6235 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java @@ -16,7 +16,6 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.outputs.logger; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; import io.nosqlbench.engine.api.activityapi.core.Activity; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java index 034583c93..54a05b2fa 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -18,8 +18,8 @@ package io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorDetail; -import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorHandler; import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics; +import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorHandler; import io.nosqlbench.nb.annotations.Service; import java.util.function.Supplier; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java index 83b829d8f..62c9f2f1a 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -18,8 +18,8 @@ package io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorDetail; -import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorHandler; import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics; +import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorHandler; import io.nosqlbench.nb.annotations.Service; import java.util.function.Supplier; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java index 88013d17c..4045d4ac3 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.output; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; /** * A cycle output is simply a type that knows how to do something diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java index 1fe759316..625e7e9a8 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityapi.planning; -import io.nosqlbench.engine.api.activityimpl.OpDispenser; -import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op; +import io.nosqlbench.adapters.api.activityimpl.OpDispenser; +import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op; import java.util.function.LongFunction; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java index f764e8867..791a4f6ae 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java @@ -18,12 +18,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import com.codahale.metrics.Gauge; import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.config.NBNamedElement; -import io.nosqlbench.engine.api.activityapi.core.Startable; import io.nosqlbench.api.engine.metrics.ActivityMetrics; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters.BurstRateGauge; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters.RateGauge; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters.WaitTimeGauge; import io.nosqlbench.nb.annotations.Service; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java index ed7aa27ae..089e7f121 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/InlineTokenPool.java @@ -17,6 +17,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import com.codahale.metrics.Timer; +import io.nosqlbench.engine.api.util.Colors; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; @@ -25,7 +26,6 @@ import org.apache.logging.log4j.Logger; import java.io.RandomAccessFile; import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; import java.nio.channels.FileChannel.MapMode; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; @@ -33,8 +33,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.LockSupport; import java.util.concurrent.locks.ReentrantLock; -import static io.nosqlbench.engine.api.util.Colors.*; - /** *

Synopsis

* diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java index 2d335f2f0..a6c8f218d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,15 +16,15 @@ package io.nosqlbench.engine.api.activityimpl; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; +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; 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.engine.api.util.SimpleConfig; import java.util.Optional; import java.util.function.Predicate; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java index 2020afd40..6c5c56131 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -17,8 +17,8 @@ package io.nosqlbench.engine.api.activityimpl; import io.nosqlbench.engine.api.activityapi.core.progress.InputProgressMeter; -import io.nosqlbench.engine.api.activityapi.core.RunState; import io.nosqlbench.engine.api.activityapi.core.progress.StateCapable; +import io.nosqlbench.engine.api.activityapi.core.RunState; public class ProgressAndStateMeter implements InputProgressMeter, StateCapable { private final InputProgressMeter meter; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java index decfa1782..3c875cab0 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java @@ -17,40 +17,40 @@ package io.nosqlbench.engine.api.activityimpl; import com.codahale.metrics.Timer; +import io.nosqlbench.engine.api.activityapi.core.*; +import io.nosqlbench.engine.api.activityapi.core.progress.ActivityMetricProgressMeter; +import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; +import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; +import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler; +import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import io.nosqlbench.engine.api.activityapi.planning.SequencerType; +import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters; +import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec; +import io.nosqlbench.adapters.api.activityimpl.OpDispenser; +import io.nosqlbench.adapters.api.activityimpl.OpMapper; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.config.NBLabels; -import io.nosqlbench.api.config.params.ParamsParser; import io.nosqlbench.api.config.standard.NBConfiguration; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.metrics.ActivityMetrics; import io.nosqlbench.api.errors.BasicError; import io.nosqlbench.api.errors.OpConfigError; -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.cyclelog.filters.IntPredicateDispenser; -import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; -import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; -import io.nosqlbench.engine.api.activityapi.planning.OpSequence; import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner; -import io.nosqlbench.engine.api.activityapi.planning.SequencerType; import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec; -import io.nosqlbench.engine.api.activityconfig.OpsLoader; -import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; -import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplateFormat; -import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList; +import io.nosqlbench.adapters.api.activityconfig.OpsLoader; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplateFormat; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally; -import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.engine.api.activityimpl.uniform.DryRunOpDispenserWrapper; -import io.nosqlbench.engine.api.activityimpl.uniform.decorators.SyntheticOpTemplateProvider; -import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op; -import io.nosqlbench.engine.api.templating.CommandTemplate; -import io.nosqlbench.engine.api.templating.ParsedOp; +import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; +import io.nosqlbench.adapters.api.activityimpl.uniform.DryRunOpDispenserWrapper; +import io.nosqlbench.adapters.api.activityimpl.uniform.decorators.SyntheticOpTemplateProvider; +import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op; +import io.nosqlbench.adapters.api.templating.CommandTemplate; +import io.nosqlbench.adapters.api.templating.ParsedOp; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java index 7eebea523..afcdd2c89 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -15,11 +15,11 @@ */ package io.nosqlbench.engine.api.activityimpl.input; +import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; import io.nosqlbench.engine.api.activityapi.core.progress.CycleMeter; import io.nosqlbench.engine.api.activityapi.core.progress.ProgressCapable; -import io.nosqlbench.engine.api.activityapi.core.progress.ProgressMeterDisplay; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.engine.util.Unit; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java index 80f0b0b5f..50884907b 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,12 +16,12 @@ package io.nosqlbench.engine.api.activityimpl.input; +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; -import io.nosqlbench.engine.api.util.SimpleConfig; import java.util.Map; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java index 304210d53..01643500f 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,9 +16,9 @@ package io.nosqlbench.engine.api.activityimpl.marker; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.CycleResultSegmentsReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsIntervalSegment; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import java.util.Arrays; @@ -206,7 +206,7 @@ public class ByteTrackerExtent implements CycleResultSegmentsReadable { } ByteTrackerExtent newLastExtent = new ByteTrackerExtent( - lastExtent.getMin() + size, lastExtent.getMin() + (size * 2) + lastExtent.getMin() + size, lastExtent.getMin() + (size * 2L) ); if (!lastExtent.getNextExtent().compareAndSet(null, newLastExtent)) { diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java index 77c96cb02..3d91e89fa 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,10 +16,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.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.output.Output; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java index 186368930..7fea6402d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -18,7 +18,6 @@ package io.nosqlbench.engine.api.activityimpl.marker; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.CycleResultSegmentsReadable; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import java.util.Iterator; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java index 343e89b6a..e4595fac7 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java @@ -18,18 +18,18 @@ package io.nosqlbench.engine.api.activityimpl.motor; import com.codahale.metrics.Counter; import com.codahale.metrics.Timer; import io.nosqlbench.engine.api.activityapi.core.*; -import io.nosqlbench.engine.api.activityapi.core.ops.fluent.OpTracker; -import io.nosqlbench.engine.api.activityapi.core.ops.fluent.OpTrackerImpl; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.TrackedOp; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.op_output.StrideOutputConsumer; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleSegment; +import io.nosqlbench.engine.api.activityimpl.MotorState; +import io.nosqlbench.engine.api.activityapi.core.ops.fluent.OpTracker; +import io.nosqlbench.engine.api.activityapi.core.ops.fluent.OpTrackerImpl; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter; import io.nosqlbench.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.activityimpl.MotorState; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java index 8381b6834..d8b7f71ad 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -15,12 +15,12 @@ */ package io.nosqlbench.engine.api.activityimpl.motor; +import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.api.activityapi.input.Input; import io.nosqlbench.engine.api.activityapi.input.InputDispenser; import io.nosqlbench.engine.api.activityapi.output.Output; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; -import io.nosqlbench.api.engine.activityimpl.ActivityDef; import java.util.function.IntPredicate; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java index 7cef12796..a83155d70 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -23,8 +23,8 @@ import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.op_output.StrideOut import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.output.Output; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.Iterator; import java.util.List; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java index 7b7f120e6..a22792530 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java @@ -16,6 +16,7 @@ package io.nosqlbench.engine.api.activityimpl.uniform; +import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.config.NBLabels; import io.nosqlbench.api.config.standard.*; @@ -23,15 +24,15 @@ import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.api.errors.BasicError; import io.nosqlbench.api.errors.OpConfigError; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; -import io.nosqlbench.engine.api.activityconfig.OpsLoader; -import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; -import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList; -import io.nosqlbench.engine.api.activityimpl.OpDispenser; -import io.nosqlbench.engine.api.activityimpl.OpMapper; +import io.nosqlbench.adapters.api.activityconfig.OpsLoader; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; +import io.nosqlbench.adapters.api.activityimpl.OpDispenser; +import io.nosqlbench.adapters.api.activityimpl.OpMapper; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; -import io.nosqlbench.engine.api.activityimpl.uniform.decorators.SyntheticOpTemplateProvider; -import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op; -import io.nosqlbench.engine.api.templating.ParsedOp; +import io.nosqlbench.adapters.api.activityimpl.uniform.decorators.SyntheticOpTemplateProvider; +import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.Op; +import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.nb.annotations.ServiceSelector; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java index 343fdf57a..95eb3428f 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java @@ -16,6 +16,7 @@ package io.nosqlbench.engine.api.activityimpl.uniform; +import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.config.standard.NBConfigModel; import io.nosqlbench.api.config.standard.NBConfiguration; @@ -23,8 +24,8 @@ import io.nosqlbench.api.config.standard.NBReconfigurable; import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; -import io.nosqlbench.engine.api.activityconfig.OpsLoader; -import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList; +import io.nosqlbench.adapters.api.activityconfig.OpsLoader; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +38,7 @@ import java.util.Optional; public class StandardActivityType> extends SimpleActivity implements ActivityType { private static final Logger logger = LogManager.getLogger("ACTIVITY"); - private final Map adapters = new HashMap<>(); + private final Map adapters = new HashMap<>(); public StandardActivityType(final DriverAdapter adapter, final ActivityDef activityDef, final NBLabeledElement parentLabels) { super(activityDef diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java index b283e9d80..8c374ee6b 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java @@ -18,32 +18,33 @@ package io.nosqlbench.engine.api.activityimpl.uniform.actions; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; -import io.nosqlbench.api.errors.ExpectedResultVerificationError; +import io.nosqlbench.adapters.api.activityimpl.OpDispenser; +import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.*; +import io.nosqlbench.adapters.api.evalcontext.CycleFunction; +import io.nosqlbench.api.engine.activityimpl.ActivityDef; +import io.nosqlbench.api.errors.ResultVerificationError; import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; import io.nosqlbench.engine.api.activityapi.core.SyncAction; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.ErrorDetail; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; -import io.nosqlbench.api.engine.activityimpl.ActivityDef; -import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityimpl.uniform.StandardActivity; -import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.mvel2.MVEL; -import java.io.Serializable; import java.util.concurrent.TimeUnit; /** * This is the generified version of an Action. All driver adapters us this, as opposed * to previous NB versions where it was implemented for each driver. - * + *

* This allows the API to be consolidated so that the internal machinery of NB * works in a very consistent and uniform way for all users and drivers. * - * @param The type of activity - * @param The type of operation + * @param + * The type of activity + * @param + * The type of operation */ public class StandardAction, R extends Op> implements SyncAction, ActivityDefObserver { private final static Logger logger = LogManager.getLogger("ACTION"); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java index 8c0532479..8007a1e25 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java @@ -16,11 +16,11 @@ package io.nosqlbench.engine.api.scenarios; -import io.nosqlbench.engine.api.activityconfig.OpsLoader; -import io.nosqlbench.engine.api.activityconfig.rawyaml.RawOpsLoader; -import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList; -import io.nosqlbench.engine.api.activityconfig.yaml.Scenarios; -import io.nosqlbench.engine.api.templating.StrInterpolator; +import io.nosqlbench.adapters.api.activityconfig.OpsLoader; +import io.nosqlbench.adapters.api.activityconfig.rawyaml.RawOpsLoader; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; +import io.nosqlbench.adapters.api.activityconfig.yaml.Scenarios; +import io.nosqlbench.adapters.api.templating.StrInterpolator; import io.nosqlbench.api.content.Content; import io.nosqlbench.api.content.NBIO; import io.nosqlbench.api.content.NBPathsAPI; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java index 02c646f8f..24ddaac7f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,9 +16,9 @@ package io.nosqlbench.engine.api.activityapi.cyclelog; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import org.junit.jupiter.api.Test; import java.util.stream.StreamSupport; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java index 10b09f048..2da163cb7 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,10 +16,10 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java index 0a2296107..ff4875afa 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,9 +16,9 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.buffers; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results_rle.CycleResultsRLEBufferTarget; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java index 2ec2acd41..091261b5f 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,11 +16,11 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.tristate; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; +import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.CoreResultValueFilter; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultFilterDispenser; -import io.nosqlbench.engine.api.activityapi.cyclelog.filters.ResultValueFilterType; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; import org.junit.jupiter.api.Test; import java.util.function.Predicate; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java index d00debcbd..764e08570 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,11 +16,11 @@ package io.nosqlbench.engine.api.activityapi.cyclelog.tristate; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.ResultReadable; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.ResultFilteringSieve; import io.nosqlbench.engine.api.activityapi.cyclelog.filters.tristate.TristateFilter; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.MutableCycleResult; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java index ad30522de..639579579 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java @@ -20,8 +20,7 @@ import com.codahale.metrics.Counter; import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; -import io.nosqlbench.api.config.NBLabeledElement; -import io.nosqlbench.api.errors.ExpectedResultVerificationError; +import io.nosqlbench.api.errors.ResultMismatchError; import io.nosqlbench.engine.api.activityapi.errorhandling.ErrorMetrics; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.CountErrorHandler; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.handlers.CounterErrorHandler; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java index 4dd1d7bb1..4843fc455 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/RateLimiterPerfTestMethods.java @@ -16,6 +16,7 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; +import io.nosqlbench.engine.api.util.Colors; import io.nosqlbench.api.config.NBLabels; import io.nosqlbench.api.engine.metrics.DeltaHdrHistogramReservoir; import io.nosqlbench.api.testutils.Bounds; @@ -30,9 +31,6 @@ import java.util.concurrent.*; import java.util.function.Function; import java.util.stream.Collectors; -import static io.nosqlbench.engine.api.util.Colors.ANSI_Blue; -import static io.nosqlbench.engine.api.util.Colors.ANSI_Reset; - public class RateLimiterPerfTestMethods { // public Perf testFindOverheads(RateLimiter rl) { @@ -142,12 +140,12 @@ public class RateLimiterPerfTestMethods { System.out.println(rl); - System.out.println(ANSI_Blue + + System.out.println(Colors.ANSI_Blue + String.format( "spec: %s\n count: %9d, duration %.5fS, acquires/s %.3f, nanos/op: %f\n delay: %d (%.5fS)", rl.getRateSpec(), count, duration, acqops, 1_000_000_000.0d / acqops, divDelay, divDelay / 1_000_000_000.0d) + - ANSI_Reset); + Colors.ANSI_Reset); } diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java index cd3e90cab..18692f880 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestHybridRateLimiterPerf.java @@ -19,7 +19,6 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.testutils.Perf; import io.nosqlbench.api.testutils.Result; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec.Verb; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -28,7 +27,7 @@ import java.util.function.Function; public class TestHybridRateLimiterPerf { - private final Function rlFunction = rs -> new HybridRateLimiter(NBLabeledElement.EMPTY,"hybrid", rs.withVerb(Verb.start)); + private final Function rlFunction = rs -> new HybridRateLimiter(NBLabeledElement.EMPTY,"hybrid", rs.withVerb(RateSpec.Verb.start)); private final RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java index a8c617549..1ffc378d3 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E7.java @@ -18,7 +18,6 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.testutils.Perf; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec.Verb; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -33,7 +32,7 @@ import java.util.function.Function; */ public class TestRateLimiterPerf1E7 { - private final Function rlFunction = rs -> new HybridRateLimiter(NBLabeledElement.forKV("alias","tokenrl"),"hybrid", rs.withVerb(Verb.configure)); + private final Function rlFunction = rs -> new HybridRateLimiter(NBLabeledElement.forKV("alias","tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.configure)); private final RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); // 160 threads at 10_000_000 ops/s diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java index 54e5568a5..6534afbbb 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java @@ -18,7 +18,6 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.testutils.Perf; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec.Verb; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -39,7 +38,7 @@ public class TestRateLimiterPerf1E8 { rs -> new HybridRateLimiter( this.def, "hybrid", - rs.withVerb(Verb.configure) + rs.withVerb(RateSpec.Verb.configure) ); private final RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java index 5f36b5afc..4f08715e9 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerfSingle.java @@ -18,7 +18,6 @@ package io.nosqlbench.engine.api.activityapi.ratelimits; import io.nosqlbench.api.config.NBLabeledElement; import io.nosqlbench.api.testutils.Result; -import io.nosqlbench.engine.api.activityapi.ratelimits.RateSpec.Verb; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -33,7 +32,7 @@ import java.util.function.Function; */ public class TestRateLimiterPerfSingle { - private final Function rlFunction = rs -> new HybridRateLimiter(NBLabeledElement.forKV("alias","tokenrl"),"hybrid", rs.withVerb(Verb.start)); + private final Function rlFunction = rs -> new HybridRateLimiter(NBLabeledElement.forKV("alias","tokenrl"),"hybrid", rs.withVerb(RateSpec.Verb.start)); private final RateLimiterPerfTestMethods methods = new RateLimiterPerfTestMethods(); @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java index 0abc67a5c..18f8e01e6 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,8 +16,8 @@ package io.nosqlbench.engine.api.activityimpl.marker; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java index 890c32110..ea8830f95 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -16,10 +16,11 @@ package io.nosqlbench.engine.api.activityimpl.marker; -import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultSegmentBuffer; import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResultsSegment; +import io.nosqlbench.engine.api.activityapi.cyclelog.buffers.results.CycleResult; import io.nosqlbench.engine.api.activityapi.output.Output; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -39,7 +40,7 @@ public class CoreOutputTest { ct4.onCycleResult(1,1); ct4.onCycleResult(2,2); ct4.onCycleResult(3,3); - assertThat(r.segments).hasSize(1); + Assertions.assertThat(r.segments).hasSize(1); long[] cycles = StreamSupport.stream(r.segments.get(0).spliterator(), false) .mapToLong(CycleResult::getCycle).toArray(); diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java index fb8346dfe..77999b184 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * 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. @@ -18,8 +18,6 @@ package io.nosqlbench.engine.api.clireader; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; - class CLITest { @Test diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java index 29b49ebfa..43141779b 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/templating/CommandTemplateTest.java @@ -18,10 +18,11 @@ package io.nosqlbench.engine.api.templating; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.nosqlbench.engine.api.activityconfig.OpsLoader; -import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; -import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplateFormat; -import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList; +import io.nosqlbench.adapters.api.activityconfig.OpsLoader; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplate; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpTemplateFormat; +import io.nosqlbench.adapters.api.activityconfig.yaml.OpsDocList; +import io.nosqlbench.adapters.api.templating.CommandTemplate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; @@ -35,8 +36,7 @@ public class CommandTemplateTest { @Test public void testCommandTemplate() { - OpsDocList opsDocs = OpsLoader.loadString("" + - "ops:\n" + + OpsDocList opsDocs = OpsLoader.loadString("ops:\n" + " - s1: test1=foo test2=bar", OpTemplateFormat.yaml, Map.of(), null); OpTemplate optpl = opsDocs.getOps().get(0); @@ -47,8 +47,7 @@ public class CommandTemplateTest { @Test public void testCommandTemplateFormat() { Gson gson = new GsonBuilder().setPrettyPrinting().create(); - OpsDocList stmtsDocs = OpsLoader.loadString("" + - "ops:\n" + + OpsDocList stmtsDocs = OpsLoader.loadString("ops:\n" + " - s1: test1=foo test2={bar}\n" + " bindings:\n" + " bar: NumberNameToString();\n",