Merge branch 'main' into driver-api

# Conflicts:
#	RELEASENOTES.md
#	driver-cql-shaded/pom.xml
#	driver-cqld3-shaded/pom.xml
#	driver-diag/pom.xml
#	driver-dsegraph-shaded/pom.xml
#	driver-http/pom.xml
#	driver-jdbc/pom.xml
#	driver-jms/pom.xml
#	driver-jmx/pom.xml
#	driver-kafka/pom.xml
#	driver-mongodb/pom.xml
#	driver-pulsar/pom.xml
#	driver-stdout/pom.xml
#	driver-tcp/pom.xml
#	driver-web/pom.xml
#	engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/TestRateLimiterPerf1E8.java
#	mvn-defaults/pom.xml
#	nb-api/pom.xml
#	nb/pom.xml
This commit is contained in:
Jonathan Shook
2021-10-05 13:31:23 -05:00
135 changed files with 3886 additions and 1164 deletions

View File

@@ -4,7 +4,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@@ -18,36 +18,36 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-realdata</artifactId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-realer</artifactId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-api</artifactId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-lib-random</artifactId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
<artifactId>virtdata-lib-basics</artifactId>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
<artifactId>virtdata-lib-curves4</artifactId>
</dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>docsys</artifactId>
<version>4.15.52-SNAPSHOT</version>
<version>4.15.58-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@@ -69,10 +69,10 @@ public class IntegratedComposerLogicTest {
public void testResourceLoader() {
Optional<DataMapper<Object>> dataMapper = VirtData.getOptionalMapper(" ModuloLineToString('data/variable_words.txt') -> String");
assertThat(dataMapper).isPresent();
assertThat(dataMapper.get().get(1)).isEqualToComparingFieldByField("completion_count");
assertThat(dataMapper.get().get(1)).isEqualTo("completion_count");
dataMapper = VirtData.getOptionalMapper("compose ModuloLineToString('variable_words.txt') -> String");
assertThat(dataMapper).isPresent();
assertThat(dataMapper.get().get(1)).isEqualToComparingFieldByField("completion_count");
assertThat(dataMapper.get().get(1)).isEqualTo("completion_count");
}
@Test