IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

StandardActivity improvements

Browse Source
This commit is contained in:
Jonathan Shook 2021-07-08 11:49:25 -05:00
parent 747ef53a16
commit 1f4961bb61
6 changed files with 87 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
View File

@ -424,7 +424,7 @@ public class SimpleActivity implements Activity, ProgressCapable {
return createOpSequence(opTemplateOFunction);
}
protected <O> OpSequence<OpDispenser<O>> createOpSourceFromCommands(
protected <O extends Runnable> OpSequence<OpDispenser<O>> createOpSourceFromCommands(
Function<ParsedCommand, OpDispenser<O>> opinit,
List<Function<Map<String, Object>, Map<String, Object>>> parsers
) {

8
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardAction.java
View File

@ -17,12 +17,12 @@ import java.util.concurrent.TimeUnit;
* of this work will be undertaken by the project maintainers.
*
* @param <A> The type of activity
* @param <O> The type of operation
* @param <R> The type of operation
*/
public class StandardAction<A extends StandardActivity<O>, O extends Runnable> implements SyncAction, ActivityDefObserver {
public class StandardAction<A extends StandardActivity, R extends Runnable> implements SyncAction, ActivityDefObserver {
private final A activity;
private final OpSource<O> opsource;
private final OpSource<R> opsource;
private final int slot;
public StandardAction(A activity, int slot) {
@ -34,7 +34,7 @@ public class StandardAction<A extends StandardActivity<O>, O extends Runnable> i
@Override
public int runCycle(long cycle) {
O op = null;
R op = null;
try (Timer.Context ct = activity.getInstrumentation().getOrCreateInputTimer().time()) {
op = opsource.apply(cycle);
}

4
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java
View File

@ -4,9 +4,9 @@ import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
import io.nosqlbench.engine.api.activityapi.core.Activity;
public class StandardActionDispenser implements ActionDispenser {
private final StandardActivity<?> activity;
private final StandardActivity<?,?> activity;
public <A extends Activity> StandardActionDispenser(StandardActivity<?> activity) {
public <A extends Activity> StandardActionDispenser(StandardActivity<?,?> activity) {
this.activity = activity;
}

33
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java
View File

@ -1,5 +1,6 @@
package io.nosqlbench.engine.api.activityimpl.uniform;
import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler;
import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
import io.nosqlbench.engine.api.activityapi.planning.OpSource;
import io.nosqlbench.engine.api.activityimpl.ActivityDef;
@ -17,21 +18,22 @@ import java.util.function.Function;
* core of all new activity types. Extant NB drivers should also migrate
* to this when possible.
*
* @param <O> A type of runnable which wraps the operations for this type of driver.
* @param <R> A type of runnable which wraps the operations for this type of driver.
*/
public class StandardActivity<O extends Runnable> extends SimpleActivity {
public class StandardActivity<R extends Runnable,S> extends SimpleActivity {
private final DriverAdapter<O> adapter;
private final OpSource<O> opsource;
private final DriverAdapter<R,S> adapter;
private final OpSource<R> opsource;
private NBErrorHandler errorHandler;
public StandardActivity(DriverAdapter<O> adapter, ActivityDef activityDef) {
public StandardActivity(DriverAdapter<R,S> adapter, ActivityDef activityDef) {
super(activityDef);
this.adapter = adapter;
try {
Function<ParsedCommand, OpDispenser<O>> opmapper = adapter.getOpMapper();
Function<ParsedCommand, OpDispenser<R>> opmapper = adapter.getOpMapper();
Function<Map<String, Object>, Map<String, Object>> preprocessor = adapter.getPreprocessor();
OpSequence<OpDispenser<O>> seq = createOpSourceFromCommands(opmapper,List.of(preprocessor));
OpSequence<OpDispenser<R>> seq = createOpSourceFromCommands(opmapper,List.of(preprocessor));
opsource= OpSource.of(seq);
} catch (Exception e) {
if (e instanceof OpConfigError) {
@ -42,14 +44,19 @@ public class StandardActivity<O extends Runnable> extends SimpleActivity {
}
}
public OpSource<O> getOpSource() {
public OpSource<R> getOpSource() {
return opsource;
}
// public Function<OpTemplate, OpDispenser<? extends Runnable>> getRunnableOpFunction() {
// DiagRunnableOpMapper mapper = new DiagRunnableOpMapper();
// return mapper::apply;
// }
/**
* When an adapter 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.
*/
@Override
public final Function<Throwable, String> getErrorNameMapper() {
return adapter.getErrorNameMapper();
}
}

17
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java
View File

@ -3,19 +3,28 @@ package io.nosqlbench.engine.api.activityimpl.uniform;
import io.nosqlbench.engine.api.activityapi.core.ActionDispenser;
import io.nosqlbench.engine.api.activityapi.core.ActivityType;
import io.nosqlbench.engine.api.activityimpl.ActivityDef;
import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
import io.nosqlbench.nb.api.spi.SimpleServiceLoader;
public class StandardActivityType<A extends StandardActivity<?>> implements ActivityType<A> {
public class StandardActivityType<A extends StandardActivity<?,?>> extends SimpleActivity implements ActivityType<A> {
public static SimpleServiceLoader<DriverAdapter> FINDER = new SimpleServiceLoader<DriverAdapter>(DriverAdapter.class);
private final DriverAdapter<?> adapter;
private final DriverAdapter<?,?> adapter;
public StandardActivityType(DriverAdapter<?> adapter) {
public StandardActivityType(DriverAdapter<?,?> adapter, ActivityDef activityDef) {
super(activityDef);
this.adapter = adapter;
if (adapter instanceof ActivityDefAware) {
((ActivityDefAware) adapter).setActivityDef(activityDef);
}
}
@Override
public A getActivity(ActivityDef activityDef) {
if (activityDef.getParams().getOptionalString("async").isPresent()) {
throw new RuntimeException("This driver does not support async mode yet.");
}
return (A) new StandardActivity(adapter,activityDef);
}
@ -23,4 +32,6 @@ public class StandardActivityType<A extends StandardActivity<?>> implements Acti
public ActionDispenser getActionDispenser(A activity) {
return new StandardActionDispenser(activity);
}
}

46
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/fieldmappers/FieldDestructuringMapper.java Normal file
View File

@ -0,0 +1,46 @@
package io.nosqlbench.engine.api.activityimpl.uniform.fieldmappers;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
public class FieldDestructuringMapper implements Function<Map<String, Object>, Map<String, Object>> {
private final String fieldname;
private final Function<String, Optional<Map<String, Object>>> thenfunc;
public FieldDestructuringMapper(String fieldName, Function<String, Optional<Map<String, Object>>> thenfunc) {
this.fieldname = fieldName;
this.thenfunc = thenfunc;
}
@Override
public Map<String, Object> apply(Map<String, Object> stringObjectMap) {
if (stringObjectMap.containsKey(fieldname)) {
Object o = stringObjectMap.get(fieldname);
if (o instanceof CharSequence) {
String rawfield = o.toString();
Optional<Map<String, Object>> optionalResult = thenfunc.apply(rawfield);
if (optionalResult.isPresent()) {
Map<String, Object> resultmap = optionalResult.get();
LinkedHashMap<String, Object> returnmap = new LinkedHashMap<>(stringObjectMap);
returnmap.remove(fieldname);
resultmap.forEach((k, v) -> {
if (returnmap.containsKey(k)) {
throw new RuntimeException("element '" + k + "' already exist during field remapping.");
}
returnmap.put(k, v);
});
return returnmap;
} else {
return stringObjectMap;
}
} else {
throw new RuntimeException("During op mapping, can't parse something that is not a CharSequence: '" + fieldname + "' (type is " + o.getClass().getCanonicalName() + ")");
}
} else {
return stringObjectMap;
}
}
}