From 37150c33a77a8067e85cabb36646e4470ce3faa6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 5 Oct 2021 14:40:40 -0500 Subject: [PATCH 01/53] only release on main branch by default --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2fa8ed7d3..9f7308f88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,8 @@ name: release on: push: + branches: + - main paths: - RELEASENOTES.** From edc43c5b020441fe0c304f8a345a36dce881f975 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 5 Oct 2021 15:32:52 -0500 Subject: [PATCH 02/53] reformat --- nb-api/pom.xml | 168 +++++++++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 83 deletions(-) diff --git a/nb-api/pom.xml b/nb-api/pom.xml index a67bb4d54..b3e5d4891 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -1,98 +1,100 @@ - - 4.0.0 + + 4.0.0 - - mvn-defaults - io.nosqlbench - 4.15.58-SNAPSHOT - ../mvn-defaults - - - nb-api - jar - ${project.artifactId} - - The top level API module for NoSQLBench. This module should have no internal - module dependencies other than the mvn-default module. - All modules within NoSQLBench can safely depend on this module with circular - dependencies. This module provides cross-cutting code infrastracture, such as - path utilities and ways of describing services used between modules. - It is also the transitive aggregation point for system-wide library dependencies - for logging and testing or similar needs. - - - - - - - - - - io.nosqlbench - nb-annotations + + mvn-defaults + io.nosqlbench 4.15.58-SNAPSHOT - + ../mvn-defaults + - - com.vladsch.flexmark - flexmark-ext-yaml-front-matter - 0.61.6 - - - com.vladsch.flexmark - flexmark-html2md-converter - 0.61.6 - + nb-api + jar + ${project.artifactId} + + The top level API module for NoSQLBench. This module should have no internal + module dependencies other than the mvn-default module. + All modules within NoSQLBench can safely depend on this module with circular + dependencies. This module provides cross-cutting code infrastracture, such as + path utilities and ways of describing services used between modules. + It is also the transitive aggregation point for system-wide library dependencies + for logging and testing or similar needs. + + + + + + + + + + io.nosqlbench + nb-annotations + 4.15.58-SNAPSHOT + + + + com.vladsch.flexmark + flexmark-ext-yaml-front-matter + 0.61.6 + + + com.vladsch.flexmark + flexmark-html2md-converter + 0.61.6 + - - net.sf.jopt-simple - jopt-simple - 5.0.3 - + + net.sf.jopt-simple + jopt-simple + 5.0.3 + - - com.google.code.gson - gson - + + com.google.code.gson + gson + - - com.github.oshi - oshi-core - + + com.github.oshi + oshi-core + - + - - org.openjdk.jmh - jmh-core - - - org.openjdk.jmh - jmh-generator-annprocess - + + org.openjdk.jmh + jmh-core + + + org.openjdk.jmh + jmh-generator-annprocess + - - - org.apache.commons - commons-csv - + + + org.apache.commons + commons-csv + - + - - - - src/main/resources - - docs-for-testing-only/** - - - ** - - - - + + + + src/main/resources + + docs-for-testing-only/** + + + ** + + + + From eb5f42f46d0cb5503d581f7cdafa14a147adc36c Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 6 Oct 2021 10:55:32 -0500 Subject: [PATCH 03/53] Fix NullPointerException of checking namespace and topic deduplication status. --- .../java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index de26f15cc..8688627e0 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -461,7 +461,7 @@ public class ReadyPulsarOp implements OpDispenser { try { nsMsgDedup = pulsarAdmin.namespaces().getDeduplicationStatus(namespace); } - catch (PulsarAdminException pae) { + catch (Exception e) { // it is fine if we're unable to check namespace level setting; use default } @@ -471,7 +471,7 @@ public class ReadyPulsarOp implements OpDispenser { try { topicMsgDedup = pulsarAdmin.topics().getDeduplicationStatus(topic); } - catch (PulsarAdminException pae) { + catch (Exception e) { // it is fine if we're unable to check topic level setting; use default } From 265760d18471aa200dc995ab9a583b9a0a1b0adb Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 6 Oct 2021 11:41:50 -0500 Subject: [PATCH 04/53] Address Lari's comment in PR#364. --- .../io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 8688627e0..7ee2320d5 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Reader; @@ -459,7 +458,8 @@ public class ReadyPulsarOp implements OpDispenser { // - default to broker level deduplication setting boolean nsMsgDedup = brokerMsgDupFunc.apply(l); try { - nsMsgDedup = pulsarAdmin.namespaces().getDeduplicationStatus(namespace); + Boolean dedupStatus = pulsarAdmin.namespaces().getDeduplicationStatus(namespace); + if (dedupStatus != null) nsMsgDedup = dedupStatus; } catch (Exception e) { // it is fine if we're unable to check namespace level setting; use default @@ -469,7 +469,8 @@ public class ReadyPulsarOp implements OpDispenser { // - default to namespace level deduplication setting boolean topicMsgDedup = nsMsgDedup; try { - topicMsgDedup = pulsarAdmin.topics().getDeduplicationStatus(topic); + Boolean dedupStatus = pulsarAdmin.topics().getDeduplicationStatus(namespace); + if (dedupStatus != null) topicMsgDedup = dedupStatus; } catch (Exception e) { // it is fine if we're unable to check topic level setting; use default From 178abe67b53639504a2baa5c08e5021d89130763 Mon Sep 17 00:00:00 2001 From: Lakshmi Manjunatha <89935678+lakshmi-M18@users.noreply.github.com> Date: Wed, 6 Oct 2021 14:18:22 -0400 Subject: [PATCH 05/53] Update schema-astra code for create table Updated create table code for schema-astra since it was causing issues in Astra cluster. --- .../main/resources/activities/baselinesv2/cql-tabular2.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/driver-cql-shaded/src/main/resources/activities/baselinesv2/cql-tabular2.yaml b/driver-cql-shaded/src/main/resources/activities/baselinesv2/cql-tabular2.yaml index 643582cc3..03615b461 100644 --- a/driver-cql-shaded/src/main/resources/activities/baselinesv2/cql-tabular2.yaml +++ b/driver-cql-shaded/src/main/resources/activities/baselinesv2/cql-tabular2.yaml @@ -94,7 +94,8 @@ blocks: create table if not exists <>.<> ( part text, clust text, - data text, + data0 text, data1 text, data2 text, data3 text, + data4 text, data5 text, data6 text, data7 text, PRIMARY KEY (part,clust) ); tags: From 0df40113e8ecb2b2399985913212e62a76589105 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 6 Oct 2021 17:06:12 -0500 Subject: [PATCH 06/53] re-enabled epoll dependency --- driver-cql-shaded/pom.xml | 28 +- driver-cqld3-shaded/pom.xml | 21 +- driver-dsegraph-shaded/pom.xml | 443 +++++------ mvn-defaults/pom.xml | 1318 ++++++++++++++++---------------- 4 files changed, 908 insertions(+), 902 deletions(-) diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 2e94a577c..09cb0e0ec 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -81,15 +81,13 @@ io.netty netty-codec-haproxy - 4.1.54.Final - - - - - - + + io.netty + netty-transport-native-epoll + linux-x86_64 + @@ -192,14 +190,14 @@ com.google.common com.datastax.internal.com_google_common - - - - - - - - + + com.datastax + dse19.com.datastax + + + io.netty + dse19.io.netty + diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 99d6754ee..72625962e 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -71,15 +71,14 @@ io.netty netty-codec-haproxy - 4.1.54.Final - - - - - - + + io.netty + netty-transport-native-epoll + linux-x86_64 + + @@ -198,10 +197,10 @@ io.nosqlbench.generators.cql io.nosqlbench.generators.cql3.shaded - - - - + + io.netty + dse19.io.netty + diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 0c0630bfe..a79c71312 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -1,82 +1,84 @@ - - 4.0.0 + + 4.0.0 - - io.nosqlbench - mvn-defaults - 4.15.58-SNAPSHOT - ../mvn-defaults - - - driver-dsegraph-shaded - jar - ${project.artifactId} - - - A DSE Graph ActivityType driver for nosqlbench, based on http://nosqlbench.io/ - - - - - - - - io.nosqlbench - engine-api + + io.nosqlbench + mvn-defaults 4.15.58-SNAPSHOT - + ../mvn-defaults + - - io.nosqlbench - drivers-api - 4.15.58-SNAPSHOT - + driver-dsegraph-shaded + jar + ${project.artifactId} - - com.datastax.dse - dse-java-driver-graph - 1.9.0 - - - org.slf4j - jcl-over-slf4j - - - + + A DSE Graph ActivityType driver for nosqlbench, based on http://nosqlbench.io/ + - - com.datastax.dse - dse-java-driver-core - 1.9.0 - + - - com.datastax.dse - dse-java-driver-extras - 1.9.0 - - - com.datastax.dse - dse-java-driver-mapping - 1.9.0 - + - - - org.lz4 - lz4-java - + + io.nosqlbench + engine-api + 4.15.58-SNAPSHOT + - - - org.xerial.snappy - snappy-java - + + io.nosqlbench + drivers-api + 4.15.58-SNAPSHOT + - - org.antlr - antlr4-runtime - + + com.datastax.dse + dse-java-driver-graph + 1.9.0 + + + org.slf4j + jcl-over-slf4j + + + + + + com.datastax.dse + dse-java-driver-core + 1.9.0 + + + + com.datastax.dse + dse-java-driver-extras + 1.9.0 + + + com.datastax.dse + dse-java-driver-mapping + 1.9.0 + + + + + org.lz4 + lz4-java + + + + + org.xerial.snappy + snappy-java + + + + org.antlr + antlr4-runtime + @@ -85,145 +87,145 @@ - + - + - - io.dropwizard.metrics - metrics-core - 3.2.2 - - - - - - + + io.dropwizard.metrics + metrics-core + 3.2.2 + + + + + + - + - - org.testng - testng - 6.13.1 - test - + + org.testng + testng + 6.13.1 + test + - - org.assertj - assertj-core-java8 - 1.0.0m1 - test - + + org.assertj + assertj-core-java8 + 1.0.0m1 + test + - + - - org.yaml - snakeyaml - 1.23 - + + org.yaml + snakeyaml + 1.23 + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + (lack of composite key syntax, nested type syntax, etc) + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - org.antlr - antlr4-maven-plugin - - src/main/grammars/cql3 - - - -package - io.nosqlbench.generators.cql.generated - - - - src/main/java/io/nosqlbench/generators/cql/generated - - - - - antlr - - antlr4 - - generate-sources - - - + + org.antlr + antlr4-maven-plugin + + src/main/grammars/cql3 + + + -package + io.nosqlbench.generators.cql.generated + + + + src/main/java/io/nosqlbench/generators/cql/generated + + + + + antlr + + antlr4 + + generate-sources + + + - - maven-shade-plugin - 3.2.3 - - - package - - shade - - - - - false - true - true - - - - - com.google.common - com.datastax.internal.com_google_common - + + maven-shade-plugin + 3.2.3 + + + package + + shade + + + + + false + true + true + + + + + com.google.common + com.datastax.internal.com_google_common + @@ -232,32 +234,33 @@ - - - - *:* - - - - - io.nosqlbench.engine.cli.NBCLI - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - + + + + *:* + + + + + io.nosqlbench.engine.cli.NBCLI + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index d92bb5690..1dbfdf1ce 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -1,680 +1,686 @@ - - 4.0.0 + + 4.0.0 - io.nosqlbench - mvn-defaults - 4.15.58-SNAPSHOT - pom + io.nosqlbench + mvn-defaults + 4.15.58-SNAPSHOT + pom - - UTF-8 - UTF-8 - nosqlbench + + UTF-8 + UTF-8 + nosqlbench - - 1.2.0 - 4.9.2 - 1.14 - 1.21 - 1.8 - 3.9 - 3.6.1 - 1.9 - 3.2.1 - 3.0.0-RC1 - 1.11.1 - 2.4.0-b180830.0359 - 2.3.0.1 - 2.4.0-b180830.0438 - 1.22 - 2.9.9 - 5.7.2 + + 1.2.0 + 4.9.2 + 1.14 + 1.21 + 1.8 + 3.9 + 3.6.1 + 1.9 + 3.2.1 + 3.0.0-RC1 + 1.11.1 + 2.4.0-b180830.0359 + 2.3.0.1 + 2.4.0-b180830.0438 + 1.22 + 2.9.9 + 5.7.2 - 1.4.1 - - 2.4.10.Final - - 4.1.47.Final - - 1.0.0 - - 1.26 - 1.1.2.6 + 1.4.1 + + 2.4.10.Final + 1.0.0 + + 1.26 + 1.1.2.6 - - 3.1.0 - 3.8.1 - 3.0.0-M1 - 3.0.0-M3 - 1.6.0 - 3.0.0-M4 - 1.6 - 3.0.0-M1 - 3.1.1 - 3.1.1 - 1.6.8 - 2.5.3 - 3.1.0 - 3.0.1 - 3.0.0-M4 - + + 3.1.0 + 3.8.1 + 3.0.0-M1 + 3.0.0-M3 + 1.6.0 + 3.0.0-M4 + 1.6 + 3.0.0-M1 + 3.1.1 + 3.1.1 + 1.6.8 + 2.5.3 + 3.1.0 + 3.0.1 + 3.0.0-M4 + - ${project.artifactId} - http://nosqlbench.io/ - - nosqlbench is the core of a programmable workload simulation runtime. - This module acts as the parent pom for nosqlbench Maven modules. - + ${project.artifactId} + http://nosqlbench.io/ + + nosqlbench is the core of a programmable workload simulation runtime. + This module acts as the parent pom for nosqlbench Maven modules. + - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + - - GitHub - https://github.com/nosqlbench/nosqlbench/issues - + + GitHub + https://github.com/nosqlbench/nosqlbench/issues + - - scm:git:https://github.com/nosqlbench/nosqlbench.git - - HEAD - + + scm:git:https://github.com/nosqlbench/nosqlbench.git + + HEAD + + + + + + + org.junit.jupiter + ${junit.jupiter.version} + junit-jupiter + test + + + + org.mpierce.metrics.reservoir + hdrhistogram-metrics-reservoir + 1.1.0 + + + + org.hdrhistogram + HdrHistogram + 2.1.11 + + + + io.dropwizard.metrics + metrics-graphite + 4.1.9 + + + + io.dropwizard.metrics + metrics-core + 4.1.9 + + + + org.apache.commons + commons-text + ${commons.text.version} + + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + com.mitchtalmadge + ascii-data + ${ascii.data.version} + + + + + org.lz4 + lz4-java + ${lz4.version} + + + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + + io.netty + netty-handler + 4.1.51.Final + + + + io.netty + netty-transport-native-epoll + 4.1.51.Final + linux-x86_64 + + + + io.netty + netty-transport-native-kqueue + 4.1.46.Final + linux-x86_64 + + + + io.netty + netty-codec-haproxy + 4.1.54.Final + + + + com.github.docker-java + docker-java-api + ${docker.java.version} + + + org.slf4j + jcl-over-slf4j + + + + + + com.github.docker-java + docker-java-core + ${docker.java.version} + + + org.slf4j + jcl-over-slf4j + + + + + + com.github.docker-java + docker-java-transport-okhttp + ${docker.java.version} + + + org.slf4j + jcl-over-slf4j + + + + + + + com.github.docker-java + docker-java + ${docker.java.version} + + + org.slf4j + jcl-over-slf4j + + + + + + + com.github.oshi + oshi-core + 5.2.2 + + + + com.google.code.gson + gson + 2.8.5 + + + + com.elega9t + number-to-words + ${number.to.words.version} + + + + org.greenrobot + essentials + ${greenrobot.version} + + + + org.apache.commons + commons-lang3 + ${commons.lang.version} + + + + com.squareup + javapoet + ${javapoet.version} + + + + joda-time + joda-time + ${joda.time.version} + + + + org.apache.commons + commons-math3 + ${commons.math3.version} + + + + org.apache.commons + commons-csv + ${commons.csv.version} + + + commons-codec + commons-codec + ${commons.codec.version} + + + org.mvel + mvel2 + ${mvel2.version} + + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.9.8 + + + + com.sun.xml.bind + jaxb-core + ${jaxb.core.version} + + + + com.sun.xml.bind + jaxb-impl + ${jaxb.impl.version} + + + + + org.graalvm.sdk + graal-sdk + 20.3.0 + + + org.graalvm.js + js + 20.3.0 + runtime + + + org.graalvm.js + js-scriptengine + 20.3.0 + + + org.graalvm.tools + profiler + 20.3.0 + runtime + + + org.graalvm.tools + chromeinspector + 20.3.0 + runtime + + + + - - - org.junit.jupiter - ${junit.jupiter.version} - junit-jupiter - test - + + org.apache.logging.log4j + log4j-api + 2.14.0 + - - org.mpierce.metrics.reservoir - hdrhistogram-metrics-reservoir - 1.1.0 - + + org.apache.logging.log4j + log4j-core + 2.14.0 + - - org.hdrhistogram - HdrHistogram - 2.1.11 - + + org.apache.logging.log4j + log4j-slf4j-impl + 2.14.0 + - - io.dropwizard.metrics - metrics-graphite - 4.1.9 - + + org.assertj + assertj-core + 3.19.0 + test + - - io.dropwizard.metrics - metrics-core - 4.1.9 - - - - org.apache.commons - commons-text - ${commons.text.version} - - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - com.mitchtalmadge - ascii-data - ${ascii.data.version} - - - - - org.lz4 - lz4-java - ${lz4.version} - - - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - - io.netty - netty-handler - ${netty.version} - - - - io.netty - netty-transport-native-epoll - ${netty.version} - linux-x86_64 - - - - io.netty - netty-transport-native-kqueue - 4.1.47.Final - linux-x86_64 - - - - com.github.docker-java - docker-java-api - ${docker.java.version} - - - org.slf4j - jcl-over-slf4j - - - - - - com.github.docker-java - docker-java-core - ${docker.java.version} - - - org.slf4j - jcl-over-slf4j - - - - - - com.github.docker-java - docker-java-transport-okhttp - ${docker.java.version} - - - org.slf4j - jcl-over-slf4j - - - - - - - com.github.docker-java - docker-java - ${docker.java.version} - - - org.slf4j - jcl-over-slf4j - - - - - - - com.github.oshi - oshi-core - 5.2.2 - - - - com.google.code.gson - gson - 2.8.5 - - - - com.elega9t - number-to-words - ${number.to.words.version} - - - - org.greenrobot - essentials - ${greenrobot.version} - - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - - com.squareup - javapoet - ${javapoet.version} - - - - joda-time - joda-time - ${joda.time.version} - - - - org.apache.commons - commons-math3 - ${commons.math3.version} - - - - org.apache.commons - commons-csv - ${commons.csv.version} - - - commons-codec - commons-codec - ${commons.codec.version} - - - org.mvel - mvel2 - ${mvel2.version} - - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.9.8 - - - - com.sun.xml.bind - jaxb-core - ${jaxb.core.version} - - - - com.sun.xml.bind - jaxb-impl - ${jaxb.impl.version} - - - - - org.graalvm.sdk - graal-sdk - 20.3.0 - - - org.graalvm.js - js - 20.3.0 - runtime - - - org.graalvm.js - js-scriptengine - 20.3.0 - - - org.graalvm.tools - profiler - 20.3.0 - runtime - - - org.graalvm.tools - chromeinspector - 20.3.0 - runtime - + + org.junit.platform + junit-platform-launcher + 1.7.2 + test + + + org.junit.jupiter + junit-jupiter + ${junit.jupiter.version} + test + - - - - - org.apache.logging.log4j - log4j-api - 2.14.0 - - - - org.apache.logging.log4j - log4j-core - 2.14.0 - - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.14.0 - - - - org.assertj - assertj-core - 3.19.0 - test - - - - org.junit.platform - junit-platform-launcher - 1.7.2 - test - - - org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - - 11 - 11 - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - **/*Integrated*Test*.java - **/*IntegrationTest.java - **/*IntegrationTests.java - - - **/*Test*.java - - false - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - run-tests - integration-test - - integration-test - verify - - - - - - 1 - false - - **/*Integrated*Test*.java - **/*IntegrationTest.java - **/*IntegrationTests.java - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${javadoc.name} - ${javadoc.name} - false - false - false - false - - -Xdoclint:none - -Xdoclint:none - none - - - - attach-javadoc - - jar - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar-no-fork - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - - org.apache.maven.plugins - maven-release-plugin - ${release.plugin.version} - - - org.apache.maven.plugins - maven-gpg-plugin - ${gpg.plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.plugin.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${failsafe.plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.plugin.version} - - - org.apache.maven.plugins - maven-source-plugin - ${source.plugin.version} - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus.staging.plugin.version} - - - org.antlr - antlr4-maven-plugin - ${antlr4.version} - - - org.codehaus.mojo - exec-maven-plugin - ${exec.plugin.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - ${enforcer.plugin.version} - - - org.apache.maven.plugins - maven-clean-plugin - ${clean.plugin.version} - - - - org.apache.maven.plugins - maven-resources-plugin - ${resources.plugin.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${jar.plugin.version} - - - org.apache.maven.plugins - maven-install-plugin - ${install.plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${deploy.plugin.version} - - - - - - - - - - Jonathan Shook - jshook@gmail.com - nosqlbench.io - http://nosqlbench.io/ - - - Sebastián Estévez - estevezsebastian@gmail.com - nosqlbench.io - http://nosqlbench.io/ - - - - - - ossrh-snapshot - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - - - - release - + - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - + + org.apache.maven.plugins + maven-compiler-plugin - - --pinentry-mode - loopback - + true + + 11 + 11 + + + + + - - - - - - + - + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/*Integrated*Test*.java + **/*IntegrationTest.java + **/*IntegrationTests.java + + + **/*Test*.java + + false + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-tests + integration-test + + integration-test + verify + + + + + + 1 + false + + **/*Integrated*Test*.java + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${javadoc.name} + ${javadoc.name} + false + false + false + false + + -Xdoclint:none + -Xdoclint:none + none + + + + attach-javadoc + + jar + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar-no-fork + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + + + org.apache.maven.plugins + maven-release-plugin + ${release.plugin.version} + + + org.apache.maven.plugins + maven-gpg-plugin + ${gpg.plugin.version} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${failsafe.plugin.version} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.plugin.version} + + + org.apache.maven.plugins + maven-source-plugin + ${source.plugin.version} + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus.staging.plugin.version} + + + org.antlr + antlr4-maven-plugin + ${antlr4.version} + + + org.codehaus.mojo + exec-maven-plugin + ${exec.plugin.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.plugin.version} + + + org.apache.maven.plugins + maven-clean-plugin + ${clean.plugin.version} + + + + org.apache.maven.plugins + maven-resources-plugin + ${resources.plugin.version} + + + org.apache.maven.plugins + maven-jar-plugin + ${jar.plugin.version} + + + org.apache.maven.plugins + maven-install-plugin + ${install.plugin.version} + + + org.apache.maven.plugins + maven-deploy-plugin + ${deploy.plugin.version} + + + + + + + + + + Jonathan Shook + jshook@gmail.com + nosqlbench.io + http://nosqlbench.io/ + + + Sebastián Estévez + estevezsebastian@gmail.com + nosqlbench.io + http://nosqlbench.io/ + + + + + + ossrh-snapshot + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + + + + + release + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + + From 9c91ad713640ca89f8b117544a3209e96cd6cf32 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 6 Oct 2021 17:06:17 -0500 Subject: [PATCH 07/53] enhance diagnostics for driver loader --- .../main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java b/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java index 92ad6b3aa..1d0ebb0c8 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java @@ -63,6 +63,7 @@ public class SimpleServiceLoader { providers = new LinkedHashMap<>(); loader.stream().forEach(provider -> { + logger.trace("loading provider: " + provider.type()); Class type = provider.type(); if (!type.isAnnotationPresent(Service.class)) { throw new RuntimeException( From 1d625f411a6b0ecc9e904f3728c82e9579f006c2 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 6 Oct 2021 17:49:27 -0500 Subject: [PATCH 08/53] add S3 URL Handler --- nb-api/pom.xml | 10 +++ .../nb/addins/s3urls/S3ClientCache.java | 41 +++++++++ .../nb/addins/s3urls/S3UrlConnection.java | 31 +++++++ .../nb/addins/s3urls/S3UrlFields.java | 85 +++++++++++++++++++ .../nb/addins/s3urls/S3UrlStreamHandler.java | 21 +++++ .../s3urls/S3UrlStreamHandlerProvider.java | 21 +++++ .../addins/s3urls/S3UrlStreamHandlerTest.java | 53 ++++++++++++ 7 files changed, 262 insertions(+) create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java create mode 100644 nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java diff --git a/nb-api/pom.xml b/nb-api/pom.xml index b3e5d4891..4ea2a44e5 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -64,6 +64,16 @@ oshi-core + + com.amazonaws + aws-java-sdk-s3 + 1.12.12 + + + javax.xml.bind + jaxb-api + 2.4.0-b180830.0359 + diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java new file mode 100644 index 000000000..8908c76c1 --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java @@ -0,0 +1,41 @@ +package io.nosqlbench.nb.addins.s3urls; + +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; + +import java.util.WeakHashMap; + +/** + * This client cache uses the credentials provided in a URL to create + * a fingerprint, and then creates a customized S3 client for each unique + * instance. If these clients are not used, they are allowed to be expired + * from the map and collected. + */ +public class S3ClientCache { + + private final WeakHashMap cache = new WeakHashMap<>(); + + public S3ClientCache() { + } + + public AmazonS3 get(S3UrlFields fields) { + AmazonS3 s3 = cache.computeIfAbsent(fields.credentialsFingerprint(), + cfp -> createAuthorizedClient(fields)); + return s3; + } + + private AmazonS3 createAuthorizedClient(S3UrlFields fields) { + if (fields.accessKey!=null && fields.secretKey!=null) { + AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard(); + AWSCredentials specialcreds = new BasicAWSCredentials(fields.accessKey, fields.secretKey); + builder = builder.withCredentials(new AWSStaticCredentialsProvider(specialcreds)); + return builder.build(); + } else { + return AmazonS3ClientBuilder.defaultClient(); + } + } + +} diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java new file mode 100644 index 000000000..093661326 --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java @@ -0,0 +1,31 @@ +package io.nosqlbench.nb.addins.s3urls; + +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.model.S3Object; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; + +public class S3UrlConnection extends URLConnection { + + private final S3ClientCache clientCache; + + protected S3UrlConnection(S3ClientCache clientCache, URL url) { + super(url); + this.clientCache = clientCache; + } + + @Override + public InputStream getInputStream() throws IOException { + S3UrlFields fields = new S3UrlFields(url); + AmazonS3 s3 = clientCache.get(fields); + S3Object object = s3.getObject(fields.bucket, fields.key); + return object.getObjectContent(); + } + + @Override + public void connect() throws IOException { + } +} diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java new file mode 100644 index 000000000..e77331f4f --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java @@ -0,0 +1,85 @@ +package io.nosqlbench.nb.addins.s3urls; + +import java.net.URL; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.Objects; + +public class S3UrlFields { + + public final String bucket; + public final String key; + public final String secretKey; + public final String accessKey; + private final String endpoint; + + public S3UrlFields(URL url) { + + String accessKey = null; + String secretKey = null; + + String userinfo = url.getUserInfo(); + if (userinfo != null) { + String[] userfields = userinfo.split(":", 2); + accessKey = URLDecoder.decode(userfields[0], StandardCharsets.UTF_8); + secretKey = URLDecoder.decode(userfields[1], StandardCharsets.UTF_8); + } else { + String query = url.getQuery(); + if (query != null) { + for (String qs : query.split("&")) { + String[] words = qs.split(":", 2); + if (words[0].equals("accessKey")) { + accessKey = URLDecoder.decode(words[1], StandardCharsets.UTF_8); + } else if (words[0].equals("secretKey")) { + secretKey = URLDecoder.decode(words[1], StandardCharsets.UTF_8); + } + } + } + } + + // https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html + + this.accessKey = accessKey; + this.secretKey = secretKey; + + String[] bucketAndEndpoint = url.getHost().split("\\.", 2); + this.bucket = bucketAndEndpoint[0]; + this.endpoint = (bucketAndEndpoint.length==2) ? bucketAndEndpoint[1] : ""; + this.key = url.getPath().substring(1); + } + + public CredentialsFingerprint credentialsFingerprint() { + return new CredentialsFingerprint(this); + } + + public static class CredentialsFingerprint { + private final S3UrlFields fields; + + public CredentialsFingerprint(S3UrlFields fields) { + this.fields = fields; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + S3UrlFields that = (S3UrlFields) o; + + if (!Objects.equals(fields.secretKey, that.secretKey)) return false; + if (!Objects.equals(fields.accessKey, that.accessKey)) return false; + return Objects.equals(fields.endpoint, that.endpoint); + } + + @Override + public int hashCode() { + int result = (fields.secretKey != null ? fields.secretKey.hashCode() : 0); + result = 31 * result + (fields.accessKey != null ? fields.accessKey.hashCode() : 0); + result = 31 * result + (fields.endpoint != null ? fields.endpoint.hashCode() : 0); + return result; + } + + } + + +} diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java new file mode 100644 index 000000000..cc0c65d67 --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java @@ -0,0 +1,21 @@ +package io.nosqlbench.nb.addins.s3urls; + +import java.io.IOException; +import java.net.URL; +import java.net.URLStreamHandler; + +public class S3UrlStreamHandler extends URLStreamHandler { + + private final S3ClientCache clientCache; + private final String protocol; + + public S3UrlStreamHandler(S3ClientCache clientCache, String protocol) { + this.clientCache = clientCache; + this.protocol = protocol; + } + + @Override + protected S3UrlConnection openConnection(URL url) throws IOException { + return new S3UrlConnection(clientCache, url); + } +} diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java new file mode 100644 index 000000000..99f7399a9 --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java @@ -0,0 +1,21 @@ +package io.nosqlbench.nb.addins.s3urls; + +import io.nosqlbench.nb.annotations.Service; + +import java.net.URLStreamHandler; +import java.net.spi.URLStreamHandlerProvider; + +@Service(value = URLStreamHandlerProvider.class, selector = "s3") +public class S3UrlStreamHandlerProvider extends URLStreamHandlerProvider { + + private final S3ClientCache clientCache = new S3ClientCache(); + + @Override + public URLStreamHandler createURLStreamHandler(String protocol) { + if ("s3".equals(protocol)) { + return new S3UrlStreamHandler(clientCache, protocol); + } + return null; + } + +} diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java new file mode 100644 index 000000000..be9f5fcd8 --- /dev/null +++ b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java @@ -0,0 +1,53 @@ +package io.nosqlbench.nb.addins.s3urls; + +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import com.amazonaws.services.s3.model.Bucket; +import com.amazonaws.services.s3.model.PutObjectResult; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; + +import static org.assertj.core.api.Assertions.assertThat; + +public class S3UrlStreamHandlerTest { + + /** + * This test requires that you have credentials already configured on your local system + * for S3. It creates an object using the s3 client directly, then uses a generic + * URL method to access and verify the contents. + */ + @Disabled + @Test + public void sanityCheckS3UrlHandler() { + AmazonS3 client = AmazonS3ClientBuilder.defaultClient(); + + String bucketName = "nb-extension-test"; + String keyName = "key-name"; + String testValue = "test-value"; + + Bucket bucket = null; + + if (!client.doesBucketExistV2(bucketName)) { + bucket = client.createBucket(bucketName); + } + PutObjectResult putObjectResult = client.putObject(bucketName, keyName, testValue); + assertThat(putObjectResult).isNotNull(); + + try { + URL url = new URL("s3://"+bucketName+"/"+keyName); + InputStream is = url.openStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is)); + String line = br.readLine(); + assertThat(line).isEqualTo(testValue); + System.out.println(line); + } catch (Exception e) { + e.printStackTrace(); + } + } + +} From 11073cf0aae321b8401e54c0d40a14332e020162 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Thu, 7 Oct 2021 14:56:51 -0500 Subject: [PATCH 09/53] Address Shooky's comment in PR#364. --- .../driver/pulsar/ops/ReadyPulsarOp.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 7ee2320d5..03c5bbdd3 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -11,7 +11,10 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.pulsar.client.admin.Namespaces; import org.apache.pulsar.client.admin.PulsarAdmin; +import org.apache.pulsar.client.admin.PulsarAdminException; +import org.apache.pulsar.client.admin.Topics; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Reader; @@ -450,29 +453,32 @@ public class ReadyPulsarOp implements OpDispenser { (l) -> clientSpace.getTransactionSupplier(); //TODO make it dependant on current cycle? LongFunction topicMsgDedupFunc = (l) -> { - String topic = topic_uri_func.apply(l); - String namespace = PulsarActivityUtil.getFullNamespaceName(topic); + String topicName = topic_uri_func.apply(l); + String nsName = PulsarActivityUtil.getFullNamespaceName(topicName); PulsarAdmin pulsarAdmin = pulsarActivity.getPulsarAdmin(); // Check namespace-level deduplication setting // - default to broker level deduplication setting - boolean nsMsgDedup = brokerMsgDupFunc.apply(l); + // (as expressed in NB yaml file) + boolean topicMsgDedup = brokerMsgDupFunc.apply(l); try { - Boolean dedupStatus = pulsarAdmin.namespaces().getDeduplicationStatus(namespace); - if (dedupStatus != null) nsMsgDedup = dedupStatus; - } - catch (Exception e) { + Namespaces namespaces = pulsarAdmin.namespaces(); + if (namespaces != null) { + Boolean dedupStatus = namespaces.getDeduplicationStatus(nsName); + if (dedupStatus != null) topicMsgDedup = dedupStatus; + } + } catch (PulsarAdminException e) { // it is fine if we're unable to check namespace level setting; use default } // Check topic-level deduplication setting - // - default to namespace level deduplication setting - boolean topicMsgDedup = nsMsgDedup; try { - Boolean dedupStatus = pulsarAdmin.topics().getDeduplicationStatus(namespace); - if (dedupStatus != null) topicMsgDedup = dedupStatus; - } - catch (Exception e) { + Topics topics = pulsarAdmin.topics(); + if (topics != null) { + Boolean dedupStatus = pulsarAdmin.topics().getDeduplicationStatus(topicName); + if (dedupStatus != null) topicMsgDedup = dedupStatus; + } + } catch (PulsarAdminException e) { // it is fine if we're unable to check topic level setting; use default } From 2876e102a6ac68ce8d0f60c16ee33aeeed530a9e Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Sat, 9 Oct 2021 12:29:22 -0500 Subject: [PATCH 10/53] Remove namespace and topic level dedup setting check for each run, which is too much overhead. --- .../driver/pulsar/ops/ReadyPulsarOp.java | 38 +++---------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 03c5bbdd3..8a49170a4 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -452,39 +452,11 @@ public class ReadyPulsarOp implements OpDispenser { LongFunction> transactionSupplierFunc = (l) -> clientSpace.getTransactionSupplier(); //TODO make it dependant on current cycle? - LongFunction topicMsgDedupFunc = (l) -> { - String topicName = topic_uri_func.apply(l); - String nsName = PulsarActivityUtil.getFullNamespaceName(topicName); - PulsarAdmin pulsarAdmin = pulsarActivity.getPulsarAdmin(); - - // Check namespace-level deduplication setting - // - default to broker level deduplication setting - // (as expressed in NB yaml file) - boolean topicMsgDedup = brokerMsgDupFunc.apply(l); - try { - Namespaces namespaces = pulsarAdmin.namespaces(); - if (namespaces != null) { - Boolean dedupStatus = namespaces.getDeduplicationStatus(nsName); - if (dedupStatus != null) topicMsgDedup = dedupStatus; - } - } catch (PulsarAdminException e) { - // it is fine if we're unable to check namespace level setting; use default - } - - // Check topic-level deduplication setting - try { - Topics topics = pulsarAdmin.topics(); - if (topics != null) { - Boolean dedupStatus = pulsarAdmin.topics().getDeduplicationStatus(topicName); - if (dedupStatus != null) topicMsgDedup = dedupStatus; - } - } catch (PulsarAdminException e) { - // it is fine if we're unable to check topic level setting; use default - } - - return topicMsgDedup; - }; - + // TODO: Ignore namespace and topic level dedup check on the fly + // this will impact the consumer performance significantly + // Consider using caching or Memoizer in the future? + // (https://www.baeldung.com/guava-memoizer) + LongFunction topicMsgDedupFunc = brokerMsgDupFunc; LongFunction> consumerFunc = (l) -> clientSpace.getConsumer( From 8da6664fafc4e8fca9f8db4f07ac1e69761ffcc1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:21:45 -0500 Subject: [PATCH 11/53] typo fix --- .../src/main/resources/docker-metrics.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/engine-cli/src/main/resources/docker-metrics.md b/engine-cli/src/main/resources/docker-metrics.md index b4039b678..45392aa20 100644 --- a/engine-cli/src/main/resources/docker-metrics.md +++ b/engine-cli/src/main/resources/docker-metrics.md @@ -1,19 +1,19 @@ # docker-metrics -Enlist nosqlbench to stand up your metrics infrastructure using a local +Enlist nosqlbench to stand up your metrics infrastructure using a local docker runtime: --docker-metrics -When this option is set, nosqlbench will start graphite, prometheus, +When this option is set, nosqlbench will start graphite, prometheus, and grafana dockers (if-needed) automatically on your local system , configure them to work together, and point nosqlbench to send metrics and annotations to the system automatically. -The inclued NoSQLBench dashboard uses the default grafana credentials of +The included NoSQLBench dashboard uses the default grafana credentials of admin:admin. You can find this dashboard by browsing to the "manage dashboards" section of grafana. - + # remote docker-metrics It is possible to use `--docker-metrics` to set up a metrics collector @@ -30,7 +30,7 @@ and other nodes, you can use this pattern: # on the collector node ... --pin --docker-metrics - + # on other nodes ... --pin --docker-metrics-at @@ -46,7 +46,7 @@ of running the following by hand: # pull and run the graphite-exporter container docker run -d -p 9108:9108 -p 9109:9109 -p 9109:9109/udp prom/graphite-exporter -Configuration files which are used by the docker containers are stored in: +Configuration files which are used by the docker containers are stored in: $HOME/.nosqlbench @@ -55,14 +55,14 @@ Configuration files which are used by the docker containers are stored in: If you need to clear the state for a local docker metrics stack, you can remove these directories. - # DASHBOARDS AND METRICS WILL BE LOST IF YOU DO THIS + # DASHBOARDS AND METRICS WILL BE LOST IF YOU DO THIS rm ~/.nosqlbench/{grafana,prometheus,prometheus-conf,graphite-exporter} ## Manually installing dockers # pull and run the prometheus container docker run -d -p 9090:9090 -v '/.prometheus:/etc/prometheus' prom/prometheus --config.file=/etc/prometheus/prometheus.yml" --storage.tsdb.path=/prometheus" --storage.tsdb.retention=183d --web.enable-lifecycle - + # pull and run the grafana container docker run -d -p 3000:3000 -v grafana/grafana @@ -70,7 +70,7 @@ If you need to clear the state for a local docker metrics stack, you These may allow you to send snapshot data to a specially configured remote grafana instance. - + GF_SECURITY_ADMIN_PASSWORD=admin GF_AUTH_ANONYMOUS_ENABLED="true" GF_SNAPSHOTS_EXTERNAL_SNAPSHOT_URL=http://54.165.144.56:3001 @@ -82,11 +82,11 @@ You can use the grafana api to set up the datasource and dashboard if you have other tools which integrate with grafana: # These are not commands, they are only provides API parameters - + POST http://localhost:3000/api/dashboards/db analysis.json # (found in resources/docker/dashboards/analysis.json) - + POST http://localhost:3000/api/datasources prometheus-datasource.yaml # (found in resources/docker/datasources/prometheus-datasource.yaml) From 9fccf8c20ce05d2a05af278a2e1535214e8a2f4d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:21:56 -0500 Subject: [PATCH 12/53] new scripting extension: shutdown; scripted shutdown hooks --- .../engine/shutdown/ShutdownHookPlugin.java | 32 +++++++++++++++++++ .../shutdown/ShutdownHookPluginMetadata.java | 22 +++++++++++++ .../shutdown/ShutdownRunnableFunction.java | 32 +++++++++++++++++++ .../script/AsyncScriptIntegrationTests.java | 8 +++++ 4 files changed, 94 insertions(+) create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPlugin.java create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPluginMetadata.java create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownRunnableFunction.java diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPlugin.java new file mode 100644 index 000000000..9177fee5d --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPlugin.java @@ -0,0 +1,32 @@ +package io.nosqlbench.engine.shutdown; + +import com.codahale.metrics.MetricRegistry; +import org.apache.logging.log4j.Logger; + +import javax.script.ScriptContext; +import java.util.function.Function; + +public class ShutdownHookPlugin { + private final Logger logger; + private final MetricRegistry metricRegistry; + private final ScriptContext scriptContext; + + public ShutdownHookPlugin(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) { + + this.logger = logger; + this.metricRegistry = metricRegistry; + this.scriptContext = scriptContext; + } + + public void addShutdownHook(String name, Object f) { + if (!(f instanceof Function)) { + throw new RuntimeException("The object provided to the shutdown hook plugin was not recognized as a function."); + } + String shutdownName = "shutdown-function-" + name; + Thread runnable = new ShutdownRunnableFunction(logger, name, (Function)f); + runnable.setName(shutdownName); + Runtime.getRuntime().addShutdownHook(runnable); + logger.info("Registered shutdown hook to run under name '" + shutdownName + "'"); + + } +} diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPluginMetadata.java b/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPluginMetadata.java new file mode 100644 index 000000000..a1bfba834 --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownHookPluginMetadata.java @@ -0,0 +1,22 @@ +package io.nosqlbench.engine.shutdown; + +import com.codahale.metrics.MetricRegistry; +import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; +import io.nosqlbench.nb.annotations.Service; +import org.apache.logging.log4j.Logger; + +import javax.script.ScriptContext; + +@Service(value=ScriptingPluginInfo.class,selector = "shutdown") +public class ShutdownHookPluginMetadata implements ScriptingPluginInfo { + + @Override + public String getDescription() { + return "Register shutdown hooks in the form of javascript functions."; + } + + @Override + public ShutdownHookPlugin getExtensionObject(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) { + return new ShutdownHookPlugin(logger,metricRegistry,scriptContext); + } +} diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownRunnableFunction.java b/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownRunnableFunction.java new file mode 100644 index 000000000..03c374aac --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/shutdown/ShutdownRunnableFunction.java @@ -0,0 +1,32 @@ +package io.nosqlbench.engine.shutdown; + +import org.apache.logging.log4j.Logger; + +import java.util.function.Function; + + +public class ShutdownRunnableFunction extends Thread { + private final String name; + private final Function function; + private final Logger logger; + + public ShutdownRunnableFunction(Logger logger, String name, Function function) { + this.logger = logger; + this.name = name; + this.function = (Function)function; + } + + @Override + public void run() { + logger.info("Running shutdown hook '" + name + "'..."); + try { + Object result = function.apply(new Object[0]); + if (result instanceof CharSequence) { + logger.info("shutdown hook returned output:\n" + ((CharSequence) result).toString()); + } + logger.info("Completed shutdown hook '" + name + "'..."); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java index 1c3e7c3a8..0404a3c6c 100644 --- a/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java +++ b/nb/src/test/java/io/nosqlbench/engine/core/script/AsyncScriptIntegrationTests.java @@ -237,6 +237,14 @@ public class AsyncScriptIntegrationTests { assertThat(scenarioResult.getIOLog()).contains("count: "); } + @Test + public void testShutdownHook() { + ScenarioResult scenarioResult = runScenario("extension_shutdown_hook"); + assertThat(scenarioResult.getIOLog()).doesNotContain("shutdown hook running").describedAs( + "shutdown hooks should not run in the same IO context as the main scenario" + ); + } + @Test public void testExceptionPropagationFromMotorThread() { ScenarioResult scenarioResult = runScenario("activityerror"); From b388a43e328a3c29010c2ecf5f8df6d09796d64e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:22:29 -0500 Subject: [PATCH 13/53] consolidate statedir initialization logic and docs --- engine-cli/src/main/resources/statedir.md | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 engine-cli/src/main/resources/statedir.md diff --git a/engine-cli/src/main/resources/statedir.md b/engine-cli/src/main/resources/statedir.md new file mode 100644 index 000000000..b1a364aef --- /dev/null +++ b/engine-cli/src/main/resources/statedir.md @@ -0,0 +1,38 @@ +# State Directory + +In order to maintain state for a NoSQLBench client instance, +a directory is used. The default directory will be auto-created +for you if you do not specify one. + +You can always override the state directory location by providing +an option like `--statedir=/tmp/testdir`, or `--statedir=$HOME/.nosqlbench`. + +Within the --statedir parameter, the following values will be expanded +automatically: + +- $HOME: the current user's home directory +- $USER: the current user's name +- $varname: Any other environment variable + +`$NBSTATEDIR` is a mechanism for setting and finding the local state +directory for NoSQLBench. It is a search path, delimited by +the ':' character. It allows both Java system properties +and shell environment variables. + +Multiple values may be specified, like with the PATH environment variable, +separated by colons. When none of the directories is found, +the last one in the list will be created. This is based on the convention +that more specific "override" directories are searched first, whereas more +global state is allowed as the fall-through case. Generally users will +want to keep their state in a single and uniform location, like +`$HOME/.nosqlbench`, but they will want the option of localizing configs for +directory-based test management. Thus, the default value for +--statedir is '$NBSTATEDIR:$PWD/.nosqlbench:$HOME/.nosqlbench'. + +Once NoSQLBench is past the CLI processing stage, the NBSTATEDIR becomes +a valid system property, and any internal access to environment variables +can also use this property. + +NoSQLBench developers should take care to use the +NBEnvironment class as the method to access environment variables. +(TODO: Add this to the developer guide) From 133760d8c989d2ae8f97b2d822e03efc343d6774 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:22:39 -0500 Subject: [PATCH 14/53] auto-init the last (fall-through) NBENVIRONMENT location first --- .../main/java/io/nosqlbench/engine/cli/NBCLIOptions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java index 67226e56c..3c77755e8 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java @@ -367,7 +367,7 @@ public class NBCLIOptions { private Path setStatePath() { if (statePathAccesses.size() > 0) { - throw new BasicError("The statedir must be set before it is used by other\n" + + throw new BasicError("The state dir must be set before it is used by other\n" + " options. If you want to change the statedir, be sure you do it before\n" + " dependent options. These parameters were called before this --statedir:\n" + statePathAccesses.stream().map(s -> "> " + s).collect(Collectors.joining("\n"))); @@ -376,7 +376,7 @@ public class NBCLIOptions { return this.statepath; } - List paths = NBEnvironment.INSTANCE.interpolate(":", statedirs); + List paths = NBEnvironment.INSTANCE.interpolateEach(":", statedirs); Path selected = null; for (String pathName : paths) { @@ -391,7 +391,7 @@ public class NBCLIOptions { } } if (selected == null) { - selected = Path.of(paths.get(0)); + selected = Path.of(paths.get(paths.size()-1)); } if (!Files.exists(selected)) { From e1e10bbaa8be0d90942d74fc768fc2406225d1b6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:22:50 -0500 Subject: [PATCH 15/53] allow session namer to use pre-defined timestamp --- .../main/java/io/nosqlbench/engine/cli/NBCLI.java | 5 +++-- .../io/nosqlbench/engine/cli/SessionNamerTest.java | 9 +++++---- .../nosqlbench/nb/api/metadata}/SessionNamer.java | 13 +++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) rename {engine-cli/src/main/java/io/nosqlbench/engine/cli => nb-api/src/main/java/io/nosqlbench/nb/api/metadata}/SessionNamer.java (76%) diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index fd2b65f62..2f445ed53 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -1,6 +1,7 @@ package io.nosqlbench.engine.cli; import io.nosqlbench.docsys.core.NBWebServerApp; +import io.nosqlbench.nb.api.metadata.SessionNamer; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogDumperUtility; import io.nosqlbench.engine.api.activityapi.cyclelog.outputs.cyclelog.CycleLogImporterUtility; @@ -21,7 +22,7 @@ import io.nosqlbench.engine.core.script.Scenario; import io.nosqlbench.engine.core.script.ScenariosExecutor; import io.nosqlbench.engine.core.script.ScriptParams; import io.nosqlbench.engine.docker.DockerMetricsManager; -import io.nosqlbench.nb.api.SystemId; +import io.nosqlbench.nb.api.metadata.SystemId; import io.nosqlbench.nb.api.annotations.Annotation; import io.nosqlbench.nb.api.annotations.Layer; import io.nosqlbench.nb.api.content.Content; @@ -93,7 +94,7 @@ public class NBCLI { loggerConfig.setConsoleLevel(NBLogLevel.ERROR); NBCLIOptions globalOptions = new NBCLIOptions(args, NBCLIOptions.Mode.ParseGlobalsOnly); - String sessionName = new SessionNamer().format(globalOptions.getSessionName()); + String sessionName = SessionNamer.format(globalOptions.getSessionName()); loggerConfig .setSessionName(sessionName) diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java index 326822339..318ea02c0 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java @@ -17,6 +17,7 @@ package io.nosqlbench.engine.cli; +import io.nosqlbench.nb.api.metadata.SessionNamer; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -26,18 +27,18 @@ public class SessionNamerTest { @Test public void testDefaultFormat() { SessionNamer namer = new SessionNamer(); - String name1 = namer.format(null); + String name1 = SessionNamer.format(null); assertThat(name1).matches("scenario_\\d{8}_\\d{6}_\\d{3}"); - String name2 = namer.format(""); + String name2 = SessionNamer.format(""); assertThat(name2).matches("scenario_\\d{8}_\\d{6}_\\d{3}"); } @Test public void testCustomFormat() { SessionNamer namer = new SessionNamer(); - String name1 = namer.format("Custom_session_name"); + String name1 = SessionNamer.format("Custom_session_name"); assertThat(name1).matches("Custom_session_name"); - String name2 = namer.format("TEST--%tQ"); + String name2 = SessionNamer.format("TEST--%tQ"); assertThat(name2).matches("TEST--\\d{13}"); } diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/SessionNamer.java b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java similarity index 76% rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/SessionNamer.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java index af5dde87d..ad85c271d 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/SessionNamer.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java @@ -15,11 +15,13 @@ * / */ -package io.nosqlbench.engine.cli; +package io.nosqlbench.nb.api.metadata; + +import java.util.Arrays; public class SessionNamer { - public String format(String sessionName) { + public static String format(String sessionName, long sessionTimeMillis) { String nameTemplate = sessionName; if (nameTemplate==null || nameTemplate.isEmpty()) { nameTemplate = "scenario_%tY%tm%td_%tH%tM%tS_%tL"; @@ -27,11 +29,14 @@ public class SessionNamer { int splits = nameTemplate.split("%").length -1; Long[] times = new Long[splits]; - long now = System.currentTimeMillis(); - for (int i = 0; i < times.length; i++) times[i] = now; + Arrays.fill(times, sessionTimeMillis); sessionName = String.format(nameTemplate, (Object[]) times); return sessionName; } + + public static String format(String sessionName) { + return format(sessionName, System.currentTimeMillis()); + } } From ff769c7bed66070d93d2cafa0fe50748c6107e97 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:22:59 -0500 Subject: [PATCH 16/53] Add S3 URL Handler --- .../s3urlhandler}/S3ClientCache.java | 4 +- .../s3urlhandler}/S3UrlConnection.java | 2 +- .../s3urlhandler}/S3UrlFields.java | 16 ++++++- .../s3urlhandler}/S3UrlStreamHandler.java | 2 +- .../S3UrlStreamHandlerProvider.java | 2 +- .../s3urlhandler}/S3UrlStreamHandlerTest.java | 9 ++-- .../nb/addins/s3/s3utils/S3UploaderDemo.java | 43 +++++++++++++++++++ .../nb/addins/s3/s3utils/S3UploaderTest.java | 21 +++++++++ 8 files changed, 89 insertions(+), 10 deletions(-) rename nb-api/src/main/java/io/nosqlbench/nb/addins/{s3urls => s3/s3urlhandler}/S3ClientCache.java (91%) rename nb-api/src/main/java/io/nosqlbench/nb/addins/{s3urls => s3/s3urlhandler}/S3UrlConnection.java (94%) rename nb-api/src/main/java/io/nosqlbench/nb/addins/{s3urls => s3/s3urlhandler}/S3UrlFields.java (86%) rename nb-api/src/main/java/io/nosqlbench/nb/addins/{s3urls => s3/s3urlhandler}/S3UrlStreamHandler.java (91%) rename nb-api/src/main/java/io/nosqlbench/nb/addins/{s3urls => s3/s3urlhandler}/S3UrlStreamHandlerProvider.java (92%) rename nb-api/src/test/java/io/nosqlbench/nb/addins/{s3urls => s3/s3urlhandler}/S3UrlStreamHandlerTest.java (88%) create mode 100644 nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java create mode 100644 nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3ClientCache.java similarity index 91% rename from nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java rename to nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3ClientCache.java index 8908c76c1..a49d49665 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3ClientCache.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3ClientCache.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.addins.s3urls; +package io.nosqlbench.nb.addins.s3.s3urlhandler; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSStaticCredentialsProvider; @@ -22,7 +22,7 @@ public class S3ClientCache { } public AmazonS3 get(S3UrlFields fields) { - AmazonS3 s3 = cache.computeIfAbsent(fields.credentialsFingerprint(), + AmazonS3 s3 = cache.computeIfAbsent(fields.getCredentialsFingerprint(), cfp -> createAuthorizedClient(fields)); return s3; } diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlConnection.java similarity index 94% rename from nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java rename to nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlConnection.java index 093661326..e9175e973 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlConnection.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlConnection.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.addins.s3urls; +package io.nosqlbench.nb.addins.s3.s3urlhandler; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.S3Object; diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlFields.java similarity index 86% rename from nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java rename to nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlFields.java index e77331f4f..1b56922ad 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlFields.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlFields.java @@ -1,5 +1,6 @@ -package io.nosqlbench.nb.addins.s3urls; +package io.nosqlbench.nb.addins.s3.s3urlhandler; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; @@ -13,6 +14,15 @@ public class S3UrlFields { public final String accessKey; private final String endpoint; + public static S3UrlFields fromURLString(String urlString) { + URL url = null; + try { + url = new URL(urlString); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + return new S3UrlFields(url); + } public S3UrlFields(URL url) { String accessKey = null; @@ -52,6 +62,10 @@ public class S3UrlFields { return new CredentialsFingerprint(this); } + public CredentialsFingerprint getCredentialsFingerprint() { + return null; + } + public static class CredentialsFingerprint { private final S3UrlFields fields; diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandler.java similarity index 91% rename from nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java rename to nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandler.java index cc0c65d67..f77ff0aaa 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandler.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandler.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.addins.s3urls; +package io.nosqlbench.nb.addins.s3.s3urlhandler; import java.io.IOException; import java.net.URL; diff --git a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java similarity index 92% rename from nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java rename to nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java index 99f7399a9..389903c40 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerProvider.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.addins.s3urls; +package io.nosqlbench.nb.addins.s3.s3urlhandler; import io.nosqlbench.nb.annotations.Service; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java similarity index 88% rename from nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java rename to nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java index be9f5fcd8..0139431ab 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3urls/S3UrlStreamHandlerTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.addins.s3urls; +package io.nosqlbench.nb.addins.s3.s3urlhandler; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; @@ -16,6 +16,10 @@ import static org.assertj.core.api.Assertions.assertThat; public class S3UrlStreamHandlerTest { + public static String bucketName = "nb-extension-test"; + public static String keyName = "key-name"; + public static String testValue = "test-value"; + /** * This test requires that you have credentials already configured on your local system * for S3. It creates an object using the s3 client directly, then uses a generic @@ -26,9 +30,6 @@ public class S3UrlStreamHandlerTest { public void sanityCheckS3UrlHandler() { AmazonS3 client = AmazonS3ClientBuilder.defaultClient(); - String bucketName = "nb-extension-test"; - String keyName = "key-name"; - String testValue = "test-value"; Bucket bucket = null; diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java new file mode 100644 index 000000000..040002af7 --- /dev/null +++ b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java @@ -0,0 +1,43 @@ +package io.nosqlbench.nb.addins.s3.s3utils; + +import com.amazonaws.services.s3.transfer.MultipleFileUpload; +import com.amazonaws.services.s3.transfer.TransferManager; +import com.amazonaws.services.s3.transfer.TransferManagerBuilder; +import io.nosqlbench.nb.addins.s3.s3urlhandler.S3ClientCache; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; + +/** + * This is a generic s3 directory uploader which is neither a scripting plugin nor a standard URL handler. + */ +public class S3UploaderDemo { + + private final S3ClientCache clientCache = new S3ClientCache(); + + private static final Logger logger = LogManager.getLogger(S3UploaderDemo.class); + + public MultipleFileUpload syncup(Path sourcePath, String bucket, String prefix) { + + if (!FileSystems.getDefault().equals(sourcePath.getFileSystem())) { + throw new RuntimeException("The file must reside on the default filesystem to be uploaded by S3."); + } + if (!Files.isDirectory(sourcePath, LinkOption.NOFOLLOW_LINKS)) { + throw new RuntimeException("path '" + sourcePath + "' is not a directory."); + } + TransferManager tm = TransferManagerBuilder.defaultTransferManager(); + MultipleFileUpload mfu = tm.uploadDirectory(bucket, prefix, sourcePath.toFile(), true); + try { + mfu.waitForCompletion(); + } catch (InterruptedException e) { + throw new RuntimeException("Multi-file upload was interrupted!"); + } + tm.shutdownNow(); + return mfu; + } + +} diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java new file mode 100644 index 000000000..218587dcb --- /dev/null +++ b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java @@ -0,0 +1,21 @@ +package io.nosqlbench.nb.addins.s3.s3utils; + +import com.amazonaws.services.s3.transfer.MultipleFileUpload; +import io.nosqlbench.nb.addins.s3.s3urlhandler.S3UrlStreamHandlerTest; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.nio.file.Path; + +public class S3UploaderTest { + + @Disabled + @Test + public void testDirUpload() { + Path path = Path.of("src/test/resources/nesteddir1"); + S3UploaderDemo ul = new S3UploaderDemo(); + MultipleFileUpload mfu = ul.syncup(path, S3UrlStreamHandlerTest.bucketName, "test-prefix"); + System.out.println(mfu); + } + +} From bbeee5cb1a4c5d7a0d33aa38f5356d254f7ce398 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:23:11 -0500 Subject: [PATCH 17/53] new scripting extension: s3; S3 directory uploader --- .../extensions/s3uploader/S3Uploader.java | 82 +++++++++++++++++++ .../s3uploader/S3UploaderPluginData.java | 32 ++++++++ 2 files changed, 114 insertions(+) create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3UploaderPluginData.java diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java new file mode 100644 index 000000000..a96911ea3 --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java @@ -0,0 +1,82 @@ +package io.nosqlbench.engine.extensions.s3uploader; + +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.transfer.MultipleFileUpload; +import com.amazonaws.services.s3.transfer.TransferManager; +import com.amazonaws.services.s3.transfer.TransferManagerBuilder; +import com.codahale.metrics.MetricRegistry; +import io.nosqlbench.nb.addins.s3.s3urlhandler.S3ClientCache; +import io.nosqlbench.nb.addins.s3.s3urlhandler.S3UrlFields; +import io.nosqlbench.nb.api.NBEnvironment; +import io.nosqlbench.nb.api.metadata.ScenarioMetadata; +import io.nosqlbench.nb.api.metadata.ScenarioMetadataAware; +import org.apache.logging.log4j.Logger; + +import javax.script.ScriptContext; +import java.io.File; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.util.Map; + +public class S3Uploader implements ScenarioMetadataAware { + private final Logger logger; + private final MetricRegistry metricRegistry; + private final ScriptContext scriptContext; + private ScenarioMetadata scenarioMetadata; + + public S3Uploader(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) { + this.logger = logger; + this.metricRegistry = metricRegistry; + this.scriptContext = scriptContext; + } + + public String uploadDirToUrl(String localFilePath, String urlTemplate) { + return uploadDirToUrlTokenized(localFilePath, urlTemplate, Map.of()); + } + + /** + * Upload the local file path to the specified URL, and then return the URL of the + * bucket in its fully expanded form. + * This requires you to specify a valid S3 url with place-holder tokens, such as + * 
{@code s3://bucketname/prefix1/prefix2/DATA}
+ * Before processing, some tokens will be automatically expanded based on local node + * info. These tokens include: + * + * @return The bucket URL of the expaneded name. + */ + public String uploadDirToUrlTokenized(String localFilePath, String urlTemplate, Map params) { + + + Path sourcePath = Path.of(localFilePath); + if (!FileSystems.getDefault().equals(sourcePath.getFileSystem())) { + throw new RuntimeException("The file must reside on the default filesystem to be uploaded by S3."); + } + if (!Files.isDirectory(sourcePath, LinkOption.NOFOLLOW_LINKS)) { + throw new RuntimeException("path '" + sourcePath + "' is not a directory."); + } + File sourceDir = sourcePath.toFile(); + + String url = NBEnvironment.INSTANCE + .interpolateWithTimestamp(urlTemplate,scenarioMetadata.getStartedAt(),params) + .orElseThrow(); + S3UrlFields fields = S3UrlFields.fromURLString(url); + S3ClientCache s3ClientCache = new S3ClientCache(); + AmazonS3 s3 = s3ClientCache.get(fields); + TransferManager xfers = TransferManagerBuilder.standard().withS3Client(s3).build(); + String prefix = fields.key; + MultipleFileUpload mfu = xfers.uploadDirectory(fields.bucket, prefix, sourceDir, true); + try { + mfu.waitForCompletion(); + } catch (InterruptedException e) { + throw new RuntimeException("Multi-file upload was interrupted."); + } + return url; + } + + @Override + public void setScenarioMetadata(ScenarioMetadata metadata) { + this.scenarioMetadata = metadata; + } +} diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3UploaderPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3UploaderPluginData.java new file mode 100644 index 000000000..9f59f1acd --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3UploaderPluginData.java @@ -0,0 +1,32 @@ +package io.nosqlbench.engine.extensions.s3uploader; + +import com.codahale.metrics.MetricRegistry; +import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; +import io.nosqlbench.nb.annotations.Service; +import io.nosqlbench.nb.api.metadata.ScenarioMetadata; +import io.nosqlbench.nb.api.metadata.ScenarioMetadataAware; +import org.apache.logging.log4j.Logger; + +import javax.script.ScriptContext; + +@Service(value = ScriptingPluginInfo.class, selector = "s3") +public class S3UploaderPluginData implements ScriptingPluginInfo, ScenarioMetadataAware { + private ScenarioMetadata scenarioMetadata; + + @Override + public String getDescription() { + return "Allow for uploading or downloading a directory from S3"; + } + + @Override + public S3Uploader getExtensionObject(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) { + S3Uploader uploader = new S3Uploader(logger, metricRegistry, scriptContext); + ScenarioMetadataAware.apply(uploader,scenarioMetadata); + return uploader; + } + + @Override + public void setScenarioMetadata(ScenarioMetadata metadata) { + this.scenarioMetadata = metadata; + } +} From 8c6d0cfe57897db11f4ee4981b3d586e576741e5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:23:19 -0500 Subject: [PATCH 18/53] new decorator API: share Scenario metadata to interested types --- .../analyzer/GrafanaRegionAnalyzer.java | 2 +- .../annotator/GrafanaMetricsAnnotator.java | 2 +- .../engine/core/script/Scenario.java | 22 +++++++-- .../nb/api/metadata/ScenarioMetadata.java | 47 +++++++++++++++++++ .../api/metadata/ScenarioMetadataAware.java | 21 +++++++++ .../nb/api/{ => metadata}/SystemId.java | 39 ++++++++++++++- .../io/nosqlbench/nb/api/SystemIdTest.java | 16 +++++++ 7 files changed, 141 insertions(+), 8 deletions(-) create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java create mode 100644 nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadataAware.java rename nb-api/src/main/java/io/nosqlbench/nb/api/{ => metadata}/SystemId.java (60%) diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java index 071499e2f..177318364 100644 --- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java +++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java @@ -5,7 +5,7 @@ import io.nosqlbench.engine.clients.grafana.GStitcher; import io.nosqlbench.engine.clients.grafana.GrafanaClient; import io.nosqlbench.engine.clients.grafana.GrafanaClientConfig; import io.nosqlbench.engine.clients.grafana.transfer.*; -import io.nosqlbench.nb.api.SystemId; +import io.nosqlbench.nb.api.metadata.SystemId; import java.nio.file.Path; import java.time.Instant; diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java index 05134d91a..a41f121f9 100644 --- a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java +++ b/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java @@ -6,7 +6,7 @@ import io.nosqlbench.engine.clients.grafana.transfer.GAnnotation; import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.nb.api.NBEnvironment; import io.nosqlbench.nb.api.OnError; -import io.nosqlbench.nb.api.SystemId; +import io.nosqlbench.nb.api.metadata.SystemId; import io.nosqlbench.nb.api.annotations.Annotation; import io.nosqlbench.nb.api.annotations.Annotator; import io.nosqlbench.nb.api.config.*; diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java index 6b82d7917..6f8e98a5a 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java @@ -25,6 +25,9 @@ import io.nosqlbench.engine.core.lifecycle.ScenarioController; import io.nosqlbench.engine.core.lifecycle.ScenarioResult; import io.nosqlbench.engine.core.annotation.Annotators; import io.nosqlbench.engine.core.metrics.PolyglotMetricRegistryBindings; +import io.nosqlbench.nb.api.metadata.ScenarioMetadata; +import io.nosqlbench.nb.api.metadata.ScenarioMetadataAware; +import io.nosqlbench.nb.api.metadata.SystemId; import io.nosqlbench.nb.api.annotations.Layer; import io.nosqlbench.nb.api.annotations.Annotation; import org.apache.logging.log4j.LogManager; @@ -46,10 +49,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.concurrent.Callable; import java.util.stream.Collectors; @@ -63,6 +63,7 @@ public class Scenario implements Callable { private State state = State.Scheduled; private volatile ScenarioShutdownHook scenarioShutdownHook; private Exception error; + private ScenarioMetadata scenarioMetadata; public enum State { @@ -236,12 +237,23 @@ public class Scenario implements Callable { metricRegistry, scriptEnv ); + ScenarioMetadataAware.apply(extensionObject,getScenarioMetadata()); logger.trace("Adding extension object: name=" + extensionDescriptor.getBaseVariableName() + " class=" + extensionObject.getClass().getSimpleName()); scriptEngine.put(extensionDescriptor.getBaseVariableName(), extensionObject); } + } - + private synchronized ScenarioMetadata getScenarioMetadata() { + if (this.scenarioMetadata==null) { + this.scenarioMetadata = new ScenarioMetadata( + this.startedAtMillis, + this.scenarioName, + SystemId.getNodeId(), + SystemId.getNodeFingerprint() + ); + } + return scenarioMetadata; } public void runScenario() { diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java new file mode 100644 index 000000000..ffbd94e8e --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java @@ -0,0 +1,47 @@ +package io.nosqlbench.nb.api.metadata; + +import java.util.Map; + +/** + * If an object is ScenarioMetadata, then they will be updated with a map of + * scenario metadata. Supported types are: + *
    + *
  • ScriptingPluginInfo
    • + *
+ */ +public class ScenarioMetadata { + private final long startedAt; + private final String sessionName; + private final String systemId; + private final String systemFingerprint; + + public ScenarioMetadata(long startedAt, String sessionName, String systemId, String systemFingerprint) { + this.startedAt = startedAt; + this.sessionName = sessionName; + this.systemId = systemId; + this.systemFingerprint = systemFingerprint; + } + + public long getStartedAt() { + return startedAt; + } + + public String getSessionName() { + return sessionName; + } + + public String getSystemId() { + return systemId; + } + + public String getSystemFingerprint() { + return systemFingerprint; + } + + public Map asMap() { + return Map.of("STARTED_AT",String.valueOf(startedAt), + "SESSION_NAME",sessionName, + "SYSTEM_ID",systemId, + "SYSTEM_FINGERPRINT", systemFingerprint); + } +} diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadataAware.java b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadataAware.java new file mode 100644 index 000000000..aee925961 --- /dev/null +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadataAware.java @@ -0,0 +1,21 @@ +package io.nosqlbench.nb.api.metadata; + +/** + * Where supported, the following named fields are injected into object which + * implement this interface: + *
    + *
  • SCENARIO_NAME - The full scenario name, used for logging, metrics, etc
    • + *
  • STARTED_AT_MILLIS - The millisecond timestamp used to create the scenario name
    • + *
  • SYSTEM_ID - A stable identifier based on the available ip addresses
    • + *
  • SYSTEM_FINGERPRINT - a stable and pseudonymous identifier based on SYSTEM_ID
    • + *
+ */ +public interface ScenarioMetadataAware { + void setScenarioMetadata(ScenarioMetadata metadata); + + static void apply(Object target, ScenarioMetadata metadata) { + if (target instanceof ScenarioMetadataAware) { + ((ScenarioMetadataAware)target).setScenarioMetadata(metadata); + } + } +} diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java similarity index 60% rename from nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java rename to nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java index 2a6b2d41d..30b5fc4d4 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/SystemId.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java @@ -1,4 +1,4 @@ -package io.nosqlbench.nb.api; +package io.nosqlbench.nb.api.metadata; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -7,10 +7,25 @@ import oshi.hardware.CentralProcessor; import oshi.hardware.HardwareAbstractionLayer; import oshi.hardware.NetworkIF; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.*; public class SystemId { + /** + * Return the address of a node which is likely to be unique enough to identify + * it within a given subnet, after filtering out all local addresses. This is useful + * when you are managing configuration or results for a set of systems which + * share a common IP addressing scheme. This identifier should be stable as long + * as the node's addresses do not change. + * + * If you are needing an identifier for a node but wish to expose any address data, + * you can use the {@link #getNodeFingerprint()} which takes this value and hashes + * it with SHA-1 to produce a hex string. + * @return A address for the node, likely to be unique and stable for its lifetime + */ public static String getNodeId() { SystemInfo sysinfo = new SystemInfo(); HardwareAbstractionLayer hal = sysinfo.getHardware(); @@ -38,6 +53,28 @@ public class SystemId { return systemID; } + /** + * Produce a stable string identifier consisting of hexadecimal characters. + * The internal data used for this value is based on a stable ordering of non-local + * ip addresses available on the system. + * @return A stable node identifier + */ + public static String getNodeFingerprint() { + String addrId = getNodeId(); + try { + MessageDigest sha1_digest = MessageDigest.getInstance("SHA-1"); + byte[] addrBytes = sha1_digest.digest(addrId.getBytes(StandardCharsets.UTF_8)); + String fingerprint = ""; + for (int i=0; i < addrBytes.length; i++) { + fingerprint += + Integer.toString( ( addrBytes[i] & 0xff ) + 0x100, 16).substring( 1 ); + } + return fingerprint.toUpperCase(Locale.ROOT); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } + public static String getHostSummary() { SystemInfo sysinfo = new SystemInfo(); HardwareAbstractionLayer hal = sysinfo.getHardware(); diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java index 62508270f..940282c33 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java @@ -1,7 +1,10 @@ package io.nosqlbench.nb.api; +import io.nosqlbench.nb.api.metadata.SystemId; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class SystemIdTest { @Test @@ -9,4 +12,17 @@ public class SystemIdTest { String info = SystemId.getHostSummary(); System.out.println(info); } + + @Test + public void testNostId() { + String info = SystemId.getNodeId(); + assertThat(info).matches("\\d+\\.\\d+\\.\\d+\\.\\d+"); + } + + @Test + public void testNodeFingerprint() { + String hash = SystemId.getNodeFingerprint(); + assertThat(hash).matches("[A-Z0-9]+"); + } + } From a8929042f99eacbb7d4e9d5e68f0f434eb48269a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:23:23 -0500 Subject: [PATCH 19/53] extend NBEnvironment tokens to other data sources --- .../io/nosqlbench/nb/api/NBEnvironment.java | 63 +++++++++++++++---- .../nosqlbench/nb/api/NBEnvironmentTest.java | 11 ++++ 2 files changed, 63 insertions(+), 11 deletions(-) diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java b/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java index 825e2fb14..c18b5d3be 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java @@ -1,6 +1,7 @@ package io.nosqlbench.nb.api; import io.nosqlbench.nb.api.errors.BasicError; +import io.nosqlbench.nb.api.metadata.SessionNamer; import org.apache.logging.log4j.Logger; import java.util.*; @@ -46,11 +47,11 @@ public class NBEnvironment { private final LinkedHashMap references = new LinkedHashMap<>(); private final static Map envToProp = Map.of( - "PWD", "user.dir", - "HOME", "user.home", - "USERNAME", "user.name", // Win* - "USER", "user.name", // *n*x - "LOGNAME", "user.name" // *n*x + "PWD", "user.dir", + "HOME", "user.home", + "USERNAME", "user.name", // Win* + "USER", "user.name", // *n*x + "LOGNAME", "user.name" // *n*x ); public NBEnvironment resetRefs() { @@ -61,7 +62,7 @@ public class NBEnvironment { public void put(String propname, String value) { if (envToProp.containsKey(propname)) { throw new RuntimeException("The property you are changing should be considered immutable in this " + - "process: '" + propname + "'"); + "process: '" + propname + "'"); } if (references.containsKey(propname)) { if (references.get(propname).equals(value)) { @@ -70,8 +71,8 @@ public class NBEnvironment { } } else { throw new BasicError("Changing already referenced property '" + propname + "' from \n" + - "'" + references.get(propname) + "' to '" + value + "' is not supported.\n" + - " (maybe you can change the order of your options to set higher-level parameters first.)"); + "'" + references.get(propname) + "' to '" + value + "' is not supported.\n" + + " (maybe you can change the order of your options to set higher-level parameters first.)"); } } @@ -138,7 +139,7 @@ public class NBEnvironment { String value = getOr(name, null); if (value == null) { throw new BasicError("No variable was found for '" + name + "' in system properties nor in the shell " + - "environment."); + "environment."); } return value; } @@ -185,8 +186,8 @@ public class NBEnvironment { return Optional.of(sb.toString()); } - public List interpolate(CharSequence delim, String combined) { - String[] split = combined.split(delim.toString()); + public List interpolateEach(CharSequence delim, String toBeRecombined) { + String[] split = toBeRecombined.split(delim.toString()); List mapped = new ArrayList<>(); for (String pattern : split) { Optional interpolated = interpolate(pattern); @@ -195,4 +196,44 @@ public class NBEnvironment { return mapped; } + /** + * Interpolate system properties, environment variables, time fields, and arbitrary replacement strings + * into a single result. Templates such as {@code /tmp/%d-${testrun}-$System.index-SCENARIO} are supported. + * + *
+ * + * The tokens found in the raw template are interpolated in the following order. + *
    + *
  • Any token which exactly matches one of the keys in the provided map is substituted + * directly as is. No token sigil like '$' is used here, so if you want to support that + * as is, you need to provide the keys in your substitution map as such.
    • + *
  • Any tokens in the form {@code %f} which is supported by the time fields in + * {@link Formatter}
    • are honored and used with the timestamp provided.* + *
  • System Properties: Any token in the form {@code $word.word} will be taken as the name + * of a system property to be substited.
    • + *
  • Environment Variables: Any token in the form {@code $name}
    • will be takens as + * an environment variable to be substituted. + *
+ * + * @param rawtext The template, including any of the supported token forms + * @param millis The timestamp to use for any temporal tokens + * @param map Any additional parameters to interpolate into the template first + * @return Optionally, the interpolated string, as long as all references were qualified. Error + * handling is contextual to the caller -- If not getting a valid result would cause a downstream error, + * an error should likely be thrown. + */ + public final Optional interpolateWithTimestamp(String rawtext, long millis, Map map) { + String result = rawtext; + for (String key : map.keySet()) { + String value = map.get(key); + result = result.replaceAll(Pattern.quote(key), value); + } + result = SessionNamer.format(result, millis); + return interpolate(result); + } + + public final Optional interpolateWithTimestamp(String rawText, long millis) { + return interpolateWithTimestamp(rawText, millis, Map.of()); + } + } diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java index 9693e4d04..014abb111 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java @@ -2,6 +2,8 @@ package io.nosqlbench.nb.api; import org.junit.jupiter.api.Test; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThat; public class NBEnvironmentTest { @@ -15,4 +17,13 @@ public class NBEnvironmentTest { assertThat(home1).matches(".+"); } + @Test + public void testInterpolationWithTimestamp() { + NBEnvironment env = new NBEnvironment(); + long millis = 1633964892320L; + String time1 = env.interpolateWithTimestamp("word WOO %td %% end", millis, Map.of("WOO","WOW")).orElse(null); + assertThat(time1).isEqualTo("word WOW 11 % end"); + + } + } From b72723b7e5ba7984442575b2355141581bea5e00 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:23:27 -0500 Subject: [PATCH 20/53] add some missing extension docs --- .../extensions/globalvars/globalvars.md | 9 +++++++ .../nosqlbench/engine/extensions/http/http.md | 26 +++++++++++++++++++ .../scripts/async/extension_files.js | 2 ++ .../scripts/async/extension_globalstate.js | 4 +++ .../resources/scripts/async/extension_http.js | 1 + .../resources/scripts/async/extension_s3.js | 3 +++ .../scripts/async/extension_shutdown_hook.js | 3 +++ 7 files changed, 48 insertions(+) create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/http.md create mode 100644 nb/src/test/resources/scripts/async/extension_files.js create mode 100644 nb/src/test/resources/scripts/async/extension_globalstate.js create mode 100644 nb/src/test/resources/scripts/async/extension_http.js create mode 100644 nb/src/test/resources/scripts/async/extension_s3.js create mode 100644 nb/src/test/resources/scripts/async/extension_shutdown_hook.js diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md new file mode 100644 index 000000000..f33539f5b --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md @@ -0,0 +1,9 @@ +globalvars extension +=================== + +Allows access to the global object map from SharedState.gl_ObjectMap, which allows +for cross-binding and cross-thread data sharing. + +``` +var result = globalvars.get("result"); +``` diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/http.md b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/http.md new file mode 100644 index 000000000..742d90596 --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/http.md @@ -0,0 +1,26 @@ +http extension +============== + +Allow access to HTTP URLs from within scripts, supporting both basic +get and post methods. In all cases, the returned type is the full +response object, from which the body content can be accessed. + +## Examples + +Get content from a URL into a string variable: + +``` +var response= http.get("http://google.com/") +``` + +Post an empty body to a URL, useful for state-changing calls where +all of the control data is in the URL: + +``` +var response= http.post("http://some.server/path/to/resource?query=foobarbaz") +``` + +Post content to a URL, specifying the URL, content value, and content type: +``` +var response= http.post("http://some.server/path/to/resource", "this is the data", "text/plain"); +``` diff --git a/nb/src/test/resources/scripts/async/extension_files.js b/nb/src/test/resources/scripts/async/extension_files.js new file mode 100644 index 000000000..5ef87ca8d --- /dev/null +++ b/nb/src/test/resources/scripts/async/extension_files.js @@ -0,0 +1,2 @@ +// Just an example +var content = files.read("somefile.txt"); diff --git a/nb/src/test/resources/scripts/async/extension_globalstate.js b/nb/src/test/resources/scripts/async/extension_globalstate.js new file mode 100644 index 000000000..4df5c24af --- /dev/null +++ b/nb/src/test/resources/scripts/async/extension_globalstate.js @@ -0,0 +1,4 @@ +// Just an example +var result= globalvars.put("result","OK") +var result = globalvars.get("result"); +print("result="+result); diff --git a/nb/src/test/resources/scripts/async/extension_http.js b/nb/src/test/resources/scripts/async/extension_http.js new file mode 100644 index 000000000..ea3d04bfa --- /dev/null +++ b/nb/src/test/resources/scripts/async/extension_http.js @@ -0,0 +1 @@ +var response = http.get("http://example.google.com") diff --git a/nb/src/test/resources/scripts/async/extension_s3.js b/nb/src/test/resources/scripts/async/extension_s3.js new file mode 100644 index 000000000..505a5ad66 --- /dev/null +++ b/nb/src/test/resources/scripts/async/extension_s3.js @@ -0,0 +1,3 @@ +// This requires active credentials, so it is disabled by default. +// This still serves as an example +// s3.uploadDirToUrl("testdata","s3://nb-extension-test/testdata1"); diff --git a/nb/src/test/resources/scripts/async/extension_shutdown_hook.js b/nb/src/test/resources/scripts/async/extension_shutdown_hook.js new file mode 100644 index 000000000..b7b3bc53c --- /dev/null +++ b/nb/src/test/resources/scripts/async/extension_shutdown_hook.js @@ -0,0 +1,3 @@ +shutdown.addShutdownHook('testfunc', function f() { + print("shutdown hook running"); +}); From 2910ba293811918286f3f65dae3be547e2c8bbe0 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 11 Oct 2021 17:31:51 -0500 Subject: [PATCH 21/53] extensions (s3, shutdown) and pulsar update release --- RELEASENOTES.md | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 871157073..cba097f5c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,6 +1,26 @@ -- 3b674983 (HEAD -> main, origin/main) Merge pull request #362 from yabinmeng/main -- bf98d644 Merge branch 'nosqlbench:main' into main -- 793af965 Ignore abnormal message processing error for Shared and Key_Shared subscription type. -- f32caf1e Merge pull request #361 from ivansenic/ise-mongo-update -- e8b32584 add writeConcern to the mongodb crud workflows -- retrigger release +- 4418500d (HEAD -> main) Merge branch 'main' of github.com:nosqlbench/nosqlbench +- 21b96cfd (origin/main) Merge pull request #366 from yabinmeng/main +- b72723b7 add some missing extension docs +- a8929042 extend NBEnvironment tokens to other data sources +- 8c6d0cfe new decorator API: share Scenario metadata to interested types +- bbeee5cb new scripting extension: s3; S3 directory uploader +- ff769c7b Add S3 URL Handler +- e1e10bba allow session namer to use pre-defined timestamp +- 133760d8 auto-init the last (fall-through) NBENVIRONMENT location first +- b388a43e consolidate statedir initialization logic and docs +- 9fccf8c2 new scripting extension: shutdown; scripted shutdown hooks +- 8da6664f typo fix +- 2876e102 Remove namespace and topic level dedup setting check for each run, which is too much overhead. +- 29dafd91 Merge pull request #364 from yabinmeng/main +- 11073cf0 Address Shooky's comment in PR#364. +- cdfb7c32 Merge branch 'nosqlbench:main' into main +- 1d625f41 add S3 URL Handler +- 9c91ad71 enhance diagnostics for driver loader +- 0df40113 re-enabled epoll dependency +- cd1f4e2e Merge pull request #365 from lakshmi-M18/patch-1 +- 178abe67 Update schema-astra code for create table +- 265760d1 Address Lari's comment in PR#364. +- eb5f42f4 Fix NullPointerException of checking namespace and topic deduplication status. +- 647bd7d4 Merge branch 'main' of https://github.com/yabinmeng/nosqlbench +- edc43c5b reformat +- 37150c33 only release on main branch by default From 28df8b297ac016ff5f1378f9d143222c9d56e9e4 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Mon, 11 Oct 2021 22:43:05 +0000 Subject: [PATCH 22/53] [maven-release-plugin] prepare release nosqlbench-4.15.58 --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 13 ++++------ driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 8 +++---- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 8 +++---- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 132 insertions(+), 139 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 00542e0ef..90879088e 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.58-SNAPSHOT + 4.15.58 @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 1a7f2dac6..2aa1e4f3c 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.58-SNAPSHOT + 4.15.58 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 09cb0e0ec..ee25e828c 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 72625962e..97072f598 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 57b3702c6..40ae4754a 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 404a150dc..541265849 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index a79c71312..bdcda649f 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -25,13 +23,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 @@ -241,8 +239,7 @@ - + io.nosqlbench.engine.cli.NBCLI diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 3a3029a09..9cd55cbe4 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 9de39c4ad..5d73c77f2 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index d3e7406c1..601150a4f 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-stdout - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 25c491e3b..14641d19a 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index e5eb23fee..5756fd1f6 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-stdout - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 312a71876..5570058ac 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 07b9f1519..94e45e549 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-stdout - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index d6034a1f6..a703019ec 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index c69534b67..0e58eb0ea 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-stdout - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 659b7fdb3..8fde9cceb 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index e9f66b482..9fd3ded3c 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-userlibs - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 077854582..c378fe44c 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench nb-annotations - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-userlibs - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index b02078f9b..88db183b7 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench engine-docker - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index ad032d4e8..77137780e 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 9e53400c3..a67286e2e 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench drivers-api - 4.15.58-SNAPSHOT + 4.15.58 @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.58-SNAPSHOT + 4.15.58 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 4dda1728b..6ded060f8 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 0b70b8080..66d962ee6 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 5905de195..5d101a8c2 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index fbb87b2f8..790ad11c5 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 1dbfdf1ce..ea7b23af4 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 pom @@ -80,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.58 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index fc33a8ce4..6b09e1b63 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 4ea2a44e5..07c17871f 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -33,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/nb/pom.xml b/nb/pom.xml index bbda479b3..84240d427 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench engine-cli - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench engine-docs - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench engine-core - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench engine-extensions - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-web - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-kafka - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-stdout - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-diag - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-tcp - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-http - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-jmx - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-dsegraph-shaded - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-cql-shaded - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-cqld3-shaded - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-cqlverify - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-mongodb - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-pulsar - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-cockroachdb - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench driver-jms - 4.15.58-SNAPSHOT + 4.15.58 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/pom.xml b/pom.xml index f576a0ac3..09c5dfd67 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.58 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index ef8853ff6..6c252f104 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 nb-api io.nosqlbench virtdata-lang - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 8de4db3e6..1c5b39786 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 005072fed..9f1e2e18d 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index d8180aad1..354336678 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-lib-basics - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 7340ace06..7741ff66e 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-lib-basics - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 50f85453b..7aba91e45 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index d25fec8ad..13deb1447 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.58-SNAPSHOT + 4.15.58 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 534735b45..f9675a233 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-lib-realer - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-api - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench virtdata-lib-random - 4.15.58-SNAPSHOT + 4.15.58 io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 virtdata-lib-basics io.nosqlbench - 4.15.58-SNAPSHOT + 4.15.58 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.58-SNAPSHOT + 4.15.58 From 7c2e26d80d26276a7b9805ece783853aa8363fa5 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Mon, 11 Oct 2021 22:43:07 +0000 Subject: [PATCH 23/53] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 90879088e..5bbf82c96 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.58 + 4.15.59-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 2aa1e4f3c..30827184e 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.58 + 4.15.59-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index ee25e828c..37c3a5d10 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 97072f598..80422c34e 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 40ae4754a..d290edf4b 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 541265849..bc5ccaede 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index bdcda649f..99eaea9a9 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 9cd55cbe4..746c767f5 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 5d73c77f2..d67a2d6cd 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 601150a4f..2343ddf1d 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-stdout - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 14641d19a..f43599931 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 5756fd1f6..a22ec6b61 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-stdout - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 5570058ac..8309eadfc 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 94e45e549..e3931fedb 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-stdout - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index a703019ec..8eeea19f8 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 0e58eb0ea..5513eae3a 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-stdout - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 8fde9cceb..5d482c0d1 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index 9fd3ded3c..ac49014ef 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index c378fe44c..00a6c05df 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench nb-annotations - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 88db183b7..c646ed2ce 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench engine-docker - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 77137780e..8d193f0fb 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index a67286e2e..8c3ae6c5c 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.58 + 4.15.59-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.58 + 4.15.59-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 6ded060f8..2b902ea22 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 66d962ee6..7ea4eaa99 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 5d101a8c2..6cef47c07 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 790ad11c5..83ea9879b 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index ea7b23af4..4ed368891 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.58 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 6b09e1b63..4bb5feb2c 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 07c17871f..7b616aa0a 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 84240d427..75fb5f7e0 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench engine-cli - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench engine-docs - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench engine-core - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench engine-extensions - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-web - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-kafka - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-stdout - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-diag - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-tcp - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-http - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-jmx - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench driver-jms - 4.15.58 + 4.15.59-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/pom.xml b/pom.xml index 09c5dfd67..c8dfe8a3d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.58 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 6c252f104..50c52b3f5 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 1c5b39786..7396763f3 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 9f1e2e18d..9e913c092 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 354336678..79b88a92f 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 7741ff66e..a17190477 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 7aba91e45..5132b32b1 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 13deb1447..afb3fd3cf 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.58 + 4.15.59-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index f9675a233..93e487afd 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-api - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.58 + 4.15.59-SNAPSHOT io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.58 + 4.15.59-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.58 + 4.15.59-SNAPSHOT From 686af3d9cab596ec4c27b0824f702f3aa61e6f27 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 13 Oct 2021 10:10:48 -0500 Subject: [PATCH 24/53] Convert message error runtime exception to counter metrics --- .../driver/pulsar/PulsarActivity.java | 12 ++ .../pulsar/ops/PulsarConsumerMapper.java | 30 ++- .../driver/pulsar/ops/PulsarConsumerOp.java | 177 ++++++++++-------- .../pulsar/ops/PulsarConumerEmptyOp.java | 21 +++ .../pulsar/ops/PulsarProducerEmptyOp.java | 20 ++ .../pulsar/ops/PulsarProducerMapper.java | 97 ++++++---- .../driver/pulsar/ops/PulsarProducerOp.java | 10 +- .../driver/pulsar/ops/ReadyPulsarOp.java | 4 - 8 files changed, 231 insertions(+), 140 deletions(-) create mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java create mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java index 6d24f312a..e3aa48163 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java @@ -38,6 +38,12 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve // Metrics for NB Pulsar driver milestone: https://github.com/nosqlbench/nosqlbench/milestone/11 // - end-to-end latency private Histogram e2eMsgProcLatencyHistogram; + // - message out of sequence error counter + private Counter msgErrOutOfSeqCounter; + // - message loss counter + private Counter msgErrLossCounter; + // - message duplicate (when dedup is enabled) error counter + private Counter msgErrDuplicateCounter; private PulsarSpaceCache pulsarCache; @@ -76,6 +82,9 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve commitTransactionTimer = ActivityMetrics.timer(activityDef, "commit_transaction"); e2eMsgProcLatencyHistogram = ActivityMetrics.histogram(activityDef, "e2e_msg_latency"); + msgErrOutOfSeqCounter = ActivityMetrics.counter(activityDef, "err_msg_oos"); + msgErrLossCounter = ActivityMetrics.counter(activityDef, "err_msg_loss"); + msgErrDuplicateCounter = ActivityMetrics.counter(activityDef, "err_msg_dup"); String pulsarClntConfFile = activityDef.getParams().getOptionalString("config").orElse("config.properties"); @@ -231,4 +240,7 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve public Timer getCommitTransactionTimer() { return commitTransactionTimer; } public Histogram getE2eMsgProcLatencyHistogram() { return e2eMsgProcLatencyHistogram; } + public Counter getMsgErrOutOfSeqCounter() { return msgErrOutOfSeqCounter; } + public Counter getMsgErrLossCounter() { return msgErrLossCounter; } + public Counter getMsgErrDuplicateCounter() { return msgErrDuplicateCounter; } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java index cae3afd42..25af5d8ac 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java @@ -1,15 +1,11 @@ package io.nosqlbench.driver.pulsar.ops; -import com.codahale.metrics.Counter; -import com.codahale.metrics.Histogram; -import com.codahale.metrics.Timer; import io.nosqlbench.driver.pulsar.PulsarActivity; import io.nosqlbench.driver.pulsar.PulsarSpace; import io.nosqlbench.engine.api.templating.CommandTemplate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.api.Consumer; -import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.client.api.transaction.Transaction; import java.util.function.LongFunction; @@ -34,6 +30,14 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { private final LongFunction subscriptionTypeFunc; private final boolean e2eMsProc; + // Used for message loss checking + private long prevMsgSeqId = -1; + + // Used for early quiting when there are message loss + // Otherwise, sync API may unblock unnecessarily + private long totalMsgLossCnt = 0; + private long maxMsgSeqToExpect = -1; + public PulsarConsumerMapper(CommandTemplate cmdTpl, PulsarSpace clientSpace, PulsarActivity pulsarActivity, @@ -52,17 +56,33 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { this.e2eMsProc = e2eMsgProc; } + public long getPrevMsgSeqId() { return prevMsgSeqId; } + public void setPrevMsgSeqId(long prevMsgSeqId) { this.prevMsgSeqId = prevMsgSeqId; } + + public long getTotalMsgLossCnt() { return totalMsgLossCnt; } + public void setTotalMsgLossCnt(long totalMsgLossCnt) { this.totalMsgLossCnt = totalMsgLossCnt; } + + public long getMaxMsgSeqToExpect() { return maxMsgSeqToExpect; } + public void setMaxMsgSeqToExpect(long maxMsgSeqToExpect) { this.maxMsgSeqToExpect = maxMsgSeqToExpect; } + @Override public PulsarOp apply(long value) { + boolean seqTracking = seqTrackingFunc.apply(value); + if ( seqTracking && (maxMsgSeqToExpect != -1) ) { + if ( (value + totalMsgLossCnt) > maxMsgSeqToExpect) { + return new PulsarConumerEmptyOp(pulsarActivity); + } + } + Consumer consumer = consumerFunc.apply(value); boolean asyncApi = asyncApiFunc.apply(value); boolean useTransaction = useTransactionFunc.apply(value); - boolean seqTracking = seqTrackingFunc.apply(value); Supplier transactionSupplier = transactionSupplierFunc.apply(value); boolean topicMsgDedup = topicMsgDedupFunc.apply(value); String subscriptionType = subscriptionTypeFunc.apply(value); return new PulsarConsumerOp( + this, pulsarActivity, asyncApi, useTransaction, diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java index 24f61acac..7dfc3dd95 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java @@ -22,6 +22,7 @@ public class PulsarConsumerOp implements PulsarOp { private final static Logger logger = LogManager.getLogger(PulsarConsumerOp.class); + private final PulsarConsumerMapper consumerMapper; private final PulsarActivity pulsarActivity; private final boolean asyncPulsarOp; @@ -37,17 +38,25 @@ public class PulsarConsumerOp implements PulsarOp { private final boolean e2eMsgProc; private final long curCycleNum; - private long curMsgSeqId; - private long prevMsgSeqId; - private final Counter bytesCounter; private final Histogram messageSizeHistogram; private final Timer transactionCommitTimer; // keep track of end-to-end message latency private final Histogram e2eMsgProcLatencyHistogram; + // message out-of-sequence error counter + private final Counter msgErrOutOfSeqCounter; + // message out-of-sequence error counter + private final Counter msgErrDuplicateCounter; + // message loss error counter + private final Counter msgErrLossCounter; + + // Used for message error tracking + private final boolean ignoreMsgLossCheck; + private final boolean ignoreMsgDupCheck; public PulsarConsumerOp( + PulsarConsumerMapper consumerMapper, PulsarActivity pulsarActivity, boolean asyncPulsarOp, boolean useTransaction, @@ -61,6 +70,7 @@ public class PulsarConsumerOp implements PulsarOp { long curCycleNum, boolean e2eMsgProc) { + this.consumerMapper = consumerMapper; this.pulsarActivity = pulsarActivity; this.asyncPulsarOp = asyncPulsarOp; @@ -76,14 +86,80 @@ public class PulsarConsumerOp implements PulsarOp { this.curCycleNum = curCycleNum; this.e2eMsgProc = e2eMsgProc; - this.curMsgSeqId = 0; - this.prevMsgSeqId = (curCycleNum - 1); - this.bytesCounter = pulsarActivity.getBytesCounter(); this.messageSizeHistogram = pulsarActivity.getMessageSizeHistogram(); this.transactionCommitTimer = pulsarActivity.getCommitTransactionTimer(); this.e2eMsgProcLatencyHistogram = pulsarActivity.getE2eMsgProcLatencyHistogram(); + this.msgErrOutOfSeqCounter = pulsarActivity.getMsgErrOutOfSeqCounter(); + this.msgErrLossCounter = pulsarActivity.getMsgErrLossCounter(); + this.msgErrDuplicateCounter = pulsarActivity.getMsgErrDuplicateCounter(); + + // When message deduplication configuration is not enable, ignore message + // duplication check + this.ignoreMsgDupCheck = !this.topicMsgDedup; + + // Limitations of the message sequence based check: + // - For message out of sequence and message duplicate check, it works for + // all subscription types, including "Shared" and "Key_Shared" + // - For message loss, it doesn't work for "Shared" and "Key_Shared" + // subscription types + this.ignoreMsgLossCheck = + StringUtils.equalsAnyIgnoreCase(this.subscriptionType, + PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, + PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label); + } + + private void checkAndUpdateMessageErrorCounter(Message message) { + long maxMsgSeqToExpect = consumerMapper.getMaxMsgSeqToExpect(); + if (maxMsgSeqToExpect == -1) { + String msgSeqTgtMaxStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_TGTMAX); + if (!StringUtils.isBlank(msgSeqTgtMaxStr)) { + consumerMapper.setMaxMsgSeqToExpect(Long.valueOf(msgSeqTgtMaxStr)); + } + } + + String msgSeqIdStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_ID); + + if ( !StringUtils.isBlank(msgSeqIdStr) ) { + long prevMsgSeqId = consumerMapper.getPrevMsgSeqId(); + long curMsgSeqId = Long.parseLong(msgSeqIdStr); + + // Skip out-of-sequence check on the first received message + // - This is because out-of-sequence check requires at least 2 + // received messages for comparison + if ( (prevMsgSeqId != -1) && (curMsgSeqId < prevMsgSeqId) ) { + msgErrOutOfSeqCounter.inc(); + } + + // Similarly, when message duplicate check is needed, we also + // skip the first received message. + if ( !ignoreMsgDupCheck && (prevMsgSeqId != -1) && (curMsgSeqId == prevMsgSeqId) ) { + msgErrDuplicateCounter.inc(); + } + + // Note that message loss could be happened anywhere, E.g. + // - published messages: 0,1,2,3,4,5 + // - message loss scenario: + // * scenario 1: first set of messages are lost - received 2,3,4 + // * scenario 2: messages in the middle are lost - received 0,1,3,4 + // * scenario 3: last set of messages are lost - received 0,1,2 + if ( !ignoreMsgLossCheck ) { + // This check covers message loss scenarios 1 and 2 + if ( (curMsgSeqId - prevMsgSeqId) > 1 ){ + // there could be multiple published messages lost between + // 2 received messages + long msgLostCnt = (curMsgSeqId - prevMsgSeqId) - 1; + msgErrLossCounter.inc(msgLostCnt); + consumerMapper.setTotalMsgLossCnt(consumerMapper.getTotalMsgLossCnt() + msgLostCnt); + } + + // TODO: how can we detect message loss scenario 3? + } + + prevMsgSeqId = curMsgSeqId; + consumerMapper.setPrevMsgSeqId(prevMsgSeqId); + } } @Override @@ -143,47 +219,17 @@ public class PulsarConsumerOp implements PulsarOp { e2eMsgProcLatencyHistogram.update(e2eMsgLatency); } - // keep track of message ordering and message loss - String msgSeqIdStr = message.getProperties().get(PulsarActivityUtil.MSG_SEQUENCE_ID); - if ( (seqTracking) && !StringUtils.isBlank(msgSeqIdStr) ) { - curMsgSeqId = Long.parseLong(msgSeqIdStr); - - if ( prevMsgSeqId > -1) { - // normal case: message sequence id is monotonically increasing by 1 - if ((curMsgSeqId - prevMsgSeqId) != 1) { - // abnormal case: out of ordering - // - for any subscription type, this check should always hold - if (curMsgSeqId < prevMsgSeqId) { - throw new PulsarMsgOutOfOrderException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - // - this sequence based message loss and message duplicate check can't be used for - // "Shared" subscription (ignore this check) - // - TODO: for Key_Shared subscription type, this logic needs to be improved on - // per-key basis - else { - if ( !StringUtils.equalsAnyIgnoreCase(subscriptionType, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label)) { - // abnormal case: message loss - if ((curMsgSeqId - prevMsgSeqId) > 1) { - throw new PulsarMsgLossException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } else if (topicMsgDedup && (curMsgSeqId == prevMsgSeqId)) { - throw new PulsarMsgDuplicateException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - } - } - } - } - } + // keep track of message errors and update error counters + if (seqTracking) checkAndUpdateMessageErrorCounter(message); int messageSize = message.getData().length; bytesCounter.inc(messageSize); messageSizeHistogram.update(messageSize); - if (useTransaction) { + if (!useTransaction) { + consumer.acknowledge(message.getMessageId()); + } + else { consumer.acknowledgeAsync(message.getMessageId(), transaction).get(); // little problem: here we are counting the "commit" time @@ -194,14 +240,12 @@ public class PulsarConsumerOp implements PulsarOp { transaction.commit().get(); } } - else { - consumer.acknowledge(message.getMessageId()); - } } catch (Exception e) { logger.error( "Sync message receiving failed - timeout value: {} seconds ", timeoutSeconds); + e.printStackTrace(); throw new PulsarDriverUnexpectedException("" + "Sync message receiving failed - timeout value: " + timeoutSeconds + " seconds "); } @@ -254,47 +298,14 @@ public class PulsarConsumerOp implements PulsarOp { e2eMsgProcLatencyHistogram.update(e2eMsgLatency); } - // keep track of message ordering, message loss, and message duplication - String msgSeqIdStr = message.getProperties().get(PulsarActivityUtil.MSG_SEQUENCE_ID); - if ( (seqTracking) && !StringUtils.isBlank(msgSeqIdStr) ) { - curMsgSeqId = Long.parseLong(msgSeqIdStr); + // keep track of message errors and update error counters + if (seqTracking) checkAndUpdateMessageErrorCounter(message); - if (prevMsgSeqId > -1) { - // normal case: message sequence id is monotonically increasing by 1 - if ((curMsgSeqId - prevMsgSeqId) != 1) { - // abnormal case: out of ordering - // - for any subscription type, this check should always hold - if (curMsgSeqId < prevMsgSeqId) { - throw new PulsarMsgOutOfOrderException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - // - this sequence based message loss and message duplicate check can't be used for - // "Shared" subscription (ignore this check) - // - TODO: for Key_Shared subscription type, this logic needs to be improved on - // per-key basis - else { - if ( !StringUtils.equalsAnyIgnoreCase(subscriptionType, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label)) { - // abnormal case: message loss - if ((curMsgSeqId - prevMsgSeqId) > 1) { - throw new PulsarMsgLossException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } else if (topicMsgDedup && (curMsgSeqId == prevMsgSeqId)) { - throw new PulsarMsgDuplicateException( - false, curCycleNum, curMsgSeqId, prevMsgSeqId); - } - } - } - } - } - } - - if (useTransaction) { - consumer.acknowledgeAsync(message.getMessageId(), transaction); + if (!useTransaction) { + consumer.acknowledgeAsync(message); } else { - consumer.acknowledgeAsync(message); + consumer.acknowledgeAsync(message.getMessageId(), transaction); } timeTracker.run(); diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java new file mode 100644 index 000000000..255a81351 --- /dev/null +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java @@ -0,0 +1,21 @@ +package io.nosqlbench.driver.pulsar.ops; + +import com.codahale.metrics.Counter; +import io.nosqlbench.driver.pulsar.PulsarActivity; + +public class PulsarConumerEmptyOp implements PulsarOp { + + private final PulsarActivity pulsarActivity; + + // message loss error counter + private final Counter msgErrLossCounter; + + public PulsarConumerEmptyOp(PulsarActivity pulsarActivity) { + this.pulsarActivity = pulsarActivity; + this.msgErrLossCounter = pulsarActivity.getMsgErrDuplicateCounter(); + } + + @Override + public void run(Runnable timeTracker) { + } +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java new file mode 100644 index 000000000..f94af3982 --- /dev/null +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java @@ -0,0 +1,20 @@ +package io.nosqlbench.driver.pulsar.ops; + +import io.nosqlbench.driver.pulsar.PulsarActivity; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class PulsarProducerEmptyOp implements PulsarOp { + + private final static Logger logger = LogManager.getLogger(PulsarProducerEmptyOp.class); + + private final PulsarActivity pulsarActivity; + + public PulsarProducerEmptyOp(PulsarActivity pulsarActivity) { + this.pulsarActivity = pulsarActivity; + } + + @Override + public void run(Runnable timeTracker) { + } +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java index 9bdf63881..594f40406 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java @@ -36,6 +36,8 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { private final LongFunction propFunc; private final LongFunction payloadFunc; + private final long totalCycleCount; + public PulsarProducerMapper(CommandTemplate cmdTpl, PulsarSpace clientSpace, PulsarActivity pulsarActivity, @@ -55,6 +57,8 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { this.keyFunc = keyFunc; this.propFunc = propFunc; this.payloadFunc = payloadFunc; + + this.totalCycleCount = pulsarActivity.getActivityDef().getCycleCount(); } @Override @@ -66,19 +70,23 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { Producer producer = producerFunc.apply(value); - // Simulate error 10% of the time + boolean lastMsg = (value == (totalCycleCount-1)); + + // Simulate error 10% of the time, but always ignore + // the last message float rndVal = RandomUtils.nextFloat(0, 1.0f); - boolean simulationError = (rndVal >= 0) && (rndVal < 0.1f); - String seqErrSimuType = seqErrSimuTypeFunc.apply(value); + boolean simulationError = (!lastMsg) && ((rndVal >= 0) && (rndVal < 0.2f)); + + String seqErrSimuTypesStr = seqErrSimuTypeFunc.apply(value); boolean simulateMsgOutofOrder = simulationError && - !StringUtils.isBlank(seqErrSimuType) && - StringUtils.equalsIgnoreCase(seqErrSimuType, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.OutOfOrder.label); + !StringUtils.isBlank(seqErrSimuTypesStr) && + StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.OutOfOrder.label); boolean simulateMsgLoss = simulationError && - !StringUtils.isBlank(seqErrSimuType) && - StringUtils.equalsIgnoreCase(seqErrSimuType, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgLoss.label); + !StringUtils.isBlank(seqErrSimuTypesStr) && + StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgLoss.label); boolean simulateMsgDup = simulationError && - !StringUtils.isBlank(seqErrSimuType) && - StringUtils.equalsIgnoreCase(seqErrSimuType, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgDup.label); + !StringUtils.isBlank(seqErrSimuTypesStr) && + StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgDup.label); String msgKey = keyFunc.apply(value); String msgPayload = payloadFunc.apply(value); @@ -99,36 +107,47 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { } } - // Set message sequence tracking property - if (seqTracking) { - // normal case - if (!simulateMsgOutofOrder && !simulateMsgDup) { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value)); - } - // simulate message out of order - else if ( simulateMsgOutofOrder ) { - int rndmOffset = 2; - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, - String.valueOf((value > rndmOffset) ? (value-rndmOffset) : value)); - } - // simulate message duplication - else { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value-1)); - } - // message loss simulation is not done by message property - // we simply skip sending message in the current NB cycle - } + // Error simulation sequence: + // - message loss > message out of order > message duplication + if (!simulateMsgLoss) { + // Set message sequence tracking property + if (seqTracking) { + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_TGTMAX, + String.valueOf(pulsarActivity.getActivityDef().getCycleCount()-1)); - return new PulsarProducerOp( - pulsarActivity, - asyncApi, - useTransaction, - transactionSupplier, - producer, - clientSpace.getPulsarSchema(), - msgKey, - msgProperties, - msgPayload, - simulateMsgLoss); + // normal case + if (!simulateMsgOutofOrder && !simulateMsgDup) { + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value)); + } + else { + // simulate message out of order + if (simulateMsgOutofOrder) { + int rndmOffset = 2; + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, + String.valueOf((value > rndmOffset) ? (value - rndmOffset) : value)); + } + // simulate message duplication + else if (simulateMsgDup) { + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value - 1)); + } + } + } + + return new PulsarProducerOp( + pulsarActivity, + asyncApi, + useTransaction, + transactionSupplier, + producer, + clientSpace.getPulsarSchema(), + msgKey, + msgProperties, + msgPayload); + } + else { + // Simulate message loss, but don't simulate the scenario where + // only the last set of message are lost + return new PulsarProducerEmptyOp(pulsarActivity); + } } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java index 51c1336b2..796621df9 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java @@ -38,7 +38,6 @@ public class PulsarProducerOp implements PulsarOp { private final String msgKey; private final Map msgProperties; private final String msgPayload; - private final boolean simulateMsgLoss; private final Counter bytesCounter; private final Histogram messageSizeHistogram; @@ -52,8 +51,7 @@ public class PulsarProducerOp implements PulsarOp { Schema schema, String key, Map msgProperties, - String payload, - boolean simulateMsgLoss) { + String payload) { this.pulsarActivity = pulsarActivity; this.asyncPulsarOp = asyncPulsarOp; @@ -65,7 +63,6 @@ public class PulsarProducerOp implements PulsarOp { this.msgKey = key; this.msgProperties = msgProperties; this.msgPayload = payload; - this.simulateMsgLoss = simulateMsgLoss; this.bytesCounter = pulsarActivity.getBytesCounter(); this.messageSizeHistogram = pulsarActivity.getMessageSizeHistogram(); @@ -74,11 +71,6 @@ public class PulsarProducerOp implements PulsarOp { @Override public void run(Runnable timeTracker) { - // Skip this cycle (without sending messages) if we're doing message loss simulation - if (simulateMsgLoss) { - return; - } - if ( StringUtils.isBlank(msgPayload)) { throw new PulsarDriverParamException("Message payload (\"msg-value\") can't be empty!"); } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 8a49170a4..892d35f50 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -11,10 +11,6 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.pulsar.client.admin.Namespaces; -import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.admin.PulsarAdminException; -import org.apache.pulsar.client.admin.Topics; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Reader; From ac2fdf2a2e674525c1ea67e9b75c785ae5088786 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 13 Oct 2021 10:11:20 -0500 Subject: [PATCH 25/53] Convert message error runtime exception to counter metrics --- .../resources/activities/pulsar_client_sanity_seqloss.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml index 49a139f05..61f3258b4 100644 --- a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml +++ b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml @@ -5,7 +5,7 @@ bindings: # document level parameters that apply to all Pulsar client types: params: - topic_uri: "persistent://public/default/sanity_seqloss2" + topic_uri: "persistent://tnt0/ns0/sanity_seqloss12" # Only applicable to producer and consumer # - used for message ordering and message loss check async_api: "true" @@ -23,6 +23,7 @@ blocks: #seqerr_simu: "out_of_order" #seqerr_simu: "msg_loss" #seqerr_simu: "msg_dup" + seqerr_simu: "out_of_order, msg_loss" msg_key: msg_property: msg_value: "{myvalue}" From ed4ba2725e3ae9e51c5e1afd14908ea869570110 Mon Sep 17 00:00:00 2001 From: Yabin Meng Date: Wed, 13 Oct 2021 11:27:54 -0500 Subject: [PATCH 26/53] Convert message error runtime exception to counter metrics --- .../driver/pulsar/ops/PulsarConsumerOp.java | 14 +++++++++----- .../driver/pulsar/ops/PulsarProducerOp.java | 12 ++++++++---- .../activities/pulsar_client_sanity_seqloss.yaml | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java index 7dfc3dd95..7b2e5057d 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java @@ -200,13 +200,15 @@ public class PulsarConsumerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, message.getData()); - logger.debug("Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + consumer.getConsumerName(), message.getKey(), message.getProperties(), avroGenericRecord.toString()); } else { - logger.debug("Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Sync message received: msg-key={}; msg-properties={}; msg-payload={}", + consumer.getConsumerName(), message.getKey(), message.getProperties(), new String(message.getData())); @@ -280,13 +282,15 @@ public class PulsarConsumerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, message.getData()); - logger.debug("Async message received: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Async message received: msg-key={}; msg-properties={}; msg-payload={})", + consumer.getConsumerName(), message.getKey(), message.getProperties(), avroGenericRecord.toString()); } else { - logger.debug("Async message received: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Async message received: msg-key={}; msg-properties={}; msg-payload={})", + consumer.getConsumerName(), message.getKey(), message.getProperties(), new String(message.getData())); @@ -315,7 +319,7 @@ public class PulsarConsumerOp implements PulsarOp { }); } catch (Exception e) { - throw new PulsarDriverUnexpectedException("Async message receiving failed"); + throw new PulsarDriverUnexpectedException(e); } } } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java index 796621df9..9875d2586 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerOp.java @@ -138,13 +138,15 @@ public class PulsarProducerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, msgPayload); - logger.debug("Sync message sent: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Sync message sent: msg-key={}; msg-properties={}; msg-payload={})", + producer.getProducerName(), msgKey, msgProperties, avroGenericRecord.toString()); } else { - logger.debug("Sync message sent: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Sync message sent; msg-key={}; msg-properties={}; msg-payload={}", + producer.getProducerName(), msgKey, msgProperties, msgPayload); @@ -191,13 +193,15 @@ public class PulsarProducerOp implements PulsarOp { org.apache.avro.generic.GenericRecord avroGenericRecord = AvroUtil.GetGenericRecord_ApacheAvro(avroSchema, msgPayload); - logger.debug("Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={})", + logger.debug("({}) Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={})", + producer.getProducerName(), msgKey, msgProperties, avroGenericRecord.toString()); } else { - logger.debug("Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={}", + logger.debug("({}) Aysnc message sent: msg-key={}; msg-properties={}; msg-payload={}", + producer.getProducerName(), msgKey, msgProperties, msgPayload); diff --git a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml index 61f3258b4..024bccd0b 100644 --- a/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml +++ b/driver-pulsar/src/main/resources/activities/pulsar_client_sanity_seqloss.yaml @@ -23,7 +23,7 @@ blocks: #seqerr_simu: "out_of_order" #seqerr_simu: "msg_loss" #seqerr_simu: "msg_dup" - seqerr_simu: "out_of_order, msg_loss" + #seqerr_simu: "out_of_order, msg_loss" msg_key: msg_property: msg_value: "{myvalue}" @@ -36,5 +36,5 @@ blocks: - name: s1 optype: msg-consume subscription_name: "mysub" - subscription_type: + subscription_type: "Shared" consumer_name: From 2fdbf8ec1ee7fbc7081b128693bd18694fc97b44 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 13 Oct 2021 12:51:16 -0500 Subject: [PATCH 27/53] fix for broken shade relocation with driver=cql --- driver-cql-shaded/pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 37c3a5d10..577d12f63 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -190,14 +190,14 @@ com.google.common com.datastax.internal.com_google_common - - com.datastax - dse19.com.datastax - - - io.netty - dse19.io.netty - + + + + + + + + From f100f5638bc22c13224b9caa676146efc6b638ed Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 13 Oct 2021 12:51:38 -0500 Subject: [PATCH 28/53] fix release for cql driver --- RELEASENOTES.md | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index cba097f5c..9959e1c77 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,26 +1 @@ -- 4418500d (HEAD -> main) Merge branch 'main' of github.com:nosqlbench/nosqlbench -- 21b96cfd (origin/main) Merge pull request #366 from yabinmeng/main -- b72723b7 add some missing extension docs -- a8929042 extend NBEnvironment tokens to other data sources -- 8c6d0cfe new decorator API: share Scenario metadata to interested types -- bbeee5cb new scripting extension: s3; S3 directory uploader -- ff769c7b Add S3 URL Handler -- e1e10bba allow session namer to use pre-defined timestamp -- 133760d8 auto-init the last (fall-through) NBENVIRONMENT location first -- b388a43e consolidate statedir initialization logic and docs -- 9fccf8c2 new scripting extension: shutdown; scripted shutdown hooks -- 8da6664f typo fix -- 2876e102 Remove namespace and topic level dedup setting check for each run, which is too much overhead. -- 29dafd91 Merge pull request #364 from yabinmeng/main -- 11073cf0 Address Shooky's comment in PR#364. -- cdfb7c32 Merge branch 'nosqlbench:main' into main -- 1d625f41 add S3 URL Handler -- 9c91ad71 enhance diagnostics for driver loader -- 0df40113 re-enabled epoll dependency -- cd1f4e2e Merge pull request #365 from lakshmi-M18/patch-1 -- 178abe67 Update schema-astra code for create table -- 265760d1 Address Lari's comment in PR#364. -- eb5f42f4 Fix NullPointerException of checking namespace and topic deduplication status. -- 647bd7d4 Merge branch 'main' of https://github.com/yabinmeng/nosqlbench -- edc43c5b reformat -- 37150c33 only release on main branch by default +- 2fdbf8ec (HEAD -> main) fix for broken shade relocation with driver=cql From bfd7e2513bd2b37f696d9d0f9f82534fdee84546 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 13 Oct 2021 18:03:35 +0000 Subject: [PATCH 29/53] [maven-release-plugin] prepare release nosqlbench-4.15.59 --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 5bbf82c96..a1f2462f2 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.59-SNAPSHOT + 4.15.59 @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 30827184e..e6842d440 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.59-SNAPSHOT + 4.15.59 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 577d12f63..8f5f7d4f4 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 80422c34e..ab111dda5 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index d290edf4b..567cabdb6 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index bc5ccaede..9202fa266 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 99eaea9a9..cf45a8c6d 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 746c767f5..a07868630 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index d67a2d6cd..b69a9258d 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 2343ddf1d..f1e362704 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index f43599931..7f1e4a565 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index a22ec6b61..b9452e6c2 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 8309eadfc..d470a744e 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index e3931fedb..7ce979bb1 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8eeea19f8..a2cd89c7e 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 5513eae3a..2a004cc3a 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 5d482c0d1..f2189191c 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index ac49014ef..bd6a68dab 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-userlibs - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 00a6c05df..4ee95379a 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench nb-annotations - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-userlibs - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index c646ed2ce..4d0d07f02 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-docker - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 8d193f0fb..223299cde 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 8c3ae6c5c..06d8f376d 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59 @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.59-SNAPSHOT + 4.15.59 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 2b902ea22..e93120762 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 7ea4eaa99..f9151d278 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 6cef47c07..83efc0caa 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 83ea9879b..8319b5a9d 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 4ed368891..5be07c4ee 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.59 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 4bb5feb2c..cd71ec94c 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 7b616aa0a..8ae3138b7 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/nb/pom.xml b/nb/pom.xml index 75fb5f7e0..c2b1f88ba 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-cli - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-docs - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-core - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench engine-extensions - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-web - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-kafka - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-diag - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-tcp - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-http - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-jmx - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-dsegraph-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cql-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cqld3-shaded - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cqlverify - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-mongodb - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-pulsar - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-cockroachdb - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench driver-jms - 4.15.59-SNAPSHOT + 4.15.59 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/pom.xml b/pom.xml index c8dfe8a3d..95703acc0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.59 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 50c52b3f5..d95c4a968 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 nb-api io.nosqlbench virtdata-lang - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 7396763f3..8c8a3d625 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 9e913c092..4f8a63e4d 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 79b88a92f..a3205d78b 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-basics - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index a17190477..d9e43c268 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-basics - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 5132b32b1..724990b66 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index afb3fd3cf..025de1ee8 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 93e487afd..9af948740 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-realer - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-api - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench virtdata-lib-random - 4.15.59-SNAPSHOT + 4.15.59 io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 virtdata-lib-basics io.nosqlbench - 4.15.59-SNAPSHOT + 4.15.59 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.59-SNAPSHOT + 4.15.59 From 1d34c256f8a839d3a64c75f0bb9a23c9cfdae477 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 13 Oct 2021 18:03:38 +0000 Subject: [PATCH 30/53] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index a1f2462f2..19738c485 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.59 + 4.15.60-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index e6842d440..d2d8edc37 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.59 + 4.15.60-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 8f5f7d4f4..fc7b00a27 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index ab111dda5..7220ffe44 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 567cabdb6..7a2d0bbda 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 9202fa266..c7dedfca6 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index cf45a8c6d..06d107e46 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index a07868630..8186b6176 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index b69a9258d..8da79ab60 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index f1e362704..d3467baca 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 7f1e4a565..5bf27a584 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index b9452e6c2..e4d37db12 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index d470a744e..937659623 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 7ce979bb1..d587fa9be 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index a2cd89c7e..f932153b4 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 2a004cc3a..a87a90741 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index f2189191c..26fbf9abe 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index bd6a68dab..17864da6c 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 4ee95379a..e79deb92f 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench nb-annotations - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 4d0d07f02..2a7ffbb27 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-docker - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 223299cde..cb7e99c73 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 06d8f376d..190014743 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench drivers-api - 4.15.59 + 4.15.60-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.59 + 4.15.60-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e93120762..bff600f4f 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index f9151d278..cc2c63f46 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 83efc0caa..2a1ef4405 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 8319b5a9d..cbcd487a3 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 5be07c4ee..a589844d7 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.59 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index cd71ec94c..06b17b45f 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 8ae3138b7..7da4a0cd0 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index c2b1f88ba..b10a4ebc0 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-cli - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-docs - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-core - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench engine-extensions - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-web - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-kafka - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-diag - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-tcp - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-http - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-jmx - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench driver-jms - 4.15.59 + 4.15.60-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/pom.xml b/pom.xml index 95703acc0..9f1ecbdc5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.59 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index d95c4a968..d33bb76a3 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 8c8a3d625..55d28cb4f 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 4f8a63e4d..3b5b8b317 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index a3205d78b..06f60c5a6 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d9e43c268..8f3d11a6e 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 724990b66..b8e88d6ef 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 025de1ee8..91133480a 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 9af948740..9aff919ae 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-api - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.59 + 4.15.60-SNAPSHOT io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.59 + 4.15.60-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.59 + 4.15.60-SNAPSHOT From 6569fa52eac397db66a42a799f7ac21d6a17aded Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 14 Oct 2021 12:50:11 -0500 Subject: [PATCH 31/53] reformat all pom.xml files --- docsys/pom.xml | 4 +- driver-cockroachdb/pom.xml | 4 +- driver-cql-shaded/pom.xml | 25 ++++------- driver-cqld3-shaded/pom.xml | 14 +++--- driver-cqld4/pom.xml | 4 +- driver-cqlverify/pom.xml | 66 ++++++++++++++-------------- driver-diag/pom.xml | 4 +- driver-dsegraph-shaded/pom.xml | 35 ++++++++------- driver-http/pom.xml | 4 +- driver-jdbc/pom.xml | 4 +- driver-jms/pom.xml | 34 ++++++++------- driver-jmx/pom.xml | 8 ++-- driver-kafka/pom.xml | 74 ++++++++++++++++--------------- driver-mongodb/pom.xml | 8 ++-- driver-pulsar/pom.xml | 4 +- driver-stdout/pom.xml | 8 ++-- driver-tcp/pom.xml | 10 +++-- driver-web/pom.xml | 4 +- drivers-api/pom.xml | 4 +- engine-api/pom.xml | 4 +- engine-cli/pom.xml | 4 +- engine-clients/pom.xml | 70 ++++++++++++++--------------- engine-core/pom.xml | 40 +++++++++-------- engine-docker/pom.xml | 4 +- engine-docs/pom.xml | 80 +++++++++++++++++----------------- engine-extensions/pom.xml | 38 ++++++++-------- engine-rest/pom.xml | 4 +- mvn-defaults/pom.xml | 4 +- pom.xml | 4 +- 29 files changed, 311 insertions(+), 259 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 5bbf82c96..98b5ddf34 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 docsys diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 30827184e..ffa13291b 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 577d12f63..b670a38ba 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -23,13 +25,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT @@ -183,21 +185,11 @@ false true true - - com.google.common com.datastax.internal.com_google_common - - - - - - - - @@ -205,12 +197,13 @@ - + io.nosqlbench.engine.cli.NBCLI - + - *:* diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 80422c34e..da09fea93 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -24,13 +26,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT @@ -208,10 +210,12 @@ - + io.nosqlbench.engine.cli.NBCLI - + diff --git a/driver-cqld4/pom.xml b/driver-cqld4/pom.xml index 013344e18..74e082d7f 100644 --- a/driver-cqld4/pom.xml +++ b/driver-cqld4/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index d290edf4b..953c2de47 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -1,38 +1,40 @@ - - 4.0.0 + + 4.0.0 - - io.nosqlbench - mvn-defaults - 4.15.59-SNAPSHOT - ../mvn-defaults - - - driver-cqlverify - jar - ${project.artifactId} - - - A CQL content verifier ActivityType, based on the CQL ActivityType - built on http://nosqlbench.io/ - - - - - - - - io.nosqlbench - driver-cql-shaded + + io.nosqlbench + mvn-defaults 4.15.59-SNAPSHOT - + ../mvn-defaults + - - io.nosqlbench - drivers-api - 4.15.59-SNAPSHOT - + driver-cqlverify + jar + ${project.artifactId} - + + A CQL content verifier ActivityType, based on the CQL ActivityType + built on http://nosqlbench.io/ + + + + + + + + io.nosqlbench + driver-cql-shaded + 4.15.59-SNAPSHOT + + + + io.nosqlbench + drivers-api + 4.15.59-SNAPSHOT + + + diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index bc5ccaede..135b1daec 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 99eaea9a9..e66a64c69 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -78,12 +80,12 @@ antlr4-runtime - - - - - - + + + + + + @@ -224,14 +226,14 @@ com.google.common com.datastax.internal.com_google_common - - - - - - - - + + + + + + + + @@ -239,7 +241,8 @@ - + io.nosqlbench.engine.cli.NBCLI diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 746c767f5..e572c79b0 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index d67a2d6cd..6337de6c7 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -1,5 +1,7 @@ - + nosqlbench io.nosqlbench diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 2343ddf1d..b8ee44379 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -17,23 +19,23 @@ into a pulsar system via JMS 2.0 compatibile APIs. NOTE: this is JMS compatible driver from DataStax that allows using a Pulsar cluster - as the potential JMS Destination + as the potential JMS Destination - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index f43599931..1a1ab23a4 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -22,13 +24,13 @@ io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index a22ec6b61..44c6b3841 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -37,27 +39,27 @@ io.confluent - kafka-avro-serializer - 5.5.1 + kafka-avro-serializer + 5.5.1 - - io.nosqlbench - engine-api - 4.15.59-SNAPSHOT - + + io.nosqlbench + engine-api + 4.15.59-SNAPSHOT + - - io.nosqlbench - driver-stdout - 4.15.59-SNAPSHOT - + + io.nosqlbench + driver-stdout + 4.15.59-SNAPSHOT + - - - - - + + + + + @@ -71,23 +73,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 8309eadfc..e56e3feb5 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 driver-mongodb @@ -21,13 +23,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index e3931fedb..5551692d5 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8eeea19f8..6fba145c8 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 driver-stdout @@ -22,13 +24,13 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 5513eae3a..38f371aa9 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 driver-tcp @@ -24,19 +26,19 @@ io.nosqlbench engine-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench drivers-api - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT io.nosqlbench driver-stdout - 4.15.59-SNAPSHOT + 4.15.59-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 5d482c0d1..77add755d 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 driver-web diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index ac49014ef..dde40bf6d 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 00a6c05df..7d5326461 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index c646ed2ce..064adde7a 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 8d193f0fb..98abc164a 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -1,42 +1,44 @@ - - 4.0.0 + + 4.0.0 - - mvn-defaults - io.nosqlbench - 4.15.59-SNAPSHOT - ../mvn-defaults - - - engine-clients - jar - ${project.artifactId} - - A set of clients for calling nosqlbench and related services. - - - - - - io.nosqlbench - engine-api + + mvn-defaults + io.nosqlbench 4.15.59-SNAPSHOT - + ../mvn-defaults + - + engine-clients + jar + ${project.artifactId} + + A set of clients for calling nosqlbench and related services. + - - - - src/test/resources - - examples/** - - - - - + + + + io.nosqlbench + engine-api + 4.15.59-SNAPSHOT + + + + + + + + src/test/resources + + examples/** + + + + + diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 8c3ae6c5c..b7dfffae1 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -20,7 +22,7 @@ - + @@ -72,25 +74,25 @@ org.graalvm.js js-scriptengine - - org.graalvm.tools - profiler - runtime - - - org.graalvm.tools - chromeinspector - runtime - - - io.nosqlbench - engine-clients - 4.15.59-SNAPSHOT - compile - + + org.graalvm.tools + profiler + runtime + + + org.graalvm.tools + chromeinspector + runtime + + + io.nosqlbench + engine-clients + 4.15.59-SNAPSHOT + compile + - + diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 2b902ea22..44faf0fde 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 7ea4eaa99..dd213efe7 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -1,46 +1,48 @@ - - 4.0.0 + + 4.0.0 - - mvn-defaults - io.nosqlbench - 4.15.59-SNAPSHOT - ../mvn-defaults - - - engine-docs - jar - ${project.artifactId} - CLI for nosqlbench. - - - nosqlbench Docs - - - - - - - - - - - - io.nosqlbench - docsys + + mvn-defaults + io.nosqlbench 4.15.59-SNAPSHOT - + ../mvn-defaults + - + engine-docs + jar + ${project.artifactId} + CLI for nosqlbench. - - - - src/main/resources - true - - - + + nosqlbench Docs + + + + + + + + + + + + io.nosqlbench + docsys + 4.15.59-SNAPSHOT + + + + + + + + src/main/resources + true + + + diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 6cef47c07..0c382c911 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 @@ -40,23 +42,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 83ea9879b..19e0bedf2 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 4ed368891..928cb47cc 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 io.nosqlbench diff --git a/pom.xml b/pom.xml index c8dfe8a3d..868180761 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 nosqlbench From e53af8bf5f99b1154feb74fed6ae8265f75c8194 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 15 Oct 2021 15:32:05 -0500 Subject: [PATCH 32/53] improve NBEnvironment and S3 interaction --- .../extensions/s3uploader/S3Uploader.java | 34 +++++++--- .../engine/extensions/s3uploader/s3.md | 68 +++++++++++++++++++ .../io/nosqlbench/nb/api/NBEnvironment.java | 36 +++++++--- .../nb/addins/s3/s3utils/S3UploaderDemo.java | 2 + .../nosqlbench/nb/api/NBEnvironmentTest.java | 10 +++ 5 files changed, 129 insertions(+), 21 deletions(-) create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/s3.md diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java index a96911ea3..c236cbf87 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/S3Uploader.java @@ -18,6 +18,7 @@ import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.LinkOption; import java.nio.file.Path; +import java.util.LinkedHashMap; import java.util.Map; public class S3Uploader implements ScenarioMetadataAware { @@ -32,19 +33,25 @@ public class S3Uploader implements ScenarioMetadataAware { this.scriptContext = scriptContext; } + /** + * Upload the local file path to the specified S3 URL, then return the URL of the bucket + * in its fully expanded form. See the details on token expansions in the s3.md help docs. + * @param localFilePath The path to the local directory + * @param urlTemplate A template that is expanded to a valid S3 URL + * @return The fully expanded name of the URL used for upload + */ public String uploadDirToUrl(String localFilePath, String urlTemplate) { return uploadDirToUrlTokenized(localFilePath, urlTemplate, Map.of()); } /** - * Upload the local file path to the specified URL, and then return the URL of the - * bucket in its fully expanded form. - * This requires you to specify a valid S3 url with place-holder tokens, such as - * 
{@code s3://bucketname/prefix1/prefix2/DATA}
- * Before processing, some tokens will be automatically expanded based on local node - * info. These tokens include: - * - * @return The bucket URL of the expaneded name. + * Upload the local file path to the specified S3 URL, then return the URL of the bucket + * in its fully expanded form. See the details on token expansions in the s3.md help docs. + * Any params which are provided supersede the normally provided values from the system. + * @param localFilePath The path to the local directory + * @param urlTemplate A template that is expanded to a valid S3 URL + * @param params Additional token expansions which will take precedence over other available values. + * @return The fully expanded name of the URL used for upload */ public String uploadDirToUrlTokenized(String localFilePath, String urlTemplate, Map params) { @@ -58,9 +65,16 @@ public class S3Uploader implements ScenarioMetadataAware { } File sourceDir = sourcePath.toFile(); - String url = NBEnvironment.INSTANCE - .interpolateWithTimestamp(urlTemplate,scenarioMetadata.getStartedAt(),params) + Map combined = new LinkedHashMap<>(params); + combined.putAll(scenarioMetadata.asMap()); + String url = NBEnvironment.INSTANCE.interpolateWithTimestamp( + urlTemplate, + scenarioMetadata.getStartedAt(), + combined + ) .orElseThrow(); + logger.debug("S3 composite URL is '" + url + "'"); + S3UrlFields fields = S3UrlFields.fromURLString(url); S3ClientCache s3ClientCache = new S3ClientCache(); AmazonS3 s3 = s3ClientCache.get(fields); diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/s3.md b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/s3.md new file mode 100644 index 000000000..b7742a88d --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/s3uploader/s3.md @@ -0,0 +1,68 @@ +S3 extension +============== + +Allow uploading of a local directory on the default filesystem +to an S3 bucket, using an S3 URI to specify the bucket, location, and so on. + +The URL is specified in the standard S3 format, such as: + +1. `s3://mybucket/mypath-as-a-key/with-any-level-of-depth` +2. `s3://myuser:mypass@mybucket/mypath-as-a-key/with-any-level-of-depth` + +In addition, any tokens which are supported by the standard NoSQLBench +token substitution mechanism will be used to construct a URL at the time +of usage. These forms include the following: + +- Scenario Metadata - There are several key fields initialized for a scenario which can be used as common + reference points. These occlude the environment variables of the same name. These are: + - SESSION_NAME - The name auto-generated for a session, used in the logfile names, and so on. + - SYSTEM_ID - The string form of the most canonically identifying IP address, excluding + known symbolic interface names (docker*, for example) and all localhost addresses. + - SYSTEM_FINGERPRINT - a stable and anonymized identifier for a given system. This will be + stable as long as the networking configuration does not change. +- System Properties + - Any parameter in `$word1.word2...` form -- any multi-part variable name with separating dots + is taken as a system property to the JVM. These are expanded in place. Both `$word1.word2` + and `${word1.word2}` patterns are supported, whereas the latter is more strict and thus safer. +- Environment Variables + - As with System Properties, environment variable form the shell are also supported, as long + as they do not include a dot. +- Temporal Fields from the Scenario start time + - Any field specifier that you can use with the temporal types in Java's standard String. + format can be used. The reference time for these is always the scenario start time. + - Example: The default session name template looks like `scenario_%tY%tm%td_%tH%tM%tS_%tL` + +## Examples +``` +// If you have local logical identifiers in your scenario script which you want +// to templatize into your upload paths, you can provide your own js object +// as the third parameter +s3.uploadDirToUrlTokenized( + 'metrics', + 's3://test-results/${HOSTNAME}/${testid}-${testversion}/metrics', + { + 'testid':'20210343', + 'testversion':'v2' + } +); + +// Otherwise, use the two-parameter version: +s3.uploadDirToUrl('metrics','s3://test-results/${HOSTNAME}/metrics'); +``` + +## Post-Hoc upload + +Scripting extensions only run if the scenario is not halted before they are invoked +in the main scenario script. If you want to ensure that this one runs after a test, +regardless of when or why the test stopped, it is possible to wrap it within +a shutdown hook which will run after scenario completion. + +This is an example of how to do so: + +``` +shutdown.addShutdownHook('upload_metrics', function f() { + s3.uploadDirToUrl('metrics','s3://test-results/${HOSTNAME}/metrics'); +}); + +``` + diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java b/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java index c18b5d3be..315d10799 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/NBEnvironment.java @@ -92,16 +92,26 @@ public class NBEnvironment { * @param defaultValue The value to return if the name is not found * @return the system property or environment variable's value, or the default value */ - public String getOr(String name, String defaultValue) { - String value = peek(name); + public String getOr(String name, String defaultValue, Map supplemental) { + String value = peek(name, supplemental); if (value == null) { value = defaultValue; } return reference(name, value); } - private String peek(String name) { + public String getOr(String name, String defaultValue) { + return getOr(name, defaultValue, Map.of()); + } + + private String peek(String name, Map supplemental) { String value = null; + if (supplemental.containsKey(name)) { + value = supplemental.get(name); + if (value!=null) { + return value; + } + } if (name.contains(".")) { value = System.getProperty(name.toLowerCase()); if (value != null) { @@ -145,7 +155,11 @@ public class NBEnvironment { } public boolean containsKey(String name) { - String value = peek(name); + return containsKey(name, Map.of()); + } + + public boolean containsKey(String name, Map supplemental) { + String value = peek(name, supplemental); return (value != null); } @@ -162,7 +176,7 @@ public class NBEnvironment { * @param word The word to interpolate the environment values into * @return The interpolated value, after substitutions, or null if any lookup failed */ - public Optional interpolate(String word) { + public Optional interpolate(String word, Map supplemental) { Pattern envpattern = Pattern.compile("(\\$(?[a-zA-Z_][A-Za-z0-9_.]+)|\\$\\{(?[^}]+)\\})"); Matcher matcher = envpattern.matcher(word); StringBuilder sb = new StringBuilder(); @@ -171,7 +185,7 @@ public class NBEnvironment { if (envvar == null) { envvar = matcher.group("env2"); } - String value = peek(envvar); + String value = peek(envvar,supplemental); if (value == null) { if (logger != null) { logger.debug("no value found for '" + envvar + "', returning Optional.empty() for '" + word + "'"); @@ -186,6 +200,10 @@ public class NBEnvironment { return Optional.of(sb.toString()); } + public Optional interpolate(String word) { + return interpolate(word,Map.of()); + } + public List interpolateEach(CharSequence delim, String toBeRecombined) { String[] split = toBeRecombined.split(delim.toString()); List mapped = new ArrayList<>(); @@ -224,12 +242,8 @@ public class NBEnvironment { */ public final Optional interpolateWithTimestamp(String rawtext, long millis, Map map) { String result = rawtext; - for (String key : map.keySet()) { - String value = map.get(key); - result = result.replaceAll(Pattern.quote(key), value); - } result = SessionNamer.format(result, millis); - return interpolate(result); + return interpolate(result,map); } public final Optional interpolateWithTimestamp(String rawText, long millis) { diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java index 040002af7..20c5f78fb 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java @@ -26,9 +26,11 @@ public class S3UploaderDemo { if (!FileSystems.getDefault().equals(sourcePath.getFileSystem())) { throw new RuntimeException("The file must reside on the default filesystem to be uploaded by S3."); } + if (!Files.isDirectory(sourcePath, LinkOption.NOFOLLOW_LINKS)) { throw new RuntimeException("path '" + sourcePath + "' is not a directory."); } + TransferManager tm = TransferManagerBuilder.defaultTransferManager(); MultipleFileUpload mfu = tm.uploadDirectory(bucket, prefix, sourcePath.toFile(), true); try { diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java index 014abb111..9081ed452 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java @@ -3,6 +3,7 @@ package io.nosqlbench.nb.api; import org.junit.jupiter.api.Test; import java.util.Map; +import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; @@ -23,7 +24,16 @@ public class NBEnvironmentTest { long millis = 1633964892320L; String time1 = env.interpolateWithTimestamp("word WOO %td %% end", millis, Map.of("WOO","WOW")).orElse(null); assertThat(time1).isEqualTo("word WOW 11 % end"); + } + @Test + public void testInterpolationPrecedence() { + NBEnvironment env = new NBEnvironment(); + Optional superseded = env.interpolate("$TEST_KEY, $USER", Map.of("TEST_KEY", "supersedes1", "USER", "supersedes2")); + assertThat(superseded).contains("supersedes1, supersedes2"); + superseded = env.interpolate("$USER", Map.of("TEST_KEY", "supersedes1")); + assertThat(superseded).isPresent(); + assertThat(superseded.get()).isNotEqualTo("supersedes2"); } } From 49207a44f2f8c202600bbfe954579ff66f62d76b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 15 Oct 2021 15:32:35 -0500 Subject: [PATCH 33/53] fix release for s3 and pulsar testing features --- RELEASENOTES.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9959e1c77..a666bde7c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1 +1,4 @@ -- 2fdbf8ec (HEAD -> main) fix for broken shade relocation with driver=cql +- e53af8bf (HEAD -> main) improve NBEnvironment and S3 interaction +- cb477996 merge fixups +- e77bfea0 (origin/main) Merge pull request #367 from yabinmeng/main +- 6569fa52 reformat all pom.xml files From feb0fda1117e8c72d149fc3497c54f83f17b38de Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 15 Oct 2021 15:56:39 -0500 Subject: [PATCH 34/53] fix broken test --- .../src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java index 9081ed452..9f316ad61 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java @@ -22,8 +22,8 @@ public class NBEnvironmentTest { public void testInterpolationWithTimestamp() { NBEnvironment env = new NBEnvironment(); long millis = 1633964892320L; - String time1 = env.interpolateWithTimestamp("word WOO %td %% end", millis, Map.of("WOO","WOW")).orElse(null); - assertThat(time1).isEqualTo("word WOW 11 % end"); + String time1 = env.interpolateWithTimestamp("word WOO$WOO %td %% end", millis, Map.of("WOO","WOW")).orElse(null); + assertThat(time1).isEqualTo("word WOOWOW 11 % end"); } @Test From d5f28fe85fa0b99a45169663d95e21b312b86956 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Fri, 15 Oct 2021 15:57:00 -0500 Subject: [PATCH 35/53] fix release for s3 and pulsar testing features --- RELEASENOTES.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a666bde7c..5afe6b392 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,4 +1,6 @@ -- e53af8bf (HEAD -> main) improve NBEnvironment and S3 interaction +- feb0fda1 (HEAD -> main) fix broken test +- 49207a44 (origin/main) fix release for s3 and pulsar testing features +- e53af8bf improve NBEnvironment and S3 interaction - cb477996 merge fixups -- e77bfea0 (origin/main) Merge pull request #367 from yabinmeng/main +- e77bfea0 Merge pull request #367 from yabinmeng/main - 6569fa52 reformat all pom.xml files From e04f0fb85cf6b1c51e5394092a83fde086131cc7 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Fri, 15 Oct 2021 21:10:32 +0000 Subject: [PATCH 36/53] [maven-release-plugin] prepare release nosqlbench-4.15.60 --- docsys/pom.xml | 10 ++++---- driver-cockroachdb/pom.xml | 8 +++---- driver-cql-shaded/pom.xml | 16 +++++-------- driver-cqld3-shaded/pom.xml | 16 +++++-------- driver-cqlverify/pom.xml | 10 ++++---- driver-diag/pom.xml | 10 ++++---- driver-dsegraph-shaded/pom.xml | 13 ++++------ driver-http/pom.xml | 10 ++++---- driver-jdbc/pom.xml | 8 +++---- driver-jms/pom.xml | 10 ++++---- driver-jmx/pom.xml | 10 ++++---- driver-kafka/pom.xml | 10 ++++---- driver-mongodb/pom.xml | 10 ++++---- driver-pulsar/pom.xml | 10 ++++---- driver-stdout/pom.xml | 10 ++++---- driver-tcp/pom.xml | 12 ++++------ driver-web/pom.xml | 10 ++++---- drivers-api/pom.xml | 10 ++++---- engine-api/pom.xml | 14 +++++------ engine-cli/pom.xml | 10 ++++---- engine-clients/pom.xml | 10 ++++---- engine-core/pom.xml | 12 ++++------ engine-docker/pom.xml | 8 +++---- engine-docs/pom.xml | 8 +++---- engine-extensions/pom.xml | 8 +++---- engine-rest/pom.xml | 8 +++---- mvn-defaults/pom.xml | 8 +++---- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 8 +++---- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 162 insertions(+), 223 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index c657666b9..caf4c61c9 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 docsys @@ -14,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -23,7 +21,7 @@ io.nosqlbench nb-api - 4.15.60-SNAPSHOT + 4.15.60 @@ -119,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 15aada928..0f4251cd3 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -23,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.60-SNAPSHOT + 4.15.60 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index ae6029244..b2d624e55 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -25,13 +23,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 @@ -197,12 +195,10 @@ - + io.nosqlbench.engine.cli.NBCLI - + diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index c03beb773..c4bd99ed9 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -26,13 +24,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 @@ -210,12 +208,10 @@ - + io.nosqlbench.engine.cli.NBCLI - + diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index da63de038..8edfbb045 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -26,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 665aade3a..ec4529fd6 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -22,13 +20,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 98fadd759..7578cd0c1 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -25,13 +23,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 @@ -241,8 +239,7 @@ - + io.nosqlbench.engine.cli.NBCLI diff --git a/driver-http/pom.xml b/driver-http/pom.xml index ffb85dbdf..adf630ce9 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -24,13 +22,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index fcb1edfd9..3aa6069ae 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -1,11 +1,9 @@ - + nosqlbench io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 4.0.0 @@ -20,7 +18,7 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 884aee278..0a94e40be 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -42,13 +40,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-stdout - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index f816eb428..e3b64eceb 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -24,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index fdd4f12d9..45b89b786 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -46,13 +44,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-stdout - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index ba985fd20..4154fd4e7 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 driver-mongodb @@ -9,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -23,13 +21,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index ca8335d0b..51197c668 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -42,13 +40,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-stdout - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8ae3cb3bc..73908eaac 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 driver-stdout @@ -9,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -24,13 +22,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index e82211a7d..adae8ff6c 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 driver-tcp @@ -9,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -26,19 +24,19 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-stdout - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 4226ef2c4..9b57701a0 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 driver-web @@ -9,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -24,13 +22,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index d55f25810..03b049cf4 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -25,13 +23,13 @@ io.nosqlbench nb-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-userlibs - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index b181713d2..2676e3ae9 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -25,25 +23,25 @@ io.nosqlbench nb-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench nb-annotations - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-userlibs - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 6def51aaa..7ce6d3960 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -25,13 +23,13 @@ io.nosqlbench engine-core - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench engine-docker - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index dbf543f1b..a436d21be 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -23,7 +21,7 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 @@ -34,7 +32,7 @@ src/test/resources examples/** - + diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 701399058..6ad89e305 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -30,13 +28,13 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench drivers-api - 4.15.60-SNAPSHOT + 4.15.60 @@ -87,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.60-SNAPSHOT + 4.15.60 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 2cfc1cc81..bed5b2700 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -58,7 +56,7 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 526ed83f9..25eff69e2 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -30,7 +28,7 @@ io.nosqlbench docsys - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index b3b3dc6c1..1b03fac87 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -24,7 +22,7 @@ io.nosqlbench engine-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 8c8c42d17..fb520a327 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -37,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 6e2262694..baf51ef80 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 pom @@ -80,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.60 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 06b17b45f..af9883e95 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 7da4a0cd0..947b4e3fb 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/nb/pom.xml b/nb/pom.xml index b10a4ebc0..55c37b96b 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench engine-cli - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench engine-docs - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench engine-core - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench engine-extensions - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-web - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-kafka - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-stdout - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-diag - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-tcp - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-http - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-jmx - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-dsegraph-shaded - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-cql-shaded - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-cqld3-shaded - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-cqlverify - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-mongodb - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-pulsar - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-cockroachdb - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench driver-jms - 4.15.60-SNAPSHOT + 4.15.60 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/pom.xml b/pom.xml index c433575bc..ca15f22e1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,4 @@ - + 4.0.0 nosqlbench @@ -9,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 mvn-defaults @@ -148,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.60 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index d33bb76a3..bb5bed242 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 nb-api io.nosqlbench virtdata-lang - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 55d28cb4f..0f800108d 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 3b5b8b317..55b7c0724 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 06f60c5a6..5814d7b8e 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-lib-basics - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 8f3d11a6e..100e74544 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-lib-basics - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index b8e88d6ef..290af065e 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 91133480a..c2be115d1 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.60-SNAPSHOT + 4.15.60 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 9aff919ae..a6bb16468 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-lib-realer - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-api - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench virtdata-lib-random - 4.15.60-SNAPSHOT + 4.15.60 io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 virtdata-lib-basics io.nosqlbench - 4.15.60-SNAPSHOT + 4.15.60 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.60-SNAPSHOT + 4.15.60 From 3cfda974132a0faee8e26adc7d962c66287fc99a Mon Sep 17 00:00:00 2001 From: nb-droid Date: Fri, 15 Oct 2021 21:10:34 +0000 Subject: [PATCH 37/53] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index caf4c61c9..37e657ed3 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.60 + 4.15.61-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 0f4251cd3..92d80e123 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.60 + 4.15.61-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index b2d624e55..a59137216 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index c4bd99ed9..e2295b68f 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 8edfbb045..0c2025955 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index ec4529fd6..6e330aa92 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 7578cd0c1..47924db7d 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index adf630ce9..182918fb9 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 3aa6069ae..5578b7408 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 0a94e40be..536b64472 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-stdout - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index e3b64eceb..4b342d2ff 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 45b89b786..73167c0b7 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-stdout - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 4154fd4e7..dcfe85a03 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 51197c668..7cea1c4a2 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-stdout - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 73908eaac..396e41822 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index adae8ff6c..625012baa 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-stdout - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 9b57701a0..7794f0ae4 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index 03b049cf4..ee0686fe7 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 2676e3ae9..948adfa22 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench nb-annotations - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 7ce6d3960..bb92da832 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench engine-docker - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index a436d21be..57d34885f 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 6ad89e305..2475bbf9e 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench drivers-api - 4.15.60 + 4.15.61-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.60 + 4.15.61-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index bed5b2700..b587dfef5 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 25eff69e2..20ae75154 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 1b03fac87..ed0c35036 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index fb520a327..75231bdee 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index baf51ef80..932b73827 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.60 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index af9883e95..10ac049e6 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 947b4e3fb..1e0a6d401 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 55c37b96b..8b0b737f3 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench engine-cli - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench engine-docs - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench engine-core - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench engine-extensions - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-web - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-kafka - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-stdout - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-diag - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-tcp - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-http - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-jmx - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench driver-jms - 4.15.60 + 4.15.61-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/pom.xml b/pom.xml index ca15f22e1..c7cf0cfd3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.60 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index bb5bed242..a2de085e9 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 0f800108d..91bf005b3 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 55b7c0724..04648cedf 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 5814d7b8e..539cbd468 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 100e74544..d7f69278b 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 290af065e..939db2537 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index c2be115d1..003c2850d 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.60 + 4.15.61-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index a6bb16468..6f23ad9dd 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-api - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.60 + 4.15.61-SNAPSHOT io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.60 + 4.15.61-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.60 + 4.15.61-SNAPSHOT From e6608234730adc8746b16604041c476ca6e9c917 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 15 Oct 2021 12:49:20 +0300 Subject: [PATCH 38/53] Make ratelimiter instance thread specific for PulsarActivity when cyclerate_per_thread is set to true --- .../driver/pulsar/PulsarActivity.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java index e3aa48163..af7f64744 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java @@ -10,6 +10,8 @@ import io.nosqlbench.driver.pulsar.util.PulsarNBClientConf; import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiter; +import io.nosqlbench.engine.api.activityapi.ratelimits.RateLimiters; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; @@ -57,6 +59,7 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve private NBErrorHandler errorHandler; private OpSequence> sequencer; private volatile Throwable asyncOperationFailure; + private boolean cycleratePerThread; public PulsarActivity(ActivityDef activityDef) { super(activityDef); @@ -108,11 +111,26 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve () -> activityDef.getParams().getOptionalString("errors").orElse("stop"), this::getExceptionMetrics ); + + cycleratePerThread = activityDef.getParams().takeBoolOrDefault("cyclerate_per_thread", false); } + private final ThreadLocal cycleLimiterThreadLocal = ThreadLocal.withInitial(() -> { + if (super.getCycleLimiter() != null) { + return RateLimiters.createOrUpdate(this.getActivityDef(), "cycles", null, + super.getCycleLimiter().getRateSpec()); + } else { + return null; + } + }); + @Override - public synchronized void onActivityDefUpdate(ActivityDef activityDef) { - super.onActivityDefUpdate(activityDef); + public RateLimiter getCycleLimiter() { + if (cycleratePerThread) { + return cycleLimiterThreadLocal.get(); + } else { + return super.getCycleLimiter(); + } } public NBErrorHandler getErrorHandler() { return errorHandler; } From 7a6ec96544d347ef2cffe62c67bfd7c641ef1449 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Sat, 16 Oct 2021 22:05:25 +0300 Subject: [PATCH 39/53] Pulsar: Use thread local and topic based sequence tracking --- .../PulsarMsgDuplicateException.java | 10 -- .../exception/PulsarMsgLossException.java | 11 -- .../PulsarMsgOutOfOrderException.java | 11 -- .../MessageSequenceNumberSendingHandler.java | 87 ++++++++++ .../pulsar/ops/PulsarConsumerMapper.java | 44 +++-- .../driver/pulsar/ops/PulsarConsumerOp.java | 84 ++-------- .../pulsar/ops/PulsarConumerEmptyOp.java | 21 --- .../pulsar/ops/PulsarProducerEmptyOp.java | 20 --- .../pulsar/ops/PulsarProducerMapper.java | 106 ++++-------- .../driver/pulsar/ops/ReadyPulsarOp.java | 22 ++- .../ops/ReceivedMessageSequenceTracker.java | 113 +++++++++++++ .../pulsar/util/PulsarActivityUtil.java | 24 ++- ...ssageSequenceNumberSendingHandlerTest.java | 74 +++++++++ .../ReceivedMessageSequenceTrackerTest.java | 152 ++++++++++++++++++ 14 files changed, 524 insertions(+), 255 deletions(-) delete mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgDuplicateException.java delete mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgLossException.java delete mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgOutOfOrderException.java create mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandler.java delete mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java delete mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java create mode 100644 driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java create mode 100644 driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandlerTest.java create mode 100644 driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgDuplicateException.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgDuplicateException.java deleted file mode 100644 index 8847ee6a4..000000000 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgDuplicateException.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.nosqlbench.driver.pulsar.exception; - -public class PulsarMsgDuplicateException extends RuntimeException { - - public PulsarMsgDuplicateException(boolean asyncPulsarOp, long nbCycleNum, long curMsgSeqId, long prevMsgSeqId) { - super("" + (asyncPulsarOp ? "[AsyncAPI]" : "[SyncAPI]") + - " Detected duplicate message when message deduplication is enabled (curCycleNum=" + nbCycleNum + - ", curMsgSeqId=" + curMsgSeqId + ", prevMsgSeqId=" + prevMsgSeqId + ")."); - } -} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgLossException.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgLossException.java deleted file mode 100644 index 268d0651f..000000000 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgLossException.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.nosqlbench.driver.pulsar.exception; - -public class PulsarMsgLossException extends RuntimeException { - - public PulsarMsgLossException(boolean asyncPulsarOp, long nbCycleNum, long curMsgSeqId, long prevMsgSeqId) { - super("" + (asyncPulsarOp ? "[AsyncAPI]" : "[SyncAPI]") + - " Detected message sequence id gap (curCycleNum=" + nbCycleNum + - ", curMsgSeqId=" + curMsgSeqId + ", prevMsgSeqId=" + prevMsgSeqId + "). " + - "Some published messages are not received!"); - } -} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgOutOfOrderException.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgOutOfOrderException.java deleted file mode 100644 index 88812b493..000000000 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/exception/PulsarMsgOutOfOrderException.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.nosqlbench.driver.pulsar.exception; - -public class PulsarMsgOutOfOrderException extends RuntimeException { - - public PulsarMsgOutOfOrderException(boolean asyncPulsarOp, long nbCycleNum, long curMsgSeqId, long prevMsgSeqId) { - super("" + (asyncPulsarOp ? "[AsyncAPI]" : "[SyncAPI]" ) + - " Detected message ordering is not guaranteed (curCycleNum=" + nbCycleNum + - ", curMsgSeqId=" + curMsgSeqId + ", prevMsgSeqId=" + prevMsgSeqId + "). " + - "Older messages are received earlier!"); - } -} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandler.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandler.java new file mode 100644 index 000000000..a7d813de2 --- /dev/null +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandler.java @@ -0,0 +1,87 @@ +package io.nosqlbench.driver.pulsar.ops; + +import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; +import java.util.*; +import org.apache.commons.lang3.RandomUtils; + +/** + * Handles adding a monotonic sequence number to message properties of sent messages + */ +class MessageSequenceNumberSendingHandler { + static final int SIMULATED_ERROR_PROBABILITY_PERCENTAGE = 10; + long number = 1; + Queue outOfOrderNumbers; + + public long getNextSequenceNumber(Set simulatedErrorTypes) { + return getNextSequenceNumber(simulatedErrorTypes, SIMULATED_ERROR_PROBABILITY_PERCENTAGE); + } + + long getNextSequenceNumber(Set simulatedErrorTypes, int errorProbabilityPercentage) { + simulateError(simulatedErrorTypes, errorProbabilityPercentage); + return nextNumber(); + } + + private void simulateError(Set simulatedErrorTypes, int errorProbabilityPercentage) { + if (!simulatedErrorTypes.isEmpty() && shouldSimulateError(errorProbabilityPercentage)) { + int selectIndex = 0; + int numberOfErrorTypes = simulatedErrorTypes.size(); + if (numberOfErrorTypes > 1) { + // pick one of the simulated error type randomly + selectIndex = RandomUtils.nextInt(0, numberOfErrorTypes); + } + PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE errorType = simulatedErrorTypes.stream() + .skip(selectIndex) + .findFirst() + .get(); + switch (errorType) { + case OutOfOrder: + // simulate message out of order + injectMessagesOutOfOrder(); + break; + case MsgDup: + // simulate message duplication + injectMessageDuplication(); + break; + case MsgLoss: + // simulate message loss + injectMessageLoss(); + break; + } + } + } + + private boolean shouldSimulateError(int errorProbabilityPercentage) { + // Simulate error with the specified probability + return RandomUtils.nextInt(0, 100) < errorProbabilityPercentage; + } + + long nextNumber() { + if (outOfOrderNumbers != null) { + long nextNumber = outOfOrderNumbers.poll(); + if (outOfOrderNumbers.isEmpty()) { + outOfOrderNumbers = null; + } + return nextNumber; + } + return number++; + } + + void injectMessagesOutOfOrder() { + if (outOfOrderNumbers == null) { + outOfOrderNumbers = new ArrayDeque<>(Arrays.asList(number + 2, number, number + 1)); + number += 3; + } + } + + void injectMessageDuplication() { + if (outOfOrderNumbers == null) { + number--; + } + } + + void injectMessageLoss() { + if (outOfOrderNumbers == null) { + number++; + } + } +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java index 25af5d8ac..e40da3ad4 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerMapper.java @@ -3,6 +3,8 @@ package io.nosqlbench.driver.pulsar.ops; import io.nosqlbench.driver.pulsar.PulsarActivity; import io.nosqlbench.driver.pulsar.PulsarSpace; import io.nosqlbench.engine.api.templating.CommandTemplate; +import java.util.HashMap; +import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.api.Consumer; @@ -30,14 +32,6 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { private final LongFunction subscriptionTypeFunc; private final boolean e2eMsProc; - // Used for message loss checking - private long prevMsgSeqId = -1; - - // Used for early quiting when there are message loss - // Otherwise, sync API may unblock unnecessarily - private long totalMsgLossCnt = 0; - private long maxMsgSeqToExpect = -1; - public PulsarConsumerMapper(CommandTemplate cmdTpl, PulsarSpace clientSpace, PulsarActivity pulsarActivity, @@ -56,24 +50,9 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { this.e2eMsProc = e2eMsgProc; } - public long getPrevMsgSeqId() { return prevMsgSeqId; } - public void setPrevMsgSeqId(long prevMsgSeqId) { this.prevMsgSeqId = prevMsgSeqId; } - - public long getTotalMsgLossCnt() { return totalMsgLossCnt; } - public void setTotalMsgLossCnt(long totalMsgLossCnt) { this.totalMsgLossCnt = totalMsgLossCnt; } - - public long getMaxMsgSeqToExpect() { return maxMsgSeqToExpect; } - public void setMaxMsgSeqToExpect(long maxMsgSeqToExpect) { this.maxMsgSeqToExpect = maxMsgSeqToExpect; } - @Override public PulsarOp apply(long value) { boolean seqTracking = seqTrackingFunc.apply(value); - if ( seqTracking && (maxMsgSeqToExpect != -1) ) { - if ( (value + totalMsgLossCnt) > maxMsgSeqToExpect) { - return new PulsarConumerEmptyOp(pulsarActivity); - } - } - Consumer consumer = consumerFunc.apply(value); boolean asyncApi = asyncApiFunc.apply(value); boolean useTransaction = useTransactionFunc.apply(value); @@ -94,6 +73,23 @@ public class PulsarConsumerMapper extends PulsarTransactOpMapper { clientSpace.getPulsarSchema(), clientSpace.getPulsarClientConf().getConsumerTimeoutSeconds(), value, - e2eMsProc); + e2eMsProc, + this::getReceivedMessageSequenceTracker); } + + + private ReceivedMessageSequenceTracker getReceivedMessageSequenceTracker(String topicName) { + return receivedMessageSequenceTrackersForTopicThreadLocal.get() + .computeIfAbsent(topicName, k -> createReceivedMessageSequenceTracker()); + } + + private ReceivedMessageSequenceTracker createReceivedMessageSequenceTracker() { + return new ReceivedMessageSequenceTracker(pulsarActivity.getMsgErrOutOfSeqCounter(), + pulsarActivity.getMsgErrDuplicateCounter(), + pulsarActivity.getMsgErrLossCounter()); + } + + private ThreadLocal> receivedMessageSequenceTrackersForTopicThreadLocal = + ThreadLocal.withInitial(HashMap::new); + } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java index 7b2e5057d..cf5155c51 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConsumerOp.java @@ -7,6 +7,7 @@ import io.nosqlbench.driver.pulsar.PulsarActivity; import io.nosqlbench.driver.pulsar.exception.*; import io.nosqlbench.driver.pulsar.util.AvroUtil; import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; +import java.util.function.Function; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -44,16 +45,7 @@ public class PulsarConsumerOp implements PulsarOp { // keep track of end-to-end message latency private final Histogram e2eMsgProcLatencyHistogram; - // message out-of-sequence error counter - private final Counter msgErrOutOfSeqCounter; - // message out-of-sequence error counter - private final Counter msgErrDuplicateCounter; - // message loss error counter - private final Counter msgErrLossCounter; - - // Used for message error tracking - private final boolean ignoreMsgLossCheck; - private final boolean ignoreMsgDupCheck; + private final Function receivedMessageSequenceTrackerForTopic; public PulsarConsumerOp( PulsarConsumerMapper consumerMapper, @@ -68,7 +60,8 @@ public class PulsarConsumerOp implements PulsarOp { Schema schema, int timeoutSeconds, long curCycleNum, - boolean e2eMsgProc) + boolean e2eMsgProc, + Function receivedMessageSequenceTrackerForTopic) { this.consumerMapper = consumerMapper; this.pulsarActivity = pulsarActivity; @@ -91,74 +84,16 @@ public class PulsarConsumerOp implements PulsarOp { this.transactionCommitTimer = pulsarActivity.getCommitTransactionTimer(); this.e2eMsgProcLatencyHistogram = pulsarActivity.getE2eMsgProcLatencyHistogram(); - this.msgErrOutOfSeqCounter = pulsarActivity.getMsgErrOutOfSeqCounter(); - this.msgErrLossCounter = pulsarActivity.getMsgErrLossCounter(); - this.msgErrDuplicateCounter = pulsarActivity.getMsgErrDuplicateCounter(); - - // When message deduplication configuration is not enable, ignore message - // duplication check - this.ignoreMsgDupCheck = !this.topicMsgDedup; - - // Limitations of the message sequence based check: - // - For message out of sequence and message duplicate check, it works for - // all subscription types, including "Shared" and "Key_Shared" - // - For message loss, it doesn't work for "Shared" and "Key_Shared" - // subscription types - this.ignoreMsgLossCheck = - StringUtils.equalsAnyIgnoreCase(this.subscriptionType, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Shared.label, - PulsarActivityUtil.SUBSCRIPTION_TYPE.Key_Shared.label); + this.receivedMessageSequenceTrackerForTopic = receivedMessageSequenceTrackerForTopic; } private void checkAndUpdateMessageErrorCounter(Message message) { - long maxMsgSeqToExpect = consumerMapper.getMaxMsgSeqToExpect(); - if (maxMsgSeqToExpect == -1) { - String msgSeqTgtMaxStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_TGTMAX); - if (!StringUtils.isBlank(msgSeqTgtMaxStr)) { - consumerMapper.setMaxMsgSeqToExpect(Long.valueOf(msgSeqTgtMaxStr)); - } - } - - String msgSeqIdStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_ID); + String msgSeqIdStr = message.getProperty(PulsarActivityUtil.MSG_SEQUENCE_NUMBER); if ( !StringUtils.isBlank(msgSeqIdStr) ) { - long prevMsgSeqId = consumerMapper.getPrevMsgSeqId(); - long curMsgSeqId = Long.parseLong(msgSeqIdStr); - - // Skip out-of-sequence check on the first received message - // - This is because out-of-sequence check requires at least 2 - // received messages for comparison - if ( (prevMsgSeqId != -1) && (curMsgSeqId < prevMsgSeqId) ) { - msgErrOutOfSeqCounter.inc(); - } - - // Similarly, when message duplicate check is needed, we also - // skip the first received message. - if ( !ignoreMsgDupCheck && (prevMsgSeqId != -1) && (curMsgSeqId == prevMsgSeqId) ) { - msgErrDuplicateCounter.inc(); - } - - // Note that message loss could be happened anywhere, E.g. - // - published messages: 0,1,2,3,4,5 - // - message loss scenario: - // * scenario 1: first set of messages are lost - received 2,3,4 - // * scenario 2: messages in the middle are lost - received 0,1,3,4 - // * scenario 3: last set of messages are lost - received 0,1,2 - if ( !ignoreMsgLossCheck ) { - // This check covers message loss scenarios 1 and 2 - if ( (curMsgSeqId - prevMsgSeqId) > 1 ){ - // there could be multiple published messages lost between - // 2 received messages - long msgLostCnt = (curMsgSeqId - prevMsgSeqId) - 1; - msgErrLossCounter.inc(msgLostCnt); - consumerMapper.setTotalMsgLossCnt(consumerMapper.getTotalMsgLossCnt() + msgLostCnt); - } - - // TODO: how can we detect message loss scenario 3? - } - - prevMsgSeqId = curMsgSeqId; - consumerMapper.setPrevMsgSeqId(prevMsgSeqId); + long sequenceNumber = Long.parseLong(msgSeqIdStr); + ReceivedMessageSequenceTracker receivedMessageSequenceTracker = receivedMessageSequenceTrackerForTopic.apply(message.getTopicName()); + receivedMessageSequenceTracker.sequenceNumberReceived(sequenceNumber); } } @@ -323,4 +258,5 @@ public class PulsarConsumerOp implements PulsarOp { } } } + } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java deleted file mode 100644 index 255a81351..000000000 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarConumerEmptyOp.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.nosqlbench.driver.pulsar.ops; - -import com.codahale.metrics.Counter; -import io.nosqlbench.driver.pulsar.PulsarActivity; - -public class PulsarConumerEmptyOp implements PulsarOp { - - private final PulsarActivity pulsarActivity; - - // message loss error counter - private final Counter msgErrLossCounter; - - public PulsarConumerEmptyOp(PulsarActivity pulsarActivity) { - this.pulsarActivity = pulsarActivity; - this.msgErrLossCounter = pulsarActivity.getMsgErrDuplicateCounter(); - } - - @Override - public void run(Runnable timeTracker) { - } -} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java deleted file mode 100644 index f94af3982..000000000 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerEmptyOp.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.nosqlbench.driver.pulsar.ops; - -import io.nosqlbench.driver.pulsar.PulsarActivity; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class PulsarProducerEmptyOp implements PulsarOp { - - private final static Logger logger = LogManager.getLogger(PulsarProducerEmptyOp.class); - - private final PulsarActivity pulsarActivity; - - public PulsarProducerEmptyOp(PulsarActivity pulsarActivity) { - this.pulsarActivity = pulsarActivity; - } - - @Override - public void run(Runnable timeTracker) { - } -} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java index 594f40406..9c6459663 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarProducerMapper.java @@ -4,18 +4,17 @@ import io.nosqlbench.driver.pulsar.PulsarActivity; import io.nosqlbench.driver.pulsar.PulsarSpace; import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; import io.nosqlbench.engine.api.templating.CommandTemplate; -import org.apache.commons.lang3.RandomUtils; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.LongFunction; +import java.util.function.Supplier; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.transaction.Transaction; -import java.util.HashMap; -import java.util.Map; -import java.util.function.LongFunction; -import java.util.function.Supplier; - /** * This maps a set of specifier functions to a pulsar operation. The pulsar operation contains * enough state to define a pulsar operation such that it can be executed, measured, and possibly @@ -31,13 +30,11 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { private final static Logger logger = LogManager.getLogger(PulsarProducerMapper.class); private final LongFunction> producerFunc; - private final LongFunction seqErrSimuTypeFunc; + private final Set seqErrSimuTypes; private final LongFunction keyFunc; private final LongFunction propFunc; private final LongFunction payloadFunc; - private final long totalCycleCount; - public PulsarProducerMapper(CommandTemplate cmdTpl, PulsarSpace clientSpace, PulsarActivity pulsarActivity, @@ -46,48 +43,27 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { LongFunction seqTrackingFunc, LongFunction> transactionSupplierFunc, LongFunction> producerFunc, - LongFunction seqErrSimuTypeFunc, + Set seqErrSimuTypes, LongFunction keyFunc, LongFunction propFunc, LongFunction payloadFunc) { super(cmdTpl, clientSpace, pulsarActivity, asyncApiFunc, useTransactionFunc, seqTrackingFunc, transactionSupplierFunc); this.producerFunc = producerFunc; - this.seqErrSimuTypeFunc = seqErrSimuTypeFunc; + this.seqErrSimuTypes = seqErrSimuTypes; this.keyFunc = keyFunc; this.propFunc = propFunc; this.payloadFunc = payloadFunc; - - this.totalCycleCount = pulsarActivity.getActivityDef().getCycleCount(); } @Override public PulsarOp apply(long value) { boolean asyncApi = asyncApiFunc.apply(value); boolean useTransaction = useTransactionFunc.apply(value); - boolean seqTracking = seqTrackingFunc.apply(value); Supplier transactionSupplier = transactionSupplierFunc.apply(value); Producer producer = producerFunc.apply(value); - boolean lastMsg = (value == (totalCycleCount-1)); - - // Simulate error 10% of the time, but always ignore - // the last message - float rndVal = RandomUtils.nextFloat(0, 1.0f); - boolean simulationError = (!lastMsg) && ((rndVal >= 0) && (rndVal < 0.2f)); - - String seqErrSimuTypesStr = seqErrSimuTypeFunc.apply(value); - boolean simulateMsgOutofOrder = simulationError && - !StringUtils.isBlank(seqErrSimuTypesStr) && - StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.OutOfOrder.label); - boolean simulateMsgLoss = simulationError && - !StringUtils.isBlank(seqErrSimuTypesStr) && - StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgLoss.label); - boolean simulateMsgDup = simulationError && - !StringUtils.isBlank(seqErrSimuTypesStr) && - StringUtils.containsIgnoreCase(seqErrSimuTypesStr, PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgDup.label); - String msgKey = keyFunc.apply(value); String msgPayload = payloadFunc.apply(value); @@ -107,47 +83,31 @@ public class PulsarProducerMapper extends PulsarTransactOpMapper { } } - // Error simulation sequence: - // - message loss > message out of order > message duplication - if (!simulateMsgLoss) { - // Set message sequence tracking property - if (seqTracking) { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_TGTMAX, - String.valueOf(pulsarActivity.getActivityDef().getCycleCount()-1)); - - // normal case - if (!simulateMsgOutofOrder && !simulateMsgDup) { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value)); - } - else { - // simulate message out of order - if (simulateMsgOutofOrder) { - int rndmOffset = 2; - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, - String.valueOf((value > rndmOffset) ? (value - rndmOffset) : value)); - } - // simulate message duplication - else if (simulateMsgDup) { - msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_ID, String.valueOf(value - 1)); - } - } - } - - return new PulsarProducerOp( - pulsarActivity, - asyncApi, - useTransaction, - transactionSupplier, - producer, - clientSpace.getPulsarSchema(), - msgKey, - msgProperties, - msgPayload); - } - else { - // Simulate message loss, but don't simulate the scenario where - // only the last set of message are lost - return new PulsarProducerEmptyOp(pulsarActivity); + boolean sequenceTrackingEnabled = seqTrackingFunc.apply(value); + if (sequenceTrackingEnabled) { + long nextSequenceNumber = getMessageSequenceNumberSendingHandler(producer.getTopic()) + .getNextSequenceNumber(seqErrSimuTypes); + msgProperties.put(PulsarActivityUtil.MSG_SEQUENCE_NUMBER, String.valueOf(nextSequenceNumber)); } + + return new PulsarProducerOp( + pulsarActivity, + asyncApi, + useTransaction, + transactionSupplier, + producer, + clientSpace.getPulsarSchema(), + msgKey, + msgProperties, + msgPayload); } + + private MessageSequenceNumberSendingHandler getMessageSequenceNumberSendingHandler(String topicName) { + return MessageSequenceNumberSendingHandlersThreadLocal.get() + .computeIfAbsent(topicName, k -> new MessageSequenceNumberSendingHandler()); + } + + private ThreadLocal> MessageSequenceNumberSendingHandlersThreadLocal = + ThreadLocal.withInitial(HashMap::new); + } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 892d35f50..ecb14d8cf 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -7,6 +7,8 @@ import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.templating.CommandTemplate; +import java.util.*; +import java.util.stream.Collectors; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -16,9 +18,6 @@ import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Reader; import org.apache.pulsar.client.api.transaction.Transaction; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; import java.util.function.LongFunction; import java.util.function.Supplier; @@ -352,10 +351,10 @@ public class ReadyPulsarOp implements OpDispenser { // check if we're going to simulate producer message out-of-sequence error // - message ordering // - message loss - LongFunction seqErrSimuTypeFunc = (l) -> null; + Set seqErrSimuTypes = Collections.emptySet(); if (cmdTpl.containsKey("seqerr_simu")) { if (cmdTpl.isStatic("seqerr_simu")) { - seqErrSimuTypeFunc = (l) -> cmdTpl.getStatic("seqerr_simu"); + seqErrSimuTypes = parseSimulatedErrorTypes(cmdTpl.getStatic("seqerr_simu")); } else { throw new PulsarDriverParamException("[resolveMsgSend()] \"seqerr_simu\" parameter cannot be dynamic!"); } @@ -403,12 +402,23 @@ public class ReadyPulsarOp implements OpDispenser { seqTrackingFunc, transactionSupplierFunc, producerFunc, - seqErrSimuTypeFunc, + seqErrSimuTypes, keyFunc, propFunc, valueFunc); } + private Set parseSimulatedErrorTypes(String sequenceErrorSimulatedTypeString) { + if (StringUtils.isBlank(sequenceErrorSimulatedTypeString)) { + return Collections.emptySet(); + } + return Arrays.stream(StringUtils.split(sequenceErrorSimulatedTypeString, ',')) + .map(PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE::parseSimuType) + .filter(Optional::isPresent) + .map(Optional::get) + .collect(Collectors.toSet()); + } + private LongFunction resolveMsgConsume( PulsarSpace clientSpace, LongFunction topic_uri_func, diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java new file mode 100644 index 000000000..48e0c0d5e --- /dev/null +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java @@ -0,0 +1,113 @@ +package io.nosqlbench.driver.pulsar.ops; + +import com.codahale.metrics.Counter; +import java.util.Iterator; +import java.util.SortedSet; +import java.util.TreeSet; + +/** + * Detects message loss, message duplication and out-of-order message delivery + * based on a monotonic sequence number that each received message contains. + * + * Out-of-order messages are detected with a maximum look behind of 20 sequence number entries. + * This is currently defined as a constant, {@link ReceivedMessageSequenceTracker#MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS}. + */ +class ReceivedMessageSequenceTracker implements AutoCloseable{ + public static final int MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS = 20; + // message out-of-sequence error counter + private final Counter msgErrOutOfSeqCounter; + // message out-of-sequence error counter + private final Counter msgErrDuplicateCounter; + // message loss error counter + private final Counter msgErrLossCounter; + long expectedNumber = -1; + + SortedSet pendingOutOfSeqNumbers = new TreeSet<>(); + + + ReceivedMessageSequenceTracker(Counter msgErrOutOfSeqCounter, Counter msgErrDuplicateCounter, Counter msgErrLossCounter) { + this.msgErrOutOfSeqCounter = msgErrOutOfSeqCounter; + this.msgErrDuplicateCounter = msgErrDuplicateCounter; + this.msgErrLossCounter = msgErrLossCounter; + } + + /** + * Notifies the tracker about a received sequence number + * + * @param sequenceNumber the sequence number of the received message + */ + public void sequenceNumberReceived(long sequenceNumber) { + if (expectedNumber == -1) { + expectedNumber = sequenceNumber + 1; + return; + } + + if (sequenceNumber < expectedNumber) { + msgErrDuplicateCounter.inc(); + return; + } + + boolean messagesSkipped = false; + if (sequenceNumber > expectedNumber) { + if (pendingOutOfSeqNumbers.size() == MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { + messagesSkipped = processEarliestPendingOutOfSequenceNumber(); + } + pendingOutOfSeqNumbers.add(sequenceNumber); + } else { + // sequenceNumber == expectedNumber + expectedNumber++; + } + processPendingOutOfSequenceNumbers(messagesSkipped); + cleanUpTooFarBehindOutOfSequenceNumbers(); + } + + private boolean processEarliestPendingOutOfSequenceNumber() { + // remove the earliest pending out of sequence number + Long earliestOutOfSeqNumber = pendingOutOfSeqNumbers.first(); + pendingOutOfSeqNumbers.remove(earliestOutOfSeqNumber); + if (earliestOutOfSeqNumber > expectedNumber) { + // skip the expected number ahead to the number after the earliest sequence number + // increment the counter with the amount of sequence numbers that got skipped + msgErrLossCounter.inc(earliestOutOfSeqNumber - expectedNumber); + expectedNumber = earliestOutOfSeqNumber + 1; + return true; + } else { + msgErrLossCounter.inc(); + } + return false; + } + + private void processPendingOutOfSequenceNumbers(boolean messagesSkipped) { + // check if there are previously received out-of-order sequence number that have been received + while (pendingOutOfSeqNumbers.remove(expectedNumber)) { + expectedNumber++; + if (!messagesSkipped) { + msgErrOutOfSeqCounter.inc(); + } + } + } + + private void cleanUpTooFarBehindOutOfSequenceNumbers() { + // remove sequence numbers that are too far behind + for (Iterator iterator = pendingOutOfSeqNumbers.iterator(); iterator.hasNext(); ) { + Long number = iterator.next(); + if (number < expectedNumber - MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { + msgErrLossCounter.inc(); + iterator.remove(); + } else { + break; + } + } + } + + /** + * Handles the possible pending out of sequence numbers. Mainly needed in unit tests to assert the + * counter values. + */ + @Override + public void close() { + while (!pendingOutOfSeqNumbers.isEmpty()) { + processPendingOutOfSequenceNumbers(processEarliestPendingOutOfSequenceNumber()); + } + } +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java index 56b0e5f64..d47a856f6 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/util/PulsarActivityUtil.java @@ -1,6 +1,7 @@ package io.nosqlbench.driver.pulsar.util; import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.*; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +13,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Base64; -import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -48,8 +46,7 @@ public class PulsarActivityUtil { return Arrays.stream(OP_TYPES.values()).anyMatch(t -> t.label.equals(type)); } - public static final String MSG_SEQUENCE_ID = "sequence_id"; - public static final String MSG_SEQUENCE_TGTMAX = "sequence_tgtmax"; + public static final String MSG_SEQUENCE_NUMBER = "sequence_number"; /////// // Valid document level parameters for Pulsar NB yaml file @@ -314,6 +311,23 @@ public class PulsarActivityUtil { SEQ_ERROR_SIMU_TYPE(String label) { this.label = label; } + + private static final Map MAPPING = new HashMap<>(); + + static { + for (SEQ_ERROR_SIMU_TYPE simuType : values()) { + MAPPING.put(simuType.label, simuType); + MAPPING.put(simuType.label.toLowerCase(), simuType); + MAPPING.put(simuType.label.toUpperCase(), simuType); + MAPPING.put(simuType.name(), simuType); + MAPPING.put(simuType.name().toLowerCase(), simuType); + MAPPING.put(simuType.name().toUpperCase(), simuType); + } + } + + public static Optional parseSimuType(String simuTypeString) { + return Optional.ofNullable(MAPPING.get(simuTypeString.trim())); + } } public static boolean isValidSeqErrSimuType(String item) { return Arrays.stream(SEQ_ERROR_SIMU_TYPE.values()).anyMatch(t -> t.label.equals(item)); diff --git a/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandlerTest.java b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandlerTest.java new file mode 100644 index 000000000..ded7971d8 --- /dev/null +++ b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/MessageSequenceNumberSendingHandlerTest.java @@ -0,0 +1,74 @@ +package io.nosqlbench.driver.pulsar.ops; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import org.junit.jupiter.api.Test; + +class MessageSequenceNumberSendingHandlerTest { + MessageSequenceNumberSendingHandler sequenceNumberSendingHandler = new MessageSequenceNumberSendingHandler(); + + @Test + void shouldAddMonotonicSequence() { + for (long l = 1; l <= 100; l++) { + assertEquals(l, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + } + } + + @Test + void shouldInjectMessageLoss() { + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(3L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.singleton(PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgLoss), 100)); + } + + @Test + void shouldInjectMessageDuplication() { + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.singleton(PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.MsgDup), 100)); + } + + @Test + void shouldInjectMessageOutOfOrder() { + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(4L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.singleton(PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.OutOfOrder), 100)); + assertEquals(2L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(3L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(5L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(6, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + } + + @Test + void shouldInjectOneOfTheSimulatedErrorsRandomly() { + Set allErrorTypes = new HashSet<>(Arrays.asList(PulsarActivityUtil.SEQ_ERROR_SIMU_TYPE.values())); + + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + long previousSequenceNumber = 1L; + int outOfSequenceInjectionCounter = 0; + int messageDupCounter = 0; + int messageLossCounter = 0; + int successCounter = 0; + for (int i = 0; i < 1000; i++) { + long nextSequenceNumber = sequenceNumberSendingHandler.getNextSequenceNumber(allErrorTypes); + if (nextSequenceNumber >= previousSequenceNumber + 3) { + outOfSequenceInjectionCounter++; + } else if (nextSequenceNumber <= previousSequenceNumber) { + messageDupCounter++; + } else if (nextSequenceNumber >= previousSequenceNumber + 2) { + messageLossCounter++; + } else if (nextSequenceNumber == previousSequenceNumber + 1) { + successCounter++; + } + previousSequenceNumber = nextSequenceNumber; + } + assertTrue(outOfSequenceInjectionCounter > 0); + assertTrue(messageDupCounter > 0); + assertTrue(messageLossCounter > 0); + assertEquals(1000, outOfSequenceInjectionCounter + messageDupCounter + messageLossCounter + successCounter); + } + +} diff --git a/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java new file mode 100644 index 000000000..f79c29ebd --- /dev/null +++ b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java @@ -0,0 +1,152 @@ +package io.nosqlbench.driver.pulsar.ops; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.codahale.metrics.Counter; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class ReceivedMessageSequenceTrackerTest { + Counter msgErrOutOfSeqCounter = new Counter(); + Counter msgErrDuplicateCounter = new Counter(); + Counter msgErrLossCounter = new Counter(); + ReceivedMessageSequenceTracker messageSequenceTracker = new ReceivedMessageSequenceTracker(msgErrOutOfSeqCounter, msgErrDuplicateCounter, msgErrLossCounter); + + @Test + void shouldCountersBeZeroWhenSequenceDoesntContainGaps() { + // when + for (long l = 0; l < 100L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.close(); + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @ParameterizedTest + @ValueSource(longs = {10L, 11L, 19L, 20L, 21L, 100L}) + void shouldDetectMsgLossWhenEverySecondMessageIsLost(long totalMessages) { + doShouldDetectMsgLoss(totalMessages, 2); + } + + @ParameterizedTest + @ValueSource(longs = {10L, 11L, 19L, 20L, 21L, 100L}) + void shouldDetectMsgLossWhenEveryThirdMessageIsLost(long totalMessages) { + doShouldDetectMsgLoss(totalMessages, 3); + } + + @ParameterizedTest + @ValueSource(longs = {20L, 21L, 40L, 41L, 42L, 43L, 100L}) + void shouldDetectMsgLossWhenEvery21stMessageIsLost(long totalMessages) { + doShouldDetectMsgLoss(totalMessages, 21); + } + + private void doShouldDetectMsgLoss(long totalMessages, int looseEveryNthMessage) { + int messagesLost = 0; + // when + boolean lastMessageWasLost = false; + for (long l = 0; l < totalMessages; l++) { + if (l % looseEveryNthMessage == 1) { + messagesLost++; + lastMessageWasLost = true; + continue; + } else { + lastMessageWasLost = false; + } + messageSequenceTracker.sequenceNumberReceived(l); + } + if (lastMessageWasLost) { + messageSequenceTracker.sequenceNumberReceived(totalMessages); + } + messageSequenceTracker.close(); + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(messagesLost, msgErrLossCounter.getCount()); + } + + @ParameterizedTest + @ValueSource(longs = {10L, 11L, 19L, 20L, 21L, 100L}) + void shouldDetectMsgDuplication(long totalMessages) { + int messagesDuplicated = 0; + // when + for (long l = 0; l < totalMessages; l++) { + if (l % 2 == 1) { + messagesDuplicated++; + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.sequenceNumberReceived(l); + } + if (totalMessages % 2 == 0) { + messageSequenceTracker.sequenceNumberReceived(totalMessages); + } + if (totalMessages < 2 * ReceivedMessageSequenceTracker.MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { + messageSequenceTracker.close(); + } + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(messagesDuplicated, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectSingleMessageOutOfSequence() { + // when + for (long l = 0; l < 10L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.sequenceNumberReceived(10L); + messageSequenceTracker.sequenceNumberReceived(12L); + messageSequenceTracker.sequenceNumberReceived(11L); + for (long l = 13L; l < 100L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + + // then + assertEquals(1, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectMultipleMessagesOutOfSequence() { + // when + for (long l = 0; l < 10L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.sequenceNumberReceived(10L); + messageSequenceTracker.sequenceNumberReceived(14L); + messageSequenceTracker.sequenceNumberReceived(13L); + messageSequenceTracker.sequenceNumberReceived(11L); + messageSequenceTracker.sequenceNumberReceived(12L); + for (long l = 15L; l < 100L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + + // then + assertEquals(2, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectIndividualMessageLoss() { + // when + for (long l = 0; l < 100L; l++) { + if (l != 11L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(1, msgErrLossCounter.getCount()); + } + +} From 38307eee83b7d23b4ced0fdeea83b02f2e9656eb Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 Oct 2021 14:55:08 -0500 Subject: [PATCH 40/53] release: pulsar driver updates --- RELEASENOTES.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5afe6b392..948a8e1d2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,6 +1,4 @@ -- feb0fda1 (HEAD -> main) fix broken test -- 49207a44 (origin/main) fix release for s3 and pulsar testing features -- e53af8bf improve NBEnvironment and S3 interaction -- cb477996 merge fixups -- e77bfea0 Merge pull request #367 from yabinmeng/main -- 6569fa52 reformat all pom.xml files +- bdb577f2 (HEAD -> main, origin/main) Merge pull request #368 from lhotari/lh-threadlocal-sequence-tracking +- b82b4b1a Merge pull request #369 from lhotari/lh-rate-limit-per-thread +- 7a6ec965 Pulsar: Use thread local and topic based sequence tracking +- e6608234 Make ratelimiter instance thread specific for PulsarActivity From d110c4bf7fb962a853dc20acf5df78f74a7a1339 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Tue, 19 Oct 2021 20:08:56 +0000 Subject: [PATCH 41/53] [maven-release-plugin] prepare release nosqlbench-4.15.61 --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 37e657ed3..c7a305617 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.61-SNAPSHOT + 4.15.61 @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 92d80e123..9f67fd62c 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.61-SNAPSHOT + 4.15.61 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index a59137216..f48dd5c86 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index e2295b68f..9b4aa615e 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 0c2025955..9119601e9 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 6e330aa92..167e80e59 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 47924db7d..9b6ede7ed 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 182918fb9..64438e485 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 5578b7408..c049860b9 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 536b64472..d5986123e 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-stdout - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 4b342d2ff..e1aa97b64 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 73167c0b7..e94e40218 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-stdout - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index dcfe85a03..04c079dea 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 7cea1c4a2..0cbdebbde 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-stdout - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 396e41822..882d6e46f 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 625012baa..0680b8c22 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-stdout - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 7794f0ae4..3d20def12 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index ee0686fe7..426af3230 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-userlibs - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 948adfa22..edb024dcc 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench nb-annotations - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-userlibs - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index bb92da832..b4dde1481 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench engine-docker - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 57d34885f..bf208fc1d 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 2475bbf9e..66aa37f3d 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench drivers-api - 4.15.61-SNAPSHOT + 4.15.61 @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.61-SNAPSHOT + 4.15.61 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index b587dfef5..09fd16d8f 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 20ae75154..fa6a081a8 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index ed0c35036..7ec930f0e 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 75231bdee..43695fa96 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 932b73827..e730fac3b 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.61 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 10ac049e6..b8279c077 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 1e0a6d401..bcc1c0958 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/nb/pom.xml b/nb/pom.xml index 8b0b737f3..dc011df94 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench engine-cli - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench engine-docs - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench engine-core - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench engine-extensions - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-web - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-kafka - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-stdout - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-diag - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-tcp - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-http - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-jmx - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-dsegraph-shaded - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-cql-shaded - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-cqld3-shaded - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-cqlverify - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-mongodb - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-pulsar - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-cockroachdb - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench driver-jms - 4.15.61-SNAPSHOT + 4.15.61 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/pom.xml b/pom.xml index c7cf0cfd3..0032d1502 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.61 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index a2de085e9..1404bd24c 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 nb-api io.nosqlbench virtdata-lang - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 91bf005b3..6b53e861e 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 04648cedf..2f5889228 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 539cbd468..484463adb 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-lib-basics - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d7f69278b..fe3b35d05 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-lib-basics - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 939db2537..644481aac 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 003c2850d..9971b9319 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.61-SNAPSHOT + 4.15.61 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 6f23ad9dd..72ebc1aab 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-lib-realer - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-api - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench virtdata-lib-random - 4.15.61-SNAPSHOT + 4.15.61 io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 virtdata-lib-basics io.nosqlbench - 4.15.61-SNAPSHOT + 4.15.61 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.61-SNAPSHOT + 4.15.61 From 53199e72bb2b1c2e7196eccbf6994ad1c5f84f78 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Tue, 19 Oct 2021 20:08:58 +0000 Subject: [PATCH 42/53] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index c7a305617..eef3006c3 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.61 + 4.15.62-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 9f67fd62c..6dae3590a 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.61 + 4.15.62-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index f48dd5c86..9965b98a6 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 9b4aa615e..8828b7eff 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 9119601e9..5545b9b3e 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 167e80e59..dcf07e008 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 9b6ede7ed..a0813790e 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 64438e485..c923d8d8f 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index c049860b9..0e0e8bed1 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index d5986123e..ff06e0b56 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-stdout - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index e1aa97b64..b85e37c9e 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index e94e40218..e02305bce 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-stdout - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 04c079dea..a9f13c6c1 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 0cbdebbde..a374aaa02 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-stdout - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 882d6e46f..db8a59a95 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 0680b8c22..5f15b6fed 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-stdout - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 3d20def12..34fe8a31c 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index 426af3230..a46af5cf1 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index edb024dcc..e888688d8 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench nb-annotations - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index b4dde1481..cc96c7b28 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench engine-docker - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index bf208fc1d..fdc38e98f 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 66aa37f3d..28b4184c0 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench drivers-api - 4.15.61 + 4.15.62-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.61 + 4.15.62-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 09fd16d8f..e93f3a461 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index fa6a081a8..4a17a8475 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 7ec930f0e..dd2232823 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 43695fa96..62d1bfeca 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index e730fac3b..ca3f4590e 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.61 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index b8279c077..6fcc44099 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index bcc1c0958..1c708e32e 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index dc011df94..d4a91596c 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench engine-cli - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench engine-docs - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench engine-core - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench engine-extensions - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-web - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-kafka - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-stdout - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-diag - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-tcp - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-http - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-jmx - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench driver-jms - 4.15.61 + 4.15.62-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0032d1502..94983c3d3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.61 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 1404bd24c..27269d76f 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 6b53e861e..95618b521 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 2f5889228..340566b85 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 484463adb..a4d948df6 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index fe3b35d05..bd5c6d246 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 644481aac..2d8197af3 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 9971b9319..5f42122f2 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.61 + 4.15.62-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 72ebc1aab..a6a41a2f4 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-api - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.61 + 4.15.62-SNAPSHOT io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.61 + 4.15.62-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.61 + 4.15.62-SNAPSHOT From 9ea609142b44538f2e8e007d6ccb5de0a6aa6c48 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 Oct 2021 15:02:58 -0500 Subject: [PATCH 43/53] nosqlbench-370 Specifying full path to the yaml workload crashes --- .../api/scenarios/NBCLIScenarioParser.java | 10 +++++---- .../engine/cli/NBCLIScenarioParserTest.java | 21 ++++++++++++++++--- .../nosqlbench/nb/api/content/NBIOTest.java | 20 ++++++++++++++++++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java index 9e13b7524..7856b10af 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java @@ -145,10 +145,12 @@ public class NBCLIScenarioParser { undefKeys.forEach(buildingCmd::remove); if (!buildingCmd.containsKey("workload")) { - String relativeWorkloadPathFromRoot = yamlWithNamedScenarios.asPath().toString(); - relativeWorkloadPathFromRoot = relativeWorkloadPathFromRoot.startsWith("/") ? - relativeWorkloadPathFromRoot.substring(1) : relativeWorkloadPathFromRoot; - buildingCmd.put("workload", "workload=" + relativeWorkloadPathFromRoot); +// The logic to remove the leading slash was likely used to fix a nuisance bug before, +// although it is clearly not correct as-is. Leaving temporarily for context. +// String relativeWorkloadPathFromRoot = yamlWithNamedScenarios.asPath().toString(); +// relativeWorkloadPathFromRoot = relativeWorkloadPathFromRoot.startsWith("/") ? +// relativeWorkloadPathFromRoot.substring(1) : relativeWorkloadPathFromRoot; + buildingCmd.put("workload", "workload=" + workloadName); } if (!buildingCmd.containsKey("alias")) { diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java index 7248da566..ce2f773cb 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java @@ -4,6 +4,7 @@ import io.nosqlbench.engine.api.scenarios.NBCLIScenarioParser; import io.nosqlbench.nb.api.errors.BasicError; import org.junit.jupiter.api.Test; +import java.nio.file.Path; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -76,7 +77,7 @@ public class NBCLIScenarioParserTest { assertThat(cmds.size()).isEqualTo(1); assertThat(cmds.get(0).getArg("driver")).isEqualTo("stdout"); assertThat(cmds.get(0).getArg("cycles")).isEqualTo("10"); - assertThat(cmds.get(0).getArg("workload")).isEqualTo("target/test-classes/activities/scenario-test.yaml"); + assertThat(cmds.get(0).getArg("workload")).isEqualTo("scenario-test"); } @Test @@ -87,7 +88,7 @@ public class NBCLIScenarioParserTest { assertThat(cmds.get(0).getArg("driver")).isEqualTo("stdout"); assertThat(cmds.get(0).getArg("cycles")).isEqualTo("20"); assertThat(cmds.get(0).getArg("cycles-test")).isEqualTo("20"); - assertThat(cmds.get(0).getArg("workload")).isEqualTo("target/test-classes/activities/scenario-test.yaml"); + assertThat(cmds.get(0).getArg("workload")).isEqualTo("scenario-test"); } @Test @@ -100,9 +101,23 @@ public class NBCLIScenarioParserTest { List cmds1 = opts1.getCommands(); assertThat(cmds1.size()).isEqualTo(1); assertThat(cmds1.get(0).getArg("cycles-test")).isNull(); - } + @Test + public void testThatFullyQualifiedScenarioFilesAreSupported() { + Path cwd = Path.of(".").toAbsolutePath(); + System.out.println("cwd: '" + cwd + "'"); + + Path rel = Path.of("src/test/resources/activities/scenario-test.yaml"); + + assertThat(rel).exists(); + Path absolute = rel.toAbsolutePath(); + assertThat(absolute).exists(); + + NBCLIOptions opts = new NBCLIOptions(new String[]{ absolute.toString(), "schema-only", "cycles-test=20"}); + List cmds = opts.getCommands(); + assertThat(cmds.size()).isGreaterThan(0); + } @Test public void testSanitizer() { diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java index 6193e192d..d415d3fa3 100644 --- a/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java +++ b/nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java @@ -2,6 +2,10 @@ package io.nosqlbench.nb.api.content; import org.junit.jupiter.api.Test; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.LinkedHashSet; @@ -257,4 +261,20 @@ public class NBIOTest { } + @Test + public void matchFullyQualifiedPathCorrectly() { + Path tmpdir = Paths.get("/tmp"); + if (!Files.isDirectory(tmpdir)) return; + try { + File tempFile = File.createTempFile(tmpdir.toString(), "testfile.csv"); + tempFile.deleteOnExit(); + String fullpath = tempFile.getAbsolutePath(); + Files.write(Path.of(fullpath), "COL1,COL2\n\"val1\",\"val2\"\n".getBytes(StandardCharsets.UTF_8)); + List> results = NBIO.all().name(fullpath).list(); + assertThat(results.size()).isEqualTo(1); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } From 571156de3e008ae18d4abbc91fa25a4a4cdd8be6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 Oct 2021 15:06:39 -0500 Subject: [PATCH 44/53] bugfix release: nosqlbench-370 --- RELEASENOTES.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 948a8e1d2..67d747ee8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,4 +1,2 @@ -- bdb577f2 (HEAD -> main, origin/main) Merge pull request #368 from lhotari/lh-threadlocal-sequence-tracking -- b82b4b1a Merge pull request #369 from lhotari/lh-rate-limit-per-thread -- 7a6ec965 Pulsar: Use thread local and topic based sequence tracking -- e6608234 Make ratelimiter instance thread specific for PulsarActivity +- 8c8801b0 (HEAD -> main, origin/main) Merge pull request #371 from nosqlbench/nosqlbench-370 +- 9ea60914 (origin/nosqlbench-370, nosqlbench-370) nosqlbench-370 Specifying full path to the yaml workload crashes From dae9cc78f2f2f7a6e8af49b0b8b6ecbf05724d4c Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 20 Oct 2021 20:19:50 +0000 Subject: [PATCH 45/53] [maven-release-plugin] prepare release nosqlbench-4.15.62 --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index eef3006c3..81d790291 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.62-SNAPSHOT + 4.15.62 @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 6dae3590a..472a9d745 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.62-SNAPSHOT + 4.15.62 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 9965b98a6..0757d7d54 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 8828b7eff..71a3ab614 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 5545b9b3e..29e44de03 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index dcf07e008..b1f6b1037 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index a0813790e..ba085c4a8 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index c923d8d8f..0ba1a0854 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 0e0e8bed1..30d402baa 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index ff06e0b56..c7d4b7921 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-stdout - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index b85e37c9e..122e9f96f 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index e02305bce..af98f90d7 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-stdout - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index a9f13c6c1..f483f4cf9 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index a374aaa02..9c0cb189d 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-stdout - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index db8a59a95..ca0d04535 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 5f15b6fed..165ef7a5d 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-stdout - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 34fe8a31c..4201818f9 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index a46af5cf1..80d211dad 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-userlibs - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index e888688d8..5359818dd 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench nb-annotations - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-userlibs - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index cc96c7b28..1f5ebaf17 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench engine-docker - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index fdc38e98f..eaa292069 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 28b4184c0..b21d63827 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench drivers-api - 4.15.62-SNAPSHOT + 4.15.62 @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.62-SNAPSHOT + 4.15.62 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e93f3a461..38f0631ba 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 4a17a8475..ea6de6f70 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index dd2232823..33acfc4d1 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 62d1bfeca..cddf23c7b 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index ca3f4590e..c6124f320 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.62 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 6fcc44099..58ed9237b 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 1c708e32e..95d75b849 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/nb/pom.xml b/nb/pom.xml index d4a91596c..878b3852b 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench engine-cli - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench engine-docs - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench engine-core - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench engine-extensions - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-web - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-kafka - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-stdout - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-diag - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-tcp - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-http - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-jmx - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-dsegraph-shaded - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-cql-shaded - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-cqld3-shaded - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-cqlverify - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-mongodb - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-pulsar - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-cockroachdb - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench driver-jms - 4.15.62-SNAPSHOT + 4.15.62 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/pom.xml b/pom.xml index 94983c3d3..18b115853 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.62 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 27269d76f..ab3c3996d 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 nb-api io.nosqlbench virtdata-lang - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 95618b521..cb5938848 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 340566b85..15e6bf286 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index a4d948df6..dcb49e5db 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-lib-basics - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index bd5c6d246..a6d6c6dfb 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-lib-basics - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 2d8197af3..518d65d06 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 5f42122f2..48a6a0403 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.62-SNAPSHOT + 4.15.62 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index a6a41a2f4..8bae7bb12 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-lib-realer - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-api - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench virtdata-lib-random - 4.15.62-SNAPSHOT + 4.15.62 io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 virtdata-lib-basics io.nosqlbench - 4.15.62-SNAPSHOT + 4.15.62 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.62-SNAPSHOT + 4.15.62 From 956c3b698ec63f8a3ed6c1ac8fd7a9f17c085b53 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 20 Oct 2021 20:19:52 +0000 Subject: [PATCH 46/53] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 81d790291..64489ed12 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.62 + 4.15.63-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 472a9d745..40ef10658 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.62 + 4.15.63-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 0757d7d54..995a6cd27 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 71a3ab614..2eeb78020 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 29e44de03..b56777763 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index b1f6b1037..8b8a5813d 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index ba085c4a8..ad97dca33 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 0ba1a0854..8b4c6d53f 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 30d402baa..728ecc2ed 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index c7d4b7921..d523df163 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-stdout - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 122e9f96f..10ee749ad 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index af98f90d7..e90d04239 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-stdout - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index f483f4cf9..e5a2dd84c 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 9c0cb189d..9e74881cf 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-stdout - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index ca0d04535..78e785a7c 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 165ef7a5d..8b2122cae 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-stdout - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 4201818f9..7bb793d4c 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index 80d211dad..49bb940e5 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 5359818dd..f6379e449 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench nb-annotations - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 1f5ebaf17..280accb88 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench engine-docker - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index eaa292069..12cdb6e8f 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index b21d63827..c3ec183d3 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench drivers-api - 4.15.62 + 4.15.63-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.62 + 4.15.63-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 38f0631ba..0169aafbd 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index ea6de6f70..2b7ea650f 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 33acfc4d1..a7c3fce8a 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index cddf23c7b..b25c7c377 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index c6124f320..842423007 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.62 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 58ed9237b..a38b77a7e 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 95d75b849..7c703747b 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 878b3852b..4b18d890f 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench engine-cli - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench engine-docs - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench engine-core - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench engine-extensions - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-web - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-kafka - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-stdout - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-diag - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-tcp - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-http - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-jmx - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench driver-jms - 4.15.62 + 4.15.63-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/pom.xml b/pom.xml index 18b115853..afae2b444 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.62 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index ab3c3996d..5f0784903 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index cb5938848..af8b85408 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 15e6bf286..37203de2c 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index dcb49e5db..df7dd06f3 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index a6d6c6dfb..d742d62e3 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 518d65d06..79bd6865b 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 48a6a0403..db9b320ad 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.62 + 4.15.63-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 8bae7bb12..532b99885 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-api - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.62 + 4.15.63-SNAPSHOT io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.62 + 4.15.63-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.62 + 4.15.63-SNAPSHOT From 6b50060a9aca9387b1c241cbc8aac5a05c3a39ac Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 21 Oct 2021 00:35:11 +0300 Subject: [PATCH 47/53] Detect duplicates after a gap - rename earliest -> lowest to clarify the real intention - polish code - add unit test - increase duplicate counter if pending messages already contains the sequence number --- .../ops/ReceivedMessageSequenceTracker.java | 31 ++++++++------- .../ReceivedMessageSequenceTrackerTest.java | 39 +++++++++++++++++++ 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java index 48e0c0d5e..cd33e12de 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java @@ -16,13 +16,12 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ public static final int MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS = 20; // message out-of-sequence error counter private final Counter msgErrOutOfSeqCounter; - // message out-of-sequence error counter + // duplicate message error counter private final Counter msgErrDuplicateCounter; // message loss error counter private final Counter msgErrLossCounter; - long expectedNumber = -1; - - SortedSet pendingOutOfSeqNumbers = new TreeSet<>(); + private final SortedSet pendingOutOfSeqNumbers = new TreeSet<>(); + private long expectedNumber = -1; ReceivedMessageSequenceTracker(Counter msgErrOutOfSeqCounter, Counter msgErrDuplicateCounter, Counter msgErrLossCounter) { @@ -50,9 +49,11 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ boolean messagesSkipped = false; if (sequenceNumber > expectedNumber) { if (pendingOutOfSeqNumbers.size() == MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { - messagesSkipped = processEarliestPendingOutOfSequenceNumber(); + messagesSkipped = processLowestPendingOutOfSequenceNumber(); + } + if(!pendingOutOfSeqNumbers.add(sequenceNumber)) { + msgErrDuplicateCounter.inc(); } - pendingOutOfSeqNumbers.add(sequenceNumber); } else { // sequenceNumber == expectedNumber expectedNumber++; @@ -61,15 +62,15 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ cleanUpTooFarBehindOutOfSequenceNumbers(); } - private boolean processEarliestPendingOutOfSequenceNumber() { - // remove the earliest pending out of sequence number - Long earliestOutOfSeqNumber = pendingOutOfSeqNumbers.first(); - pendingOutOfSeqNumbers.remove(earliestOutOfSeqNumber); - if (earliestOutOfSeqNumber > expectedNumber) { - // skip the expected number ahead to the number after the earliest sequence number + private boolean processLowestPendingOutOfSequenceNumber() { + // remove the lowest pending out of sequence number + Long lowestOutOfSeqNumber = pendingOutOfSeqNumbers.first(); + pendingOutOfSeqNumbers.remove(lowestOutOfSeqNumber); + if (lowestOutOfSeqNumber > expectedNumber) { + // skip the expected number ahead to the number after the lowest sequence number // increment the counter with the amount of sequence numbers that got skipped - msgErrLossCounter.inc(earliestOutOfSeqNumber - expectedNumber); - expectedNumber = earliestOutOfSeqNumber + 1; + msgErrLossCounter.inc(lowestOutOfSeqNumber - expectedNumber); + expectedNumber = lowestOutOfSeqNumber + 1; return true; } else { msgErrLossCounter.inc(); @@ -107,7 +108,7 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ @Override public void close() { while (!pendingOutOfSeqNumbers.isEmpty()) { - processPendingOutOfSequenceNumbers(processEarliestPendingOutOfSequenceNumber()); + processPendingOutOfSequenceNumbers(processLowestPendingOutOfSequenceNumber()); } } } diff --git a/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java index f79c29ebd..4ea3b531e 100644 --- a/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java +++ b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java @@ -149,4 +149,43 @@ class ReceivedMessageSequenceTrackerTest { assertEquals(1, msgErrLossCounter.getCount()); } + @Test + void shouldDetectGapAndMessageDuplication() { + // when + for (long l = 0; l < 100L; l++) { + if (l != 11L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == 12L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(1, msgErrDuplicateCounter.getCount()); + assertEquals(1, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectGapAndMessageDuplicationTimes2() { + // when + for (long l = 0; l < 100L; l++) { + if (l != 11L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == 12L) { + messageSequenceTracker.sequenceNumberReceived(l); + messageSequenceTracker.sequenceNumberReceived(l); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(2, msgErrDuplicateCounter.getCount()); + assertEquals(1, msgErrLossCounter.getCount()); + } + } From 85e1f8a649e3a749f9e107faa93bb415f921a2f2 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 21 Oct 2021 15:27:53 +0300 Subject: [PATCH 48/53] Upgrade Pulsar client to 2.8.1 version --- driver-pulsar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 9e74881cf..bb3110109 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -18,7 +18,7 @@ - 2.8.0 + 2.8.1 From 71c3b190edb12cf8611663f161390e316cfc40e6 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 22 Oct 2021 17:27:21 +0300 Subject: [PATCH 49/53] Detect delayed out-of-order delivery --- .../ops/ReceivedMessageSequenceTracker.java | 60 +++++++++++++++---- .../ReceivedMessageSequenceTrackerTest.java | 43 ++++++++++++- 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java index cd33e12de..fe3a27d6d 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTracker.java @@ -8,26 +8,39 @@ import java.util.TreeSet; /** * Detects message loss, message duplication and out-of-order message delivery * based on a monotonic sequence number that each received message contains. - * - * Out-of-order messages are detected with a maximum look behind of 20 sequence number entries. - * This is currently defined as a constant, {@link ReceivedMessageSequenceTracker#MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS}. + *

+ * Out-of-order messages are detected with a maximum look behind of 1000 sequence number entries. + * This is currently defined as a constant, {@link ReceivedMessageSequenceTracker#DEFAULT_MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS}. */ -class ReceivedMessageSequenceTracker implements AutoCloseable{ - public static final int MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS = 20; +class ReceivedMessageSequenceTracker implements AutoCloseable { + private static final int DEFAULT_MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS = 1000; + private static final int DEFAULT_MAX_TRACK_SKIPPED_SEQUENCE_NUMBERS = 1000; // message out-of-sequence error counter private final Counter msgErrOutOfSeqCounter; // duplicate message error counter private final Counter msgErrDuplicateCounter; // message loss error counter private final Counter msgErrLossCounter; - private final SortedSet pendingOutOfSeqNumbers = new TreeSet<>(); + private final SortedSet pendingOutOfSeqNumbers; + private final int maxTrackOutOfOrderSequenceNumbers; + private final SortedSet skippedSeqNumbers; + private final int maxTrackSkippedSequenceNumbers; private long expectedNumber = -1; + public ReceivedMessageSequenceTracker(Counter msgErrOutOfSeqCounter, Counter msgErrDuplicateCounter, Counter msgErrLossCounter) { + this(msgErrOutOfSeqCounter, msgErrDuplicateCounter, msgErrLossCounter, + DEFAULT_MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS, DEFAULT_MAX_TRACK_SKIPPED_SEQUENCE_NUMBERS); + } - ReceivedMessageSequenceTracker(Counter msgErrOutOfSeqCounter, Counter msgErrDuplicateCounter, Counter msgErrLossCounter) { + public ReceivedMessageSequenceTracker(Counter msgErrOutOfSeqCounter, Counter msgErrDuplicateCounter, Counter msgErrLossCounter, + int maxTrackOutOfOrderSequenceNumbers, int maxTrackSkippedSequenceNumbers) { this.msgErrOutOfSeqCounter = msgErrOutOfSeqCounter; this.msgErrDuplicateCounter = msgErrDuplicateCounter; this.msgErrLossCounter = msgErrLossCounter; + this.maxTrackOutOfOrderSequenceNumbers = maxTrackOutOfOrderSequenceNumbers; + this.maxTrackSkippedSequenceNumbers = maxTrackSkippedSequenceNumbers; + this.pendingOutOfSeqNumbers = new TreeSet<>(); + this.skippedSeqNumbers = new TreeSet<>(); } /** @@ -42,16 +55,24 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ } if (sequenceNumber < expectedNumber) { - msgErrDuplicateCounter.inc(); + if (skippedSeqNumbers.remove(sequenceNumber)) { + // late out-of-order delivery was detected + // decrease the loss counter + msgErrLossCounter.dec(); + // increment the out-of-order counter + msgErrOutOfSeqCounter.inc(); + } else { + msgErrDuplicateCounter.inc(); + } return; } boolean messagesSkipped = false; if (sequenceNumber > expectedNumber) { - if (pendingOutOfSeqNumbers.size() == MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { + if (pendingOutOfSeqNumbers.size() == maxTrackOutOfOrderSequenceNumbers) { messagesSkipped = processLowestPendingOutOfSequenceNumber(); } - if(!pendingOutOfSeqNumbers.add(sequenceNumber)) { + if (!pendingOutOfSeqNumbers.add(sequenceNumber)) { msgErrDuplicateCounter.inc(); } } else { @@ -69,7 +90,14 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ if (lowestOutOfSeqNumber > expectedNumber) { // skip the expected number ahead to the number after the lowest sequence number // increment the counter with the amount of sequence numbers that got skipped - msgErrLossCounter.inc(lowestOutOfSeqNumber - expectedNumber); + // keep track of the skipped sequence numbers to detect late out-of-order message delivery + for (long l = expectedNumber; l < lowestOutOfSeqNumber; l++) { + msgErrLossCounter.inc(); + skippedSeqNumbers.add(l); + if (skippedSeqNumbers.size() > maxTrackSkippedSequenceNumbers) { + skippedSeqNumbers.remove(skippedSeqNumbers.first()); + } + } expectedNumber = lowestOutOfSeqNumber + 1; return true; } else { @@ -92,7 +120,7 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ // remove sequence numbers that are too far behind for (Iterator iterator = pendingOutOfSeqNumbers.iterator(); iterator.hasNext(); ) { Long number = iterator.next(); - if (number < expectedNumber - MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { + if (number < expectedNumber - maxTrackOutOfOrderSequenceNumbers) { msgErrLossCounter.inc(); iterator.remove(); } else { @@ -111,4 +139,12 @@ class ReceivedMessageSequenceTracker implements AutoCloseable{ processPendingOutOfSequenceNumbers(processLowestPendingOutOfSequenceNumber()); } } + + public int getMaxTrackOutOfOrderSequenceNumbers() { + return maxTrackOutOfOrderSequenceNumbers; + } + + public int getMaxTrackSkippedSequenceNumbers() { + return maxTrackSkippedSequenceNumbers; + } } diff --git a/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java index 4ea3b531e..d2391d67a 100644 --- a/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java +++ b/driver-pulsar/src/test/java/io/nosqlbench/driver/pulsar/ops/ReceivedMessageSequenceTrackerTest.java @@ -11,7 +11,7 @@ class ReceivedMessageSequenceTrackerTest { Counter msgErrOutOfSeqCounter = new Counter(); Counter msgErrDuplicateCounter = new Counter(); Counter msgErrLossCounter = new Counter(); - ReceivedMessageSequenceTracker messageSequenceTracker = new ReceivedMessageSequenceTracker(msgErrOutOfSeqCounter, msgErrDuplicateCounter, msgErrLossCounter); + ReceivedMessageSequenceTracker messageSequenceTracker = new ReceivedMessageSequenceTracker(msgErrOutOfSeqCounter, msgErrDuplicateCounter, msgErrLossCounter, 20, 20); @Test void shouldCountersBeZeroWhenSequenceDoesntContainGaps() { @@ -83,7 +83,7 @@ class ReceivedMessageSequenceTrackerTest { if (totalMessages % 2 == 0) { messageSequenceTracker.sequenceNumberReceived(totalMessages); } - if (totalMessages < 2 * ReceivedMessageSequenceTracker.MAX_TRACK_OUT_OF_ORDER_SEQUENCE_NUMBERS) { + if (totalMessages < 2 * messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers()) { messageSequenceTracker.close(); } @@ -188,4 +188,43 @@ class ReceivedMessageSequenceTrackerTest { assertEquals(1, msgErrLossCounter.getCount()); } + + @Test + void shouldDetectDelayedOutOfOrderDelivery() { + // when + for (long l = 0; l < 5 * messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers(); l++) { + if (l != 10) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers() * 2) { + messageSequenceTracker.sequenceNumberReceived(10); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(1, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectDelayedOutOfOrderDeliveryOf2ConsecutiveSequenceNumbers() { + // when + for (long l = 0; l < 5 * messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers(); l++) { + if (l != 10 && l != 11) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers() * 2) { + messageSequenceTracker.sequenceNumberReceived(10); + messageSequenceTracker.sequenceNumberReceived(11); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(2, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } } From aba3ebe7c69b369b70dcf6dd55639182eadf7f88 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 26 Oct 2021 11:11:14 -0500 Subject: [PATCH 50/53] release: pulsar updates --- RELEASENOTES.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 67d747ee8..1c8c707e1 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,2 +1,5 @@ -- 8c8801b0 (HEAD -> main, origin/main) Merge pull request #371 from nosqlbench/nosqlbench-370 -- 9ea60914 (origin/nosqlbench-370, nosqlbench-370) nosqlbench-370 Specifying full path to the yaml workload crashes +- fa78ca54 (HEAD -> main, origin/main) Merge pull request #372 from lhotari/lh-detect-duplicates-after-gap +- 71c3b190 Detect delayed out-of-order delivery +- e694eaec Merge pull request #373 from lhotari/lh-upgrade-pulsar-2.8.1 +- 85e1f8a6 Upgrade Pulsar client to 2.8.1 version +- 6b50060a Detect duplicates after a gap From 2fadac5f809ad026667fe986c0fd48d4b9715329 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Tue, 26 Oct 2021 16:21:47 +0000 Subject: [PATCH 51/53] [maven-release-plugin] prepare release nosqlbench-4.15.63 --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 64489ed12..3eca10c37 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.63-SNAPSHOT + 4.15.63 @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index 40ef10658..f1677c85c 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.63-SNAPSHOT + 4.15.63 org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 995a6cd27..beda3ab77 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index 2eeb78020..ae96a07cb 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index b56777763..0ef733282 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 8b8a5813d..862f808ea 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index ad97dca33..592e6217a 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 8b4c6d53f..4ddb37e56 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 728ecc2ed..878bb8930 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index d523df163..3edee314e 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-stdout - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 10ee749ad..08fd2be8a 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index e90d04239..104adbab4 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-stdout - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index e5a2dd84c..75824d496 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index bb3110109..9accce28b 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-stdout - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 78e785a7c..fbdcb3a2e 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 8b2122cae..9970f99cf 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-stdout - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 7bb793d4c..fcdc468b4 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index 49bb940e5..77292b369 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-userlibs - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index f6379e449..8406a64b9 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench nb-annotations - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-userlibs - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 280accb88..4abada584 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench engine-docker - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 12cdb6e8f..86fdc19f2 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index c3ec183d3..52b701d9f 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench drivers-api - 4.15.63-SNAPSHOT + 4.15.63 @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.63-SNAPSHOT + 4.15.63 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 0169aafbd..c691895b6 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 2b7ea650f..1ea863927 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index a7c3fce8a..79ca1980a 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index b25c7c377..69dcffce9 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 842423007..2dec415a3 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.63 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index a38b77a7e..9f1cc8b7a 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 7c703747b..ed0c47277 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/nb/pom.xml b/nb/pom.xml index 4b18d890f..fd7fcad34 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench engine-cli - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench engine-docs - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench engine-core - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench engine-extensions - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-web - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-kafka - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-stdout - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-diag - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-tcp - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-http - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-jmx - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-dsegraph-shaded - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-cql-shaded - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-cqld3-shaded - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-cqlverify - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-mongodb - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-pulsar - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-cockroachdb - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench driver-jms - 4.15.63-SNAPSHOT + 4.15.63 @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/pom.xml b/pom.xml index afae2b444..99e208b07 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.15.63 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 5f0784903..0beb72c6f 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 nb-api io.nosqlbench virtdata-lang - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index af8b85408..64eb91d43 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 37203de2c..4e3512847 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index df7dd06f3..b6325bf69 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-lib-basics - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d742d62e3..8f341dc70 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-lib-basics - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 79bd6865b..dd540ff39 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index db9b320ad..439055014 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.63-SNAPSHOT + 4.15.63 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 532b99885..79f2284f6 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-lib-realer - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-api - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench virtdata-lib-random - 4.15.63-SNAPSHOT + 4.15.63 io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 virtdata-lib-basics io.nosqlbench - 4.15.63-SNAPSHOT + 4.15.63 virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.63-SNAPSHOT + 4.15.63 From 231956001c9b6d40b654c9edc9ce8e7fc8b8392b Mon Sep 17 00:00:00 2001 From: nb-droid Date: Tue, 26 Oct 2021 16:21:49 +0000 Subject: [PATCH 52/53] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 ++--- driver-cockroachdb/pom.xml | 4 ++-- driver-cql-shaded/pom.xml | 6 ++--- driver-cqld3-shaded/pom.xml | 6 ++--- driver-cqlverify/pom.xml | 6 ++--- driver-diag/pom.xml | 6 ++--- driver-dsegraph-shaded/pom.xml | 6 ++--- driver-http/pom.xml | 6 ++--- driver-jdbc/pom.xml | 4 ++-- driver-jms/pom.xml | 6 ++--- driver-jmx/pom.xml | 6 ++--- driver-kafka/pom.xml | 6 ++--- driver-mongodb/pom.xml | 6 ++--- driver-pulsar/pom.xml | 6 ++--- driver-stdout/pom.xml | 6 ++--- driver-tcp/pom.xml | 8 +++---- driver-web/pom.xml | 6 ++--- drivers-api/pom.xml | 6 ++--- engine-api/pom.xml | 10 ++++---- engine-cli/pom.xml | 6 ++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 8 +++---- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- engine-rest/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 44 +++++++++++++++++----------------- pom.xml | 4 ++-- virtdata-api/pom.xml | 6 ++--- virtdata-lang/pom.xml | 2 +- virtdata-lib-basics/pom.xml | 4 ++-- virtdata-lib-curves4/pom.xml | 6 ++--- virtdata-lib-random/pom.xml | 6 ++--- virtdata-lib-realer/pom.xml | 4 ++-- virtdata-realdata/pom.xml | 4 ++-- virtdata-userlibs/pom.xml | 16 ++++++------- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 3eca10c37..5a78c4285 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -12,7 +12,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench nb-api - 4.15.63 + 4.15.64-SNAPSHOT @@ -117,7 +117,7 @@ io.nosqlbench virtdata-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-cockroachdb/pom.xml b/driver-cockroachdb/pom.xml index f1677c85c..a198c0100 100644 --- a/driver-cockroachdb/pom.xml +++ b/driver-cockroachdb/pom.xml @@ -5,7 +5,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench driver-jdbc - 4.15.63 + 4.15.64-SNAPSHOT org.postgresql diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index beda3ab77..fe4f74fb0 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-cqld3-shaded/pom.xml b/driver-cqld3-shaded/pom.xml index ae96a07cb..087b04a47 100644 --- a/driver-cqld3-shaded/pom.xml +++ b/driver-cqld3-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 0ef733282..feab7d1f8 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -24,13 +24,13 @@ io.nosqlbench driver-cql-shaded - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 862f808ea..261c6dcd9 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-dsegraph-shaded/pom.xml b/driver-dsegraph-shaded/pom.xml index 592e6217a..f3fee40f4 100644 --- a/driver-dsegraph-shaded/pom.xml +++ b/driver-dsegraph-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 4ddb37e56..eaee2af91 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-jdbc/pom.xml b/driver-jdbc/pom.xml index 878bb8930..7abee0a5a 100644 --- a/driver-jdbc/pom.xml +++ b/driver-jdbc/pom.xml @@ -3,7 +3,7 @@ nosqlbench io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT 4.0.0 @@ -18,7 +18,7 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT compile diff --git a/driver-jms/pom.xml b/driver-jms/pom.xml index 3edee314e..e0ab5eeb0 100644 --- a/driver-jms/pom.xml +++ b/driver-jms/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-stdout - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-jmx/pom.xml b/driver-jmx/pom.xml index 08fd2be8a..ec819857b 100644 --- a/driver-jmx/pom.xml +++ b/driver-jmx/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 104adbab4..a044914ba 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -44,13 +44,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-stdout - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 75824d496..8c25ad80d 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -21,13 +21,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-pulsar/pom.xml b/driver-pulsar/pom.xml index 9accce28b..9bef01304 100644 --- a/driver-pulsar/pom.xml +++ b/driver-pulsar/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -40,13 +40,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-stdout - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index fbdcb3a2e..8bd5127ec 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 9970f99cf..94fe0e554 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -24,19 +24,19 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-stdout - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index fcdc468b4..086324a02 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/drivers-api/pom.xml b/drivers-api/pom.xml index 77292b369..903f2c6ab 100644 --- a/drivers-api/pom.xml +++ b/drivers-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench nb-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 8406a64b9..e03929f7d 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -23,25 +23,25 @@ io.nosqlbench nb-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench nb-annotations - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 4abada584..d72013baf 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench engine-docker - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 86fdc19f2..da52fe229 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 52b701d9f..8ad2e61f3 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -28,13 +28,13 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench drivers-api - 4.15.63 + 4.15.64-SNAPSHOT @@ -85,7 +85,7 @@ io.nosqlbench engine-clients - 4.15.63 + 4.15.64-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index c691895b6..4ff591661 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 1ea863927..8ba06de56 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 79ca1980a..d893d4464 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 69dcffce9..20a9ae397 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 2dec415a3..b144c2341 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT pom @@ -78,7 +78,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.15.63 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 9f1cc8b7a..85e443b62 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index ed0c47277..10d118a21 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index fd7fcad34..ba26ef6ab 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -24,121 +24,121 @@ io.nosqlbench engine-rest - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench engine-cli - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench engine-docs - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench engine-core - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench engine-extensions - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-web - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-kafka - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-stdout - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-diag - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-tcp - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-http - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-jmx - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-dsegraph-shaded - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-cql-shaded - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-cqld3-shaded - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-cqlverify - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-mongodb - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-pulsar - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-cockroachdb - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench driver-jms - 4.15.63 + 4.15.64-SNAPSHOT @@ -238,7 +238,7 @@ io.nosqlbench driver-mongodb - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/pom.xml b/pom.xml index 99e208b07..b8659694f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT mvn-defaults @@ -146,7 +146,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.15.63 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 0beb72c6f..85f8c4c5b 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 64eb91d43..2bff61d50 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 4e3512847..2397717c9 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index b6325bf69..472525977 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 8f341dc70..9951266af 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index dd540ff39..42aa56c8a 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 439055014..390e78a4e 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.15.63 + 4.15.64-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 79f2284f6..7707899a6 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT ../mvn-defaults @@ -18,36 +18,36 @@ io.nosqlbench virtdata-realdata - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-api - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.15.63 + 4.15.64-SNAPSHOT io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT virtdata-lib-basics io.nosqlbench - 4.15.63 + 4.15.64-SNAPSHOT virtdata-lib-curves4 @@ -55,7 +55,7 @@ io.nosqlbench docsys - 4.15.63 + 4.15.64-SNAPSHOT From e139f1269d747236622f57972b6801fa82e04cfb Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 1 Nov 2021 09:34:11 -0500 Subject: [PATCH 53/53] cleanup extraneous files --- category.txt | 1 - jmxtest4.yaml | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 category.txt delete mode 100644 jmxtest4.yaml diff --git a/category.txt b/category.txt deleted file mode 100644 index ae9304576..000000000 --- a/category.txt +++ /dev/null @@ -1 +0,0 @@ -c1 diff --git a/jmxtest4.yaml b/jmxtest4.yaml deleted file mode 100644 index a5aedb2f5..000000000 --- a/jmxtest4.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# (src/test/resources/activities/) jmx-test-1.yaml -statements: - - read1: - url: service:jmx:rmi:///jndi/rmi://10.101.33.50:7199/jmxrmi - object: org.apache.cassandra.metrics:type=Compaction,name=PendingTasks - readvar: Value - as_type: int - as_name: pending_tasks - -