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

This commit is contained in:
phact 2020-03-25 11:19:19 -04:00
commit 0fd68b0ae9
30 changed files with 97 additions and 90 deletions

View File

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

View File

@ -1,4 +1,4 @@
# nb -v run driver=cql yaml=cql-tabular tags=phase:schema host=dsehost
# nb -v cql-tabular rampup-cycles=1E6 main-cycles=1E9
scenarios:
default:
- run driver=cql tags==phase:schema threads==1

View File

@ -4,7 +4,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -24,7 +24,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-cql</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
</dependencies>

View File

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

View File

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

View File

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

View File

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

View File

@ -9,7 +9,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -105,17 +105,17 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-processors</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-annotations</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -22,7 +22,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-userlibs</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -23,7 +23,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
@ -53,7 +53,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-docker</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>

View File

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

View File

@ -1,11 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -78,7 +77,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
</dependencies>

View File

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

View File

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

View File

@ -1,10 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@ -243,12 +242,6 @@
<version>${docker.java.version}</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-jersey</artifactId>
<version>${docker.java.version}</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-okhttp</artifactId>
@ -531,6 +524,7 @@
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
@ -584,8 +578,7 @@
</executions>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
<createSourcesJar>true</createSourcesJar>
<createDependencyReducedPom>false</createDependencyReducedPom>

View File

@ -1,5 +1,7 @@
#!/bin/bash
# update nuxt
set -x
set -e
GUIDEBOOK="target/guidebook"

View File

@ -9,8 +9,15 @@ cd target
if [ -e "nb.jar" ]
then
echo "nb.jar link exists, skipping"
else
echo "linking $JARNAME to nb.jar"
ln -s $JARNAME nb.jar
exit 0
fi
if [ ! -e "$JARNAME" ]
then
echo "$JARNAME does not exist, skipping"
exit 0
fi
echo "linking $JARNAME to nb.jar"
ln -s $JARNAME nb.jar
echo "linked $JARNAME to nb.jar, exiting"

View File

@ -1,12 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -25,61 +24,61 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-cli</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-docs</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-core</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-extensions</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-stdout</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-diag</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-tcp</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-http</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-cql</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>activitytype-cqlverify</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
@ -164,8 +163,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>topics.md</resource>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
</transformer>
</transformers>
@ -269,7 +267,7 @@
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<dependencyConvergence/>
<dependencyConvergence />
</rules>
</configuration>
</plugin>

View File

@ -0,0 +1,8 @@
package io.nosqlbench.nb;
/**
* This class is just a place holder. It holds a place.
* If only nexus understood aggregator module without src...
*/
public class PlaceHolder {
}

View File

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

View File

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

View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -18,17 +18,17 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-processors</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-annotations</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lang</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>

View File

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

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -32,7 +32,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<dependency>

View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->

View File

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

View File

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

View File

@ -7,7 +7,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@ -21,7 +21,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-annotations</artifactId>
<version>3.12.49-SNAPSHOT</version>
<version>3.12.50-SNAPSHOT</version>
</dependency>
</dependencies>

View File

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

View File

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