IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-12-24 16:00:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nosqlbench/nosqlbench

Browse Source
This commit is contained in:
Jonathan Shook 2020-05-14 15:13:15 -05:00
commit 566de9e3ff
30 changed files with 77 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
RELEASENOTES.md
View File

@ -1,22 +1 @@
d4e27145 (HEAD -> master, origin/master, origin/HEAD) fixed wrong dependency for shaded driver-cql
04b839ef updated release notes
f3f38f62 shade google deps in driver-cql-shaded, replace driver-cql with driver-cql-shaded
5ce026d9 Revert "BasicError handling, print don't throw"
53c37d16 some design doc updates
14afd98d incremental work on cqld4
4278c790 incremental work on markdown processing
66a7190e (origin/better-error-handling) BasicError handling, print don't throw
e2e75f4d ErrorResponse enum check
60fab5bb (HEAD -> master) set lang level to 11
bb113db7 (origin/master, origin/HEAD) updated release notes
d4e27145 fixed wrong dependency for shaded driver-cql
04b839ef updated release notes
f3f38f62 shade google deps in driver-cql-shaded, replace driver-cql with driver-cql-shaded
5ce026d9 Revert "BasicError handling, print don't throw"
53c37d16 some design doc updates
14afd98d incremental work on cqld4
4278c790 incremental work on markdown processing
66a7190e (origin/better-error-handling) BasicError handling, print don't throw
e2e75f4d ErrorResponse enum check
495315a6 update release notes
60fab5bb set lang level to 11
7b61ee3a (HEAD -> master) Don't swallow exception in VirtdataComposer

6
docsys/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -18,7 +18,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
@ -112,7 +112,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
</dependencies>

4
driver-cql-shaded/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,7 +23,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

4
driver-cqlverify/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -24,7 +24,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-cql-shaded</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
</dependencies>

4
driver-diag/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -20,7 +20,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

4
driver-http/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<!-- test scope only -->

4
driver-stdout/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<!-- test scope only -->

6
driver-tcp/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,13 +23,13 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-stdout</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<!-- test scope only -->

4
driver-web/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,7 +22,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>

8
engine-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,19 +22,19 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-annotations</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-userlibs</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

6
engine-cli/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,7 +23,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
@ -47,7 +47,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-docker</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
</dependencies>

4
engine-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -28,7 +28,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

4
engine-docker/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -65,7 +65,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
</dependencies>

4
engine-docs/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -28,7 +28,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>docsys</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
</dependencies>

4
engine-extensions/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,7 +22,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

2
mvn-defaults/pom.xml
View File

@ -3,7 +3,7 @@
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

2
nb-annotations/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>

4
nb-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -31,7 +31,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-annotations</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

24
nb/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -24,31 +24,31 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-web</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-cli</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-docs</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-extensions</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
@ -60,37 +60,37 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-stdout</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-diag</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-tcp</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-http</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-cql-shaded</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>driver-cqlverify</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>

2
pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>mvn-defaults</relativePath>
</parent>

6
virtdata-api/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,14 +23,14 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<artifactId>nb-api</artifactId>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lang</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>

2
virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
View File

@ -178,7 +178,7 @@ public class VirtDataComposer {
}
} catch (Exception e) {
String flowdata = flow != null ? flow.toString() : "undefined";
return diagnostics.error(new RuntimeException("FUNCTION resolution failed: '" + flowdata + "': " + e.toString()));
return diagnostics.error(new RuntimeException("FUNCTION resolution failed: '" + flowdata + "': " + e.toString(),e));
}
}
ResolvedFunction composedFunction = assembly.getResolvedFunction(isThreadSafe);

2
virtdata-lang/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>

4
virtdata-lib-basics/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -20,7 +20,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

2
virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java
View File

@ -16,7 +16,7 @@ public class LongFlow implements LongUnaryOperator {
private final LongUnaryOperator[] ops;
@Example({"StringFlow(Add(3),Mul(6))","Create an integer operator which adds 3 and multiplies the result by 6"})
@Example({"LongFlow(Add(3),Mul(6))","Create an integer operator which adds 3 and multiplies the result by 6"})
public LongFlow(LongUnaryOperator... ops) {
this.ops = ops;
}

6
virtdata-lib-curves4/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,13 +22,13 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-basics</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

6
virtdata-lib-random/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -20,13 +20,13 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-basics</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

4
virtdata-lib-realer/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -24,7 +24,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-basics</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
</dependencies>

4
virtdata-realdata/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -18,7 +18,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>

16
virtdata-userlibs/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -17,32 +17,32 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-realdata</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-realer</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-random</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<artifactId>virtdata-lib-basics</artifactId>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
<artifactId>virtdata-lib-curves4</artifactId>
</dependency>
@ -50,7 +50,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>docsys</artifactId>
<version>3.12.104-SNAPSHOT</version>
<version>3.12.106-SNAPSHOT</version>
</dependency>
<dependency>