checkpoint

This commit is contained in:
Jonathan Shook
2023-10-08 13:58:07 -05:00
parent 0699b446a6
commit 9fa711b7ab
71 changed files with 776 additions and 245 deletions

View File

@@ -15,7 +15,7 @@
~ limitations under the License.
-->
<Configuration status="debug" strict="true" name="XMLConfigTest">
<Configuration status="warn" strict="true" name="XMLConfigTest">
<Filter type="ThresholdFilter" level="trace"/>

View File

@@ -1,54 +0,0 @@
/*
* Copyright (c) 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.nbr.examples;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.context.ActivitiesController;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import io.nosqlbench.engine.core.lifecycle.scenario.context.ScriptParams;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBScenario;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
public abstract class SCBaseScenario extends NBScenario {
protected NBComponent component;
protected Reader stdin;
protected PrintWriter stdout;
protected Writer stderr;
protected ActivitiesController controller;
protected ScriptParams params;
public SCBaseScenario(NBComponent parentComponent, String scenarioName) {
super(parentComponent, scenarioName);
}
@Override
protected final void runScenario(NBSceneFixtures shell) {
this.component = shell.component();
this.stdin = shell.in();
this.stdout = shell.out();
this.stderr = shell.err();
this.controller = shell.controller();
this.params = shell.params();
invoke();
}
public abstract void invoke();
}

View File

@@ -22,7 +22,6 @@ import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.ScenarioResult;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.ScenariosExecutor;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.ScenariosResults;
import io.nosqlbench.nbr.examples.injava.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -145,7 +144,7 @@ public class DirectRuntimeScenarioTests {
@Disabled("enable before merge")
@Test
public void test_SC_optimo() {
NBScenario scenario = new SC_optimo(testC,"test_SC_optimo");
NBScenario scenario = new SC_optimo_test(testC,"test_SC_optimo");
ScenarioResult result = scenario.apply(NBSceneBuffer.init("test_SC_optimo"));
System.out.println(result);
}

View File

@@ -17,8 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.context.NBSceneFixtures;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;

View File

@@ -19,7 +19,7 @@ package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.core.lifecycle.scenario.execution.NBScenario;
import io.nosqlbench.nb.annotations.Service;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;

View File

@@ -17,8 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.engine.cli.Cmd;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;

View File

@@ -19,7 +19,7 @@ package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.api.engine.metrics.instruments.NBMetricCounter;
import io.nosqlbench.api.engine.metrics.instruments.NBMetricGauge;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;
@@ -94,8 +94,8 @@ public class SC_cocycledelay_bursty extends SCBaseScenario {
stdout.println("starting activity co_cycle_delay_bursty");
controller.start(co_cycle_delay_bursty);
NBMetricCounter service_time_counter = find().metricCounter("activity=co_cycle_delay_bursty,name=cycles_servicetime");
NBMetricGauge wait_time_gauge = find().metricGauge("activity=co_cycle_delay_bursty,name=cycles_waittime");
NBMetricCounter service_time_counter = find().counter("activity=co_cycle_delay_bursty,name=cycles_servicetime");
NBMetricGauge wait_time_gauge = find().gauge("activity=co_cycle_delay_bursty,name=cycles_waittime");
String diagrate = controller.getActivityDef("co_cycle_delay_bursty").getParams().get("diagrate").toString();
String cyclerate = controller.getActivityDef("co_cycle_delay_bursty").getParams().get("cyclerate").toString();
//

View File

@@ -19,7 +19,7 @@ package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.api.engine.metrics.instruments.NBMetricCounter;
import io.nosqlbench.api.engine.metrics.instruments.NBMetricGauge;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;
@@ -94,8 +94,8 @@ public class SC_cocycledelay_bursty_backup extends SCBaseScenario {
stdout.println("starting activity co_cycle_delay_bursty");
controller.start(co_cycle_delay_bursty);
NBMetricCounter service_time_counter = find().metricCounter("activity=co_cycle_delay_bursty,name=cycles_servicetime");
NBMetricGauge wait_time_gauge = find().metricGauge("activity=co_cycle_delay_bursty,name=cycles_waittime");
NBMetricCounter service_time_counter = find().counter("activity=co_cycle_delay_bursty,name=cycles_servicetime");
NBMetricGauge wait_time_gauge = find().gauge("activity=co_cycle_delay_bursty,name=cycles_waittime");
String diagrate = controller.getActivityDef("co_cycle_delay_bursty").getParams().get("diagrate").toString();
String cyclerate = controller.getActivityDef("co_cycle_delay_bursty").getParams().get("cyclerate").toString();

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_cocycledelay_strict extends SCBaseScenario {
public SC_cocycledelay_strict(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_cycle_rate extends SCBaseScenario {
public SC_cycle_rate(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_cycle_rate_change extends SCBaseScenario {
public SC_cycle_rate_change(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_extension_csvmetrics extends SCBaseScenario {
public SC_extension_csvmetrics(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_extension_csvoutput extends SCBaseScenario {
public SC_extension_csvoutput(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_extension_histostatslogger extends SCBaseScenario {
public SC_extension_histostatslogger(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_extension_shutdown_hook extends SCBaseScenario {
public SC_extension_shutdown_hook(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_histologger extends SCBaseScenario {
public SC_histologger(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_linkedinput extends SCBaseScenario {
public SC_linkedinput(NBComponent parentComponent, String scenarioName) {

View File

@@ -19,12 +19,12 @@ package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.api.optimizers.BobyqaOptimizerInstance;
import io.nosqlbench.api.optimizers.MVResult;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.function.ToDoubleFunction;
public class SC_optimo extends SCBaseScenario {
public SC_optimo(NBComponent parentComponent, String scenarioName) {
public class SC_optimo_test extends SCBaseScenario {
public SC_optimo_test(NBComponent parentComponent, String scenarioName) {
super(parentComponent, scenarioName);
}

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_params_variable extends SCBaseScenario {
public SC_params_variable(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_readmetrics extends SCBaseScenario {
public SC_readmetrics(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_speedcheck extends SCBaseScenario {
public SC_speedcheck(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_template extends SCBaseScenario {
public SC_template(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_threadchange extends SCBaseScenario {
public SC_threadchange(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
public class SC_threadspeeds extends SCBaseScenario {
public SC_threadspeeds(NBComponent parentComponent, String scenarioName) {

View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nbr.examples.injava;
import io.nosqlbench.components.NBComponent;
import io.nosqlbench.nbr.examples.SCBaseScenario;
import io.nosqlbench.engine.core.lifecycle.scenario.direct.SCBaseScenario;
import java.util.Map;