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

post-merge fixes

Browse Source
This commit is contained in:
Jonathan Shook 2021-10-05 14:27:17 -05:00
parent 666279decd
commit f1bf47e719
8 changed files with 33 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adapter-cqld4/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId> <artifactId>mvn-defaults</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath> <relativePath>../mvn-defaults</relativePath>
</parent> </parent>
@ -23,13 +23,13 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>drivers-api</artifactId> <artifactId>drivers-api</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-basics</artifactId> <artifactId>virtdata-lib-basics</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

12
adapters-api/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<artifactId>mvn-defaults</artifactId> <artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath> <relativePath>../mvn-defaults</relativePath>
</parent> </parent>
@ -25,14 +25,20 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>nb-api</artifactId> <artifactId>nb-api</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>virtdata-userlibs</artifactId> <artifactId>virtdata-userlibs</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-api</artifactId>
<version>4.15.58-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>

4
adapters-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedOp.java
View File

@ -6,7 +6,9 @@ import io.nosqlbench.engine.api.templating.binders.ListBinder;
import io.nosqlbench.engine.api.templating.binders.OrderedMapBinder; import io.nosqlbench.engine.api.templating.binders.OrderedMapBinder;
import io.nosqlbench.nb.api.config.fieldreaders.DynamicFieldReader; import io.nosqlbench.nb.api.config.fieldreaders.DynamicFieldReader;
import io.nosqlbench.nb.api.config.fieldreaders.StaticFieldReader; import io.nosqlbench.nb.api.config.fieldreaders.StaticFieldReader;
import io.nosqlbench.nb.api.config.standard.*; import io.nosqlbench.nb.api.config.standard.NBConfigError;
import io.nosqlbench.nb.api.config.standard.NBConfiguration;
import io.nosqlbench.nb.api.config.standard.NBTypeConverter;
import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.nb.api.errors.BasicError;
import io.nosqlbench.nb.api.errors.OpConfigError; import io.nosqlbench.nb.api.errors.OpConfigError;
import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.DataMapper;

4
driver-grpc/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>mvn-defaults</artifactId> <artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
<relativePath>../mvn-defaults/pom.xml</relativePath> <relativePath>../mvn-defaults/pom.xml</relativePath>
</parent> </parent>
@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>drivers-api</artifactId> <artifactId>drivers-api</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

2
drivers-api/pom.xml
View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>adapters-api</artifactId> <artifactId>adapters-api</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>

12
nb/pom.xml
View File

@ -49,8 +49,12 @@
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>engine-extensions</artifactId> <artifactId>engine-extensions</artifactId>
<version>4.15.58-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nbr</artifactId> <artifactId>nbr</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@ -227,7 +231,7 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>driver-dsegraph-shaded</artifactId> <artifactId>driver-dsegraph-shaded</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
@ -240,12 +244,12 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>driver-cql-shaded</artifactId> <artifactId>driver-cql-shaded</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>driver-cqlverify</artifactId> <artifactId>driver-cqlverify</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

14
nbr/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>mvn-defaults</artifactId> <artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath> <relativePath>../mvn-defaults</relativePath>
</parent> </parent>
@ -24,37 +24,37 @@
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>engine-rest</artifactId> <artifactId>engine-rest</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>engine-cli</artifactId> <artifactId>engine-cli</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>engine-docs</artifactId> <artifactId>engine-docs</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId> <artifactId>engine-core</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>engine-extensions</artifactId> <artifactId>engine-extensions</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.nosqlbench</groupId> <groupId>io.nosqlbench</groupId>
<artifactId>driver-diag</artifactId> <artifactId>driver-diag</artifactId>
<version>4.15.52-SNAPSHOT</version> <version>4.15.58-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

79
nbr/target/classes/scripts/auto/stepup.js
View File

@ -1,79 +0,0 @@
// driver
// workload
// sample_seconds
// min_rate
// rate_step
// max_rate
function printf(args) {
var spec = arguments[0];
var values = [];
for (let i = 1; i < arguments.length; i++) {
values.push(arguments[i]);
}
java.lang.System.out.printf(arguments[0], values);
}
var sample_seconds = 600;
sample_seconds = 0 + TEMPLATE(sample_seconds,sample_seconds);
printf("sample_seconds=%d\n", sample_seconds);
var min_rate = 1;
min_rate = 0 + TEMPLATE(min_rate,min_rate);
var max_rate = 10000;
max_rate = 0 + TEMPLATE(max_rate,max_rate);
var rate_step = 10000;
rate_step = 0 + TEMPLATE(rate_step,rate_step);
printf("rate (min,step,max) = (%d,%d,%d)\n");
var driver = "TEMPLATE(driver,diag)"
var workload = "TEMPLATE(workload,none)"
printf("driver=%s workload=%s\n",driver,workload);
printf("starting activity for stepup analysis...\n");
var activitydef = params.withDefaults({
'alias': 'stepup',
'driver': driver,
'cycles': '1t',
'stride': '1000',
'striderate': '1:1.05:restart'
});
var csvlogger = csvoutput.open('stepup_metrics/stepup_rates.csv', 'time', 'workload', 'rate', 'ops')
var csvhistologger=csvmetrics.log("stepup_metrics");
csvlogger.write({'time': java.lang.System.currentTimeMillis()/1000});
scenario.start(activitydef);
printf("waiting 5 seconds for metrics warm-up...\n");
scenario.waitMillis(5000);
for (var rate = rate_step; rate < max_rate + rate_step; rate += rate_step) {
if (rate > max_rate) {
rate = max_rate;
}
print("rate=" + rate);
activities.stepup.striderate = "" + (rate / 1000.0)+":1.05:restart";
print("sampling performance for (sample_seconds=" + params.sample_seconds + ")...");
var precount = metrics.stepup.cycles.servicetime.count
var waitmillis = sample_seconds * 1000;
print("waitmillis=" + waitmillis);
scenario.waitMillis("" + waitmillis);
var postcount = metrics.stepup.cycles.servicetime.count
var count = postcount - precount;
var ops_per_second = count / params.sample_seconds;
printf("ops_per_second = %f (%f / %f)\n", ops_per_second, count, sample_seconds);
csvlogger.write({
'time': java.lang.System.currentTimeMillis()/1000,
'workload': activitydef.workload,
'rate': rate,
'ops': ops_per_second
});
csvhistologger.report();
}
print("stopping activity after stepup analysis\n");
scenario.stop("stepup")