From b4b09048f6e71eafd679cca9ffa6f80517bcddce Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 1 Dec 2022 12:11:07 -0600 Subject: [PATCH 01/20] update docs for op types --- .../uniform/flowtypes/ChainingOp.java | 23 +++++++--- .../uniform/flowtypes/CycleOp.java | 45 ++++++++++--------- .../activityimpl/uniform/flowtypes/Op.java | 17 ++++--- .../uniform/flowtypes/RunnableOp.java | 14 ++++++ 4 files changed, 61 insertions(+), 38 deletions(-) diff --git a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/ChainingOp.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/ChainingOp.java index 0edcfa34c..43c1aeed4 100644 --- a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/ChainingOp.java +++ b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/ChainingOp.java @@ -19,16 +19,25 @@ package io.nosqlbench.engine.api.activityimpl.uniform.flowtypes; import java.util.function.Function; /** - * Run a function on the current cached result and replace it - * with the result of the function. Functions are one way of invoking + *

ChainingOp: f(I) -> O

+ *

+ * Run a function on the current cached result in the current thread and replace it + * with the result of the function. ChainingOps are one way of invoking * logic within a cycle. However, they are not intended to stand alone. - * A CycleFunction must always have an input to work on. This input is - * provided by a Supplier as optionally implemented by an Op + * A ChainingOp must always have an input to work on, + * provided by either a {@link CycleOp} OR another call to a {@link ChainingOp}

* - * @param Some input type. + * @param Some input type, as determined by a previous {@link CycleOp} or {@link ChainingOp} on the same thread. * @param Some output type. */ -public interface ChainingOp extends Op, Function { +public interface ChainingOp extends Op, Function { + + /** + * Transform a value from a previous action and provide the result for a subsequent action. + * + * @param lastResult object form a previous operation or action + * @return a new result + */ @Override - O apply(I i); + O apply(I lastResult); } diff --git a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/CycleOp.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/CycleOp.java index e6bf71e29..58dfe8e1f 100644 --- a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/CycleOp.java +++ b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/CycleOp.java @@ -19,32 +19,33 @@ package io.nosqlbench.engine.api.activityimpl.uniform.flowtypes; import java.util.function.LongFunction; /** - * A CycleRunnable is simply a variation of a Runnable type. - * The main difference is that it is supplied with the cycle - * as input. + *

CycleOp: f(cycle) -> T

+ *

A CycleOp of T is an operation which takes a long input value + * and produces a value of type T. It is implemented as + * {@link LongFunction} of T.

+ * + *

This variant of {@link Op} has the ability to see the cycle + * which was previously used to select the op implementation.

+ * + *

It also has the ability to emit an value which can be seen a subsequent operation, if + * and only if it is a {@link ChainingOp}s.

+ * + *

Designer Notes

+ *

+ * If you are using the value in this call to select a specific type of behavior, it is very + * likely a candidate for factoring into separate op implementations. + * The {@link io.nosqlbench.engine.api.activityimpl.OpMapper} + * and {@link io.nosqlbench.engine.api.activityimpl.OpDispenser} abstractions are meant to move + * op type selection and scheduling to earlier in the activity. + *

+ * */ public interface CycleOp extends Op, LongFunction { -// /** -// *

Run an action for the given cycle. The cycle is provided for anecdotal -// * usage such as logging and debugging. It is valid to use the cycle value in these places, -// * but you should not use it to determine the logic of what is run. The mechanism -// * for doing this is provided in {@link io.nosqlbench.engine.api.activityimpl.OpMapper} -// * and {@link io.nosqlbench.engine.api.activityimpl.OpDispenser} types.

-// * -// * -// * @param cycle The cycle value for which an operation is run -// */ -//// * This method should do the same thing that {@link #apply(long)} does, except that -//// * there is no need to prepare or return a result. This is the form that will be called -//// * if there is no chaining operation to consume the result of this operation. -// void accept(long cycle); - /** - *

Run an action for the given cycle. The cycle - * value is only to be used for anecdotal presentation. This form is called - * when there is a chaining operation which will do something with this result.

+ *

Run an action for the given cycle.

+ * * @param value The cycle value for which an operation is run - * @return A result which is the native result type for the underlying driver. + * @return A result object which may be used by a subsequent {@link ChainingOp} */ @Override T apply(long value); diff --git a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/Op.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/Op.java index ca50f1a1a..e5ecdf6a2 100644 --- a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/Op.java +++ b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/Op.java @@ -17,21 +17,20 @@ package io.nosqlbench.engine.api.activityimpl.uniform.flowtypes; /** - * This is the root type of any operation which is used in a NoSQLBench + *

This is the root type of any operation which is used in a NoSQLBench * DriverAdapter. It is a tagging interface for incremental type validation - * in the NB runtime. You probably don't want to use it directly. + * in the NB runtime. You probably don't want to use it directly.

* - * Instead, use these: + *

Instead, use one of these: *

    *
  • {@link CycleOp}
    • - An interface that will called if there is nothing to consume * the result type from your operation. In some cases preparing a result body to - * hand down the chain is more costly, so implementing this interface allows ... + * hand down the chain is more costly, so implementing this interface allows the runtime + * to be more optimized. + *
  • {@link ChainingOp}
    • *
- * - * either {@link CycleOp} or {@link ChainingOp} (but not both!) - * - * In the standard flow of an activity, either of the above interfaces is called - * so long as an Op implements one of them. + *

*/ +// TODO: optimize the runtime around the specific op type public interface Op extends OpResultSize { } diff --git a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/RunnableOp.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/RunnableOp.java index dd5ba39fc..0cfc2f984 100644 --- a/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/RunnableOp.java +++ b/adapters-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/flowtypes/RunnableOp.java @@ -16,5 +16,19 @@ package io.nosqlbench.engine.api.activityimpl.uniform.flowtypes; +/** + *

RunnableOp

+ *

This is the simplest form of an executable operation in NoSQLBench. + * It is simply an operation is run for side-effect only.

+ */ public interface RunnableOp extends Op, Runnable { + + /** + * Invoke the operation. If you need to see the value of the current + * cycle, then you can use {@link CycleOp} instead. If you need to + * use a cached result of a previous operation, then you may need to + * use {@link ChainingOp}. + */ + @Override + void run(); } From 72602805939986783b4a0e117dc5beabdaa8179d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 1 Dec 2022 12:16:06 -0600 Subject: [PATCH 02/20] update docs for op types --- .../api/activityimpl/uniform/StandardAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardAction.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardAction.java index 0e1612afd..45f8c1826 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardAction.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardAction.java @@ -32,11 +32,11 @@ import org.apache.logging.log4j.Logger; import java.util.concurrent.TimeUnit; /** - * This is the generified version of an Action. All activity types should endeavor to use - * this, as the API surface is being consolidated so that the internal machinery of NB - * works in a very consistent and uniform way. - * There will be changes to multiple drivers to support this consolidation, but the bulk - * of this work will be undertaken by the project maintainers. + * This is the generified version of an Action. All driver adapters us this, as opposed + * to previous NB versions where it was implemented for each driver. + * + * This allows the API to be consolidated so that the internal machinery of NB + * works in a very consistent and uniform way for all users and drivers. * * @param The type of activity * @param The type of operation From 52ef693735814ecc1ba202ab9e9dc0283167102c Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 2 Dec 2022 06:27:32 +0000 Subject: [PATCH 03/20] fix: upgrade io.netty:netty-handler from 4.1.84.Final to 4.1.85.Final Snyk has created this PR to upgrade io.netty:netty-handler from 4.1.84.Final to 4.1.85.Final. See this package in Maven Repository: https://mvnrepository.com/artifact/io.netty/netty-handler/ See this project in Snyk: https://app.snyk.io/org/jshook/project/faf9c31c-14e2-456a-9f66-9dda91c923d9?utm_source=github&utm_medium=referral&page=upgrade-pr --- mvn-defaults/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 5d1e3e76a..5f54aa733 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -189,7 +189,7 @@ io.netty netty-handler - 4.1.84.Final + 4.1.85.Final From 82bfa44855ff93ee68d6e5bdda0ae7be4056043e Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 5 Dec 2022 23:07:41 +0000 Subject: [PATCH 04/20] fix: upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.340 to 1.12.341 Snyk has created this PR to upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.340 to 1.12.341. See this package in Maven Repository: https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3/ See this project in Snyk: https://app.snyk.io/org/jshook/project/fc9e1bd9-1d9a-474f-bde4-efb614c52ffe?utm_source=github&utm_medium=referral&page=upgrade-pr --- nb-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 2e0631a8a..e26f8e869 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -97,7 +97,7 @@ com.amazonaws aws-java-sdk-s3 - 1.12.340 + 1.12.341 From 150793cda97b456783073c083fd1a2214059a177 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 6 Dec 2022 17:07:24 +0000 Subject: [PATCH 05/20] fix: upgrade org.glassfish.jersey.media:jersey-media-json-jackson from 3.0.8 to 3.1.0 Snyk has created this PR to upgrade org.glassfish.jersey.media:jersey-media-json-jackson from 3.0.8 to 3.1.0. See this package in Maven Repository: https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-json-jackson/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr --- docsys/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 1d5147e12..7dfa9e33b 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -99,7 +99,7 @@ org.glassfish.jersey.media jersey-media-json-jackson - 3.0.8 + 3.1.0 From 76f5507e4d4e017de460b9fc0f6e4c165aafcd1d Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 6 Dec 2022 17:07:28 +0000 Subject: [PATCH 06/20] fix: upgrade org.apache.commons:commons-compress from 1.21 to 1.22 Snyk has created this PR to upgrade org.apache.commons:commons-compress from 1.21 to 1.22. See this package in Maven Repository: https://mvnrepository.com/artifact/org.apache.commons/commons-compress/ See this project in Snyk: https://app.snyk.io/org/jshook/project/03cbee46-d5d2-41d3-89cc-a2ad77ab807a?utm_source=github&utm_medium=referral&page=upgrade-pr --- docsys/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 1d5147e12..ca45ede7d 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -93,7 +93,7 @@ org.apache.commons commons-compress - 1.21 + 1.22 From f8623f3b7d2c80f8afea322e9b95e547ea4e58e9 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 6 Dec 2022 20:25:18 +0000 Subject: [PATCH 07/20] fix: upgrade io.swagger.core.v3:swagger-models from 2.2.4 to 2.2.6 Snyk has created this PR to upgrade io.swagger.core.v3:swagger-models from 2.2.4 to 2.2.6. See this package in Maven Repository: https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-models/ See this project in Snyk: https://app.snyk.io/org/jshook/project/b808ba5a-fa96-49c2-9cae-4c2c2f8a1384?utm_source=github&utm_medium=referral&page=upgrade-pr --- engine-rest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index a45106357..58df73fa6 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -29,7 +29,7 @@ io.swagger.core.v3 swagger-models - 2.2.4 + 2.2.6 From dc74283952694a2bb9b63e4b9a69fbedea387c0c Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 6 Dec 2022 20:34:02 -0600 Subject: [PATCH 08/20] nosqlbench-824 Add function to provide clustered values with monotonic stepping --- .../to_long/TriangularStepFunction.java | 96 ++++++++++++ .../to_long/TriangularStepFunctionTest.java | 146 ++++++++++++++++++ 2 files changed, 242 insertions(+) create mode 100644 virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java create mode 100644 virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java new file mode 100644 index 000000000..6368fe169 --- /dev/null +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; + +import io.nosqlbench.virtdata.api.annotations.Example; +import io.nosqlbench.virtdata.api.annotations.ThreadSafeMapper; + +import java.util.function.LongUnaryOperator; + +/** + *

Compute a value which increases monotonically with respect to the cycle value. + * All values for f(X+(m>=0)) will be equal or greater than f(X). In effect, this + * means that with a sequence of monotonic inputs, the results will be monotonic as + * well as clustered. The values will approximate input/average, but will vary in frequency + * around a simple binomial distribution.

+ * + *

The practical effect of this is to be able to compute a sequence of values + * over inputs which can act as foreign keys, but which are effectively ordered.

+ * + *

Call for Ideas

+ *

Due to the complexity of generalizing this as a pure function over other distributions, + * this is the only function of this type for now. If you are interested in this problem + * domain and have some suggestions for how to extend it to other distributions, please + * join the project or let us know.

+ */ +@ThreadSafeMapper +public class TriangularStepFunction implements LongUnaryOperator { + + private final Hash hasher = new Hash(); + private final long median; + private final LongUnaryOperator sizer; + + private final long variance; + + + @Example({"TriangularStepFunction(100,20)","Create a sequence of values where the average and median is 100, but the range of values is between 90 and 120."}) + @Example({"TriangularStepFunction(80,10)","Create a sequence of values where the average and median is 80, but the range of values is between 70 and 90."}) + TriangularStepFunction(long average, long variance) { + if (variance < 0 || variance > average) { + throw new RuntimeException( + "The median must be non-negative, and the variance must be less than the median. " + + "You provided median=" + average + ", variance=" + variance + "." + ); + } + this.median = average; + this.variance = variance; + this.sizer = new HashRange(average-variance,average+variance); + } + + TriangularStepFunction(long average) { + this(average, average/2); +// if (maxOffset>=avgsize) { +// throw new RuntimeException("max offset " + maxOffset + " has to be less than avg size " + avgsize); +// } + } + + @Override + public long applyAsLong(long operand) { + // window number + long count = operand / median; + // offset within window + long offset = operand % median; + // base of window + long base = operand - offset; + // variate up to window size + long variance = sizer.applyAsLong(base); + // variate offset from start of window + long slice = base + variance; + // select current or next window + long result = ((slice)>operand) ? count : count + 1; + return result; + } + + public long inlined(long operand) { + return (operand < operand - operand % median + sizer.applyAsLong(operand - operand % median)) ? operand / median : operand / median + 1; + } + + @Override + public String toString() { + return this.getClass().getSimpleName()+"{median="+median+",variance="+variance+"}"; + } +} diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java new file mode 100644 index 000000000..4df0c7b90 --- /dev/null +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.virtdata.library.basics.shared.from_long.to_long; + +import org.junit.jupiter.api.Test; + +import java.security.InvalidParameterException; +import java.util.Arrays; +import java.util.LongSummaryStatistics; +import java.util.stream.IntStream; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TriangularStepFunctionTest { + + private static final int LABEL=0; + private static final int FREQUENCY=1; + + @Test + public void testExample1() { + TriangularStepFunction e1 = new TriangularStepFunction(100, 20); + int[] runLengths = this.rleStatsFor(e1, 0, 10000); + System.out.println(Arrays.toString(runLengths)); + assertThat(IntStream.of(runLengths).min().orElseThrow()).isEqualTo(80L); + assertThat(IntStream.of(runLengths).max().orElseThrow()).isEqualTo(120L); + } + + @Test + public void testExample2() { + TriangularStepFunction e1 = new TriangularStepFunction(80, 10); + int[] runLengths = this.rleStatsFor(e1, 0, 10000); + System.out.println(Arrays.toString(runLengths)); + assertThat(IntStream.of(runLengths).min().orElseThrow()).isEqualTo(70L); + assertThat(IntStream.of(runLengths).max().orElseThrow()).isEqualTo(90L); + } + + @Test + public void testStepSlice() { + int avgsize=10; + TriangularStepFunction f = new TriangularStepFunction(avgsize); + int[] ary = new int[avgsize*2]; + long current=0L; + int count=0; + for (int i = 0; i < 10000; i++) { + long result = f.applyAsLong(i); + if (result==current) { + count++; + } else { + ary[count]++; + current=result; + count=0; + } + } + + for (int i = 0; i < ary.length; i++) { + System.out.println("bucket " + i + ", count " + ary[i]); + } + } + + + @Test + public void testIncrementalVariance() { + TriangularStepFunction f = new TriangularStepFunction(100, 0); + assertThat(f.applyAsLong(0L)).isEqualTo(0L); + assertThat(f.applyAsLong(1L)).isEqualTo(0L); + assertThat(f.applyAsLong(99L)).isEqualTo(0L); + assertThat(f.applyAsLong(100L)).isEqualTo(1L); + } + + @Test + public void testVariance() { + long first=0; + TriangularStepFunction f = new TriangularStepFunction(100,1); + var rlestats = rleStatsFor(f, 0, 100000); + LongSummaryStatistics stats99to101 = statsForRle((int) f.applyAsLong(first),rlestats); + assertThat(stats99to101.getMin()).isEqualTo(99L); + assertThat(stats99to101.getMax()).isEqualTo(101L); + + int[][] histo = histoFor(rlestats); + LongSummaryStatistics histoStats = new LongSummaryStatistics(); + for (int[] ints : histo) { + histoStats.accept(ints[LABEL]); + } + assertThat(histoStats.getAverage()).isEqualTo(100); + } + + private int[] rleStatsFor(TriangularStepFunction f, long firstTrialIncl, long lastTrialExcl) { + long firstBucket = f.applyAsLong(firstTrialIncl); + long lastBucket = f.applyAsLong(lastTrialExcl); + if (firstBucket>Integer.MAX_VALUE||lastBucket>Integer.MAX_VALUE) { + throw new InvalidParameterException("can't fit result data into range of ints from long [" + firstBucket + ","+lastBucket+"]"); + } + int base = (int) firstBucket; + int[] counts = new int[(((int) lastBucket-(int)firstBucket))+1]; + for (long trial=firstTrialIncl; trial < lastTrialExcl; trial++) { + long result = f.applyAsLong(trial); + counts[(int)(result-base)]++; + } + // remove last partial, as only the front initial partial is compensated + counts= Arrays.copyOfRange(counts,0,counts.length-1); + return counts; + } + + private int[][] histoFor(int[] counts) { + var minval = IntStream.of(counts).min().orElseThrow(); + var maxval = IntStream.of(counts).max().orElseThrow(); + + int[][] histo = new int[(maxval-minval)+1][2]; + for (int i = 0; i <= histo[LABEL].length; i++) { + histo[i][LABEL]=i+minval; + } + + for (int count : counts) { + System.out.println(count); + histo[count-minval][FREQUENCY]++; + } + return histo; + } + + private LongSummaryStatistics statsForRle(int base, int[] counts) { + LongSummaryStatistics stats = new LongSummaryStatistics(); + for (int element = 0; element < counts.length; element++) { + int count = counts[element]; + if (count==0) { + continue; + } + stats.accept(count); + } + return stats; + + } +} From 97cf9a32cb9429909c9015a61a449679693a284e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 6 Dec 2022 20:34:31 -0600 Subject: [PATCH 09/20] add ad-hoc doc to show publishing flow --- devdocs/sketches/docs-publishing-flow.svg | 566 ++++++++++++++++++++++ 1 file changed, 566 insertions(+) create mode 100644 devdocs/sketches/docs-publishing-flow.svg diff --git a/devdocs/sketches/docs-publishing-flow.svg b/devdocs/sketches/docs-publishing-flow.svg new file mode 100644 index 000000000..a16d11f52 --- /dev/null +++ b/devdocs/sketches/docs-publishing-flow.svg @@ -0,0 +1,566 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + NB + + + + RELEASEDNB-DOCS + + + + NB-BUILD-DOCS + + + + non-releasebuild + + + + releasebuild + + + + + + + + + + + + + + + edit embededdocs and code + edit docscontent + publish docscontent to maindocs site + publish embeddeddocs content to maindocs site + publish embeddeddocs content to previewdocs site + + + From 3677a60ec846e8a4d43726777d84f7a11764dc1f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 13:36:24 -0600 Subject: [PATCH 10/20] nosqlbench-830 limit spin-looping with cqld4 retryreplace option. --- .../cqld4/Cqld4CqlReboundStatement.java | 4 +- .../ExceededRetryReplaceException.java | 45 +++++++++++++++++++ .../opdispensers/Cqld4BaseOpDispenser.java | 7 +++ .../Cqld4PreparedStmtDispenser.java | 1 + .../opdispensers/Cqld4RawStmtDispenser.java | 3 +- .../Cqld4SimpleCqlStmtDispenser.java | 3 +- .../cqld4/optypes/Cqld4CqlBatchStatement.java | 4 +- .../adapter/cqld4/optypes/Cqld4CqlOp.java | 21 ++++++++- .../optypes/Cqld4CqlPreparedStatement.java | 4 +- .../optypes/Cqld4CqlSimpleStatement.java | 4 +- adapter-cqld4/src/main/resources/cqld4.md | 5 +++ 11 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java index 0ac61009c..e2fb9e1d9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java @@ -24,8 +24,8 @@ import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; public class Cqld4CqlReboundStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlReboundStatement(CqlSession session, int maxpages, boolean retryreplace, BoundStatement rebound, RSProcessors processors) { - super(session,maxpages,retryreplace,processors); + public Cqld4CqlReboundStatement(CqlSession session, int maxpages, boolean retryreplace, int maxlwtretries, int lwtRetryCount, BoundStatement rebound, RSProcessors processors) { + super(session,maxpages,retryreplace,maxlwtretries,lwtRetryCount, processors); this.stmt = rebound; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java new file mode 100644 index 000000000..3d7cb3b4b --- /dev/null +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.adapter.cqld4.exceptions; + + +import com.datastax.oss.driver.api.core.cql.ResultSet; + +/** + * This is a synthetic error generated by the cql driver in NoSQLBench when + * the retryreplace option is used but the number of LWT round-trips from the driver + * is excessive. The number of LWT round trips allowed is controlled by the + * maxlwtretries op field. + */ +public class ExceededRetryReplaceException extends CqlGenericCycleException { + + private final ResultSet resultSet; + private final String queryString; + private final int retries; + + public ExceededRetryReplaceException(ResultSet resultSet, String queryString, int retries) { + super("After " + retries + " retires using the retryreplace option, Operation was not applied:" + queryString); + this.retries = retries; + this.resultSet = resultSet; + this.queryString = queryString; + } + + public ResultSet getResultSet() { + return resultSet; + } + public String getQueryString() { return queryString; } +} diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java index 34200479e..540b34dc1 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java @@ -45,12 +45,14 @@ public abstract class Cqld4BaseOpDispenser extends BaseOpDispenser sessionFunc; private final boolean isRetryReplace; + private final int maxLwtRetries; public Cqld4BaseOpDispenser(DriverAdapter adapter, LongFunction sessionFunc, ParsedOp op) { super(adapter, op); this.sessionFunc = sessionFunc; this.maxpages = op.getStaticConfigOr("maxpages", 1); this.isRetryReplace = op.getStaticConfigOr("retryreplace", false); + this.maxLwtRetries = op.getStaticConfigOr("maxlwtretries", 1); } public int getMaxPages() { @@ -61,6 +63,11 @@ public abstract class Cqld4BaseOpDispenser extends BaseOpDispenser getSessionFunc() { return sessionFunc; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java index 497b67b99..83503c9c8 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java @@ -89,6 +89,7 @@ public class Cqld4PreparedStmtDispenser extends Cqld4BaseOpDispenser { boundStatement, getMaxPages(), isRetryReplace(), + getMaxLwtRetries(), processors ); } catch (Exception exception) { diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java index fe986415c..16b999e60 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java @@ -49,7 +49,8 @@ public class Cqld4RawStmtDispenser extends Cqld4BaseOpDispenser { getSessionFunc().apply(value), (SimpleStatement) stmtFunc.apply(value), getMaxPages(), - isRetryReplace() + isRetryReplace(), + getMaxLwtRetries() ); } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java index a3e85cac5..f58ce6dc3 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java @@ -46,7 +46,8 @@ public class Cqld4SimpleCqlStmtDispenser extends Cqld4BaseOpDispenser { getSessionFunc().apply(value), (SimpleStatement) stmtFunc.apply(value), getMaxPages(), - isRetryReplace() + isRetryReplace(), + getMaxLwtRetries() ); } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java index bf8a64c3b..6828a70ec 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlBatchStatement extends Cqld4CqlOp { private final BatchStatement stmt; - public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxpages, boolean retryreplace) { - super(session,maxpages,retryreplace,new RSProcessors()); + public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxpages, int maxlwtretries, boolean retryreplace) { + super(session,maxpages,retryreplace,maxlwtretries,new RSProcessors()); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java index e72c835c3..ec9a147b6 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java @@ -23,6 +23,7 @@ import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.api.core.cql.Statement; import io.nosqlbench.adapter.cqld4.*; import io.nosqlbench.adapter.cqld4.exceptions.ChangeUnappliedCycleException; +import io.nosqlbench.adapter.cqld4.exceptions.ExceededRetryReplaceException; import io.nosqlbench.adapter.cqld4.exceptions.UndefinedResultSetException; import io.nosqlbench.adapter.cqld4.exceptions.UnexpectedPagingException; import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.*; @@ -46,15 +47,27 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private final CqlSession session; private final int maxpages; private final boolean retryreplace; + private final int maxLwtRetries; + private int retryReplaceCount =0; private ResultSet rs; private Cqld4CqlOp nextOp; private final RSProcessors processors; - public Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, RSProcessors processors) { + public Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { this.session = session; this.maxpages = maxpages; this.retryreplace = retryreplace; + this.maxLwtRetries =maxLwtRetries; + this.processors = processors; + } + + protected Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, int retryRplaceCount, RSProcessors processors) { + this.session = session; + this.maxpages = maxpages; + this.retryreplace = retryreplace; + this.maxLwtRetries =maxLwtRetries; + this.retryReplaceCount=retryRplaceCount; this.processors = processors; } @@ -69,6 +82,10 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, if (!retryreplace) { throw new ChangeUnappliedCycleException(rs, getQueryString()); } else { + retryReplaceCount++; + if (retryReplaceCount >maxLwtRetries) { + throw new ExceededRetryReplaceException(rs,getQueryString(), retryReplaceCount); + } Row one = rs.one(); processors.buffer(one); totalRows++; @@ -119,7 +136,7 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private Cqld4CqlOp rebindLwt(Statement stmt, Row row) { BoundStatement rebound = LWTRebinder.rebindUnappliedStatement(stmt, row); - return new Cqld4CqlReboundStatement(session, maxpages, retryreplace, rebound, processors); + return new Cqld4CqlReboundStatement(session, maxpages, retryreplace, maxLwtRetries, retryReplaceCount, rebound, processors); } } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java index 4c8720196..938475f7d 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlPreparedStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxpages, boolean retryreplace, RSProcessors processors) { - super(session,maxpages,retryreplace,processors); + public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { + super(session,maxpages,retryreplace,maxLwtRetries,processors); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java index 19f1a6936..3fb6a9578 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java @@ -23,8 +23,8 @@ import io.nosqlbench.adapter.cqld4.RSProcessors; public class Cqld4CqlSimpleStatement extends Cqld4CqlOp { private final SimpleStatement stmt; - public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace) { - super(session, maxpages,retryreplace, new RSProcessors()); + public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace, int maxlwtretries) { + super(session, maxpages,retryreplace, maxlwtretries, new RSProcessors()); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/resources/cqld4.md b/adapter-cqld4/src/main/resources/cqld4.md index cb83996ce..473969a14 100644 --- a/adapter-cqld4/src/main/resources/cqld4.md +++ b/adapter-cqld4/src/main/resources/cqld4.md @@ -198,6 +198,11 @@ params: # match the preconditions) in order to test LWT performance. retryreplace: true + # Set the number of retries allowed by the retryreplace option. This is set + # to 1 conservatively, as with the maxpages setting. This means that you will + # see an error if the first LWT retry after an unapplied change was not successful. + maxlwtretries: 1 + ## The following options are meant for advanced testing scenarios only, ## and are not generally meant to be used in typical application-level, ## data mode, performance or scale testing. These expose properties From d90731ec7abef823966fdc431e089a883e8b4bd2 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 13:41:20 -0600 Subject: [PATCH 11/20] typo fix --- .../adapter/cqld4/exceptions/ExceededRetryReplaceException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java index 3d7cb3b4b..a5e5f1f46 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java @@ -32,7 +32,7 @@ public class ExceededRetryReplaceException extends CqlGenericCycleException { private final int retries; public ExceededRetryReplaceException(ResultSet resultSet, String queryString, int retries) { - super("After " + retries + " retires using the retryreplace option, Operation was not applied:" + queryString); + super("After " + retries + " retries using the retryreplace option, Operation was not applied:" + queryString); this.retries = retries; this.resultSet = resultSet; this.queryString = queryString; From 7737ffc0f98c1643f058f7a8a7aa8567d0fd023b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 14:30:04 -0600 Subject: [PATCH 12/20] nosqlbench-828 nosqlbench-824 --- .../to_long/TriangularStepFunction.java | 9 +------ .../to_long/TriangularStepFunctionTest.java | 25 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java index 6368fe169..266ab3732 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java @@ -47,7 +47,7 @@ public class TriangularStepFunction implements LongUnaryOperator { private final long variance; - @Example({"TriangularStepFunction(100,20)","Create a sequence of values where the average and median is 100, but the range of values is between 90 and 120."}) + @Example({"TriangularStepFunction(100,20)","Create a sequence of values where the average and median is 100, but the range of values is between 80 and 120."}) @Example({"TriangularStepFunction(80,10)","Create a sequence of values where the average and median is 80, but the range of values is between 70 and 90."}) TriangularStepFunction(long average, long variance) { if (variance < 0 || variance > average) { @@ -63,9 +63,6 @@ public class TriangularStepFunction implements LongUnaryOperator { TriangularStepFunction(long average) { this(average, average/2); -// if (maxOffset>=avgsize) { -// throw new RuntimeException("max offset " + maxOffset + " has to be less than avg size " + avgsize); -// } } @Override @@ -85,10 +82,6 @@ public class TriangularStepFunction implements LongUnaryOperator { return result; } - public long inlined(long operand) { - return (operand < operand - operand % median + sizer.applyAsLong(operand - operand % median)) ? operand / median : operand / median + 1; - } - @Override public String toString() { return this.getClass().getSimpleName()+"{median="+median+",variance="+variance+"}"; diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java index 4df0c7b90..a835fa3d5 100644 --- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java +++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunctionTest.java @@ -48,30 +48,6 @@ public class TriangularStepFunctionTest { assertThat(IntStream.of(runLengths).max().orElseThrow()).isEqualTo(90L); } - @Test - public void testStepSlice() { - int avgsize=10; - TriangularStepFunction f = new TriangularStepFunction(avgsize); - int[] ary = new int[avgsize*2]; - long current=0L; - int count=0; - for (int i = 0; i < 10000; i++) { - long result = f.applyAsLong(i); - if (result==current) { - count++; - } else { - ary[count]++; - current=result; - count=0; - } - } - - for (int i = 0; i < ary.length; i++) { - System.out.println("bucket " + i + ", count " + ary[i]); - } - } - - @Test public void testIncrementalVariance() { TriangularStepFunction f = new TriangularStepFunction(100, 0); @@ -141,6 +117,5 @@ public class TriangularStepFunctionTest { stats.accept(count); } return stats; - } } From 15f15ebc9065d2144f3d467b65338c0621d9d0ba Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 14:32:35 -0600 Subject: [PATCH 13/20] nosqlbench-828 nosqlbench-824 --- .../to_long/TriangularStepFunction.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java index 266ab3732..758fddf69 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java @@ -41,22 +41,22 @@ import java.util.function.LongUnaryOperator; public class TriangularStepFunction implements LongUnaryOperator { private final Hash hasher = new Hash(); - private final long median; + private final long average; private final LongUnaryOperator sizer; private final long variance; - @Example({"TriangularStepFunction(100,20)","Create a sequence of values where the average and median is 100, but the range of values is between 80 and 120."}) - @Example({"TriangularStepFunction(80,10)","Create a sequence of values where the average and median is 80, but the range of values is between 70 and 90."}) + @Example({"TriangularStepFunction(100,20)","Create a sequence of values where the average is 100, but the range of values is between 80 and 120."}) + @Example({"TriangularStepFunction(80,10)","Create a sequence of values where the average is 80, but the range of values is between 70 and 90."}) TriangularStepFunction(long average, long variance) { - if (variance < 0 || variance > average) { + if (average<=0 || variance < 0 || variance > average) { throw new RuntimeException( - "The median must be non-negative, and the variance must be less than the median. " + - "You provided median=" + average + ", variance=" + variance + "." + "The average must be non-negative, and the variance must be less than the average. " + + "You provided average=" + average + ", variance=" + variance + "." ); } - this.median = average; + this.average = average; this.variance = variance; this.sizer = new HashRange(average-variance,average+variance); } @@ -68,9 +68,9 @@ public class TriangularStepFunction implements LongUnaryOperator { @Override public long applyAsLong(long operand) { // window number - long count = operand / median; + long count = operand / average; // offset within window - long offset = operand % median; + long offset = operand % average; // base of window long base = operand - offset; // variate up to window size @@ -84,6 +84,6 @@ public class TriangularStepFunction implements LongUnaryOperator { @Override public String toString() { - return this.getClass().getSimpleName()+"{median="+median+",variance="+variance+"}"; + return this.getClass().getSimpleName()+"{average="+ average +",variance="+variance+"}"; } } From a1fbb6dccaf53ced46c9ab104fe1cd899622b003 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 14:33:46 -0600 Subject: [PATCH 14/20] use average instead of median, add safety check for average==0 --- .../basics/shared/from_long/to_long/TriangularStepFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java index 758fddf69..9d7d8f8ae 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepFunction.java @@ -52,7 +52,7 @@ public class TriangularStepFunction implements LongUnaryOperator { TriangularStepFunction(long average, long variance) { if (average<=0 || variance < 0 || variance > average) { throw new RuntimeException( - "The average must be non-negative, and the variance must be less than the average. " + + "The average must be positive, variance non-negative and the variance must be less than the average. " + "You provided average=" + average + ", variance=" + variance + "." ); } From 6fbbfb5d0f9b403926754f8acad2a207cbcd8f89 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 15:01:11 -0600 Subject: [PATCH 15/20] diagram updates --- devdocs/sketches/docs-publishing-flow.svg | 345 ++++++++++++++++------ 1 file changed, 261 insertions(+), 84 deletions(-) diff --git a/devdocs/sketches/docs-publishing-flow.svg b/devdocs/sketches/docs-publishing-flow.svg index a16d11f52..ac6f1f7b5 100644 --- a/devdocs/sketches/docs-publishing-flow.svg +++ b/devdocs/sketches/docs-publishing-flow.svg @@ -186,6 +186,90 @@ d="M 0,0 5,-5 -12.5,0 5,5 Z" id="path10457-28" /> + + + + + + + + + + + + + + + + + + + transform="translate(-101.6,28.574999)"> NB + style="text-align:center;text-anchor:middle;stroke-width:0.264583" + x="163.23721" + y="-35.909264">NBmain branch + transform="translate(171.45,17.4625)"> + transform="translate(36.515457,20.6375)"> + transform="translate(36.152018,80.16875)"> build + transform="translate(155.575,-112.7125)"> + cx="56.960236" + cy="65.919228" + r="2.7336953" /> + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 57.15,68.2625 -10e-7,6.35 -3.174999,6.35" + id="path11421" + sodipodi:nodetypes="ccc" /> + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 57.149999,74.6125 3.175001,6.35" + id="path11423" + sodipodi:nodetypes="cc" /> + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" + d="m 53.975,71.4375 h 6.35" + id="path11425" + sodipodi:nodetypes="cc" /> edit embedededit embededdocs and code + x="127.40736" + y="-35.554535" + id="tspan13944">docs, javadoc,and code edit docscontent publish docspublish all docscontent to maincontent to maindocs site publish embeddedpublish embeddeddocs content to maindocs content to maindocs site publish embeddedpublish embeddeddocs content to previewdocs content to previewdocs site + on push to mainand change toRELEASENOTES.md + Initially, this doc sitewill be checkpointed manually into the main docs site + on push to mainand NO change toRELEASENOTES.md Date: Wed, 7 Dec 2022 15:07:34 -0600 Subject: [PATCH 16/20] fix camel case across all affected method signatures --- .../cqld4/Cqld4CqlReboundStatement.java | 4 ++-- .../cqld4/optypes/Cqld4CqlBatchStatement.java | 4 ++-- .../adapter/cqld4/optypes/Cqld4CqlOp.java | 24 +++++++++---------- .../optypes/Cqld4CqlPreparedStatement.java | 4 ++-- .../optypes/Cqld4CqlSimpleStatement.java | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java index e2fb9e1d9..6cf024b36 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java @@ -24,8 +24,8 @@ import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; public class Cqld4CqlReboundStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlReboundStatement(CqlSession session, int maxpages, boolean retryreplace, int maxlwtretries, int lwtRetryCount, BoundStatement rebound, RSProcessors processors) { - super(session,maxpages,retryreplace,maxlwtretries,lwtRetryCount, processors); + public Cqld4CqlReboundStatement(CqlSession session, int maxPages, boolean retryReplace, int maxLwtRetries, int lwtRetryCount, BoundStatement rebound, RSProcessors processors) { + super(session,maxPages,retryReplace,maxLwtRetries,lwtRetryCount, processors); this.stmt = rebound; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java index 6828a70ec..d122aa2eb 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlBatchStatement extends Cqld4CqlOp { private final BatchStatement stmt; - public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxpages, int maxlwtretries, boolean retryreplace) { - super(session,maxpages,retryreplace,maxlwtretries,new RSProcessors()); + public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxPage, int maxLwtRetries, boolean retryReplace) { + super(session,maxPage,retryReplace,maxLwtRetries,new RSProcessors()); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java index ec9a147b6..67931b83a 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java @@ -45,8 +45,8 @@ import java.util.Map; public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, OpGenerator, OpResultSize { private final CqlSession session; - private final int maxpages; - private final boolean retryreplace; + private final int maxPages; + private final boolean retryReplace; private final int maxLwtRetries; private int retryReplaceCount =0; @@ -54,18 +54,18 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private Cqld4CqlOp nextOp; private final RSProcessors processors; - public Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { + public Cqld4CqlOp(CqlSession session, int maxPages, boolean retryReplace, int maxLwtRetries, RSProcessors processors) { this.session = session; - this.maxpages = maxpages; - this.retryreplace = retryreplace; + this.maxPages = maxPages; + this.retryReplace = retryReplace; this.maxLwtRetries =maxLwtRetries; this.processors = processors; } - protected Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, int retryRplaceCount, RSProcessors processors) { + protected Cqld4CqlOp(CqlSession session, int maxPages, boolean retryReplace, int maxLwtRetries, int retryRplaceCount, RSProcessors processors) { this.session = session; - this.maxpages = maxpages; - this.retryreplace = retryreplace; + this.maxPages = maxPages; + this.retryReplace = retryReplace; this.maxLwtRetries =maxLwtRetries; this.retryReplaceCount=retryRplaceCount; this.processors = processors; @@ -79,7 +79,7 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, int totalRows = 0; if (!rs.wasApplied()) { - if (!retryreplace) { + if (!retryReplace) { throw new ChangeUnappliedCycleException(rs, getQueryString()); } else { retryReplaceCount++; @@ -103,8 +103,8 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, Row row = reader.next(); processors.buffer(row); } - if (pages++ > maxpages) { - throw new UnexpectedPagingException(rs, getQueryString(), pages, maxpages, stmt.getPageSize()); + if (pages++ > maxPages) { + throw new UnexpectedPagingException(rs, getQueryString(), pages, maxPages, stmt.getPageSize()); } if (rs.isFullyFetched()) { break; @@ -136,7 +136,7 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private Cqld4CqlOp rebindLwt(Statement stmt, Row row) { BoundStatement rebound = LWTRebinder.rebindUnappliedStatement(stmt, row); - return new Cqld4CqlReboundStatement(session, maxpages, retryreplace, maxLwtRetries, retryReplaceCount, rebound, processors); + return new Cqld4CqlReboundStatement(session, maxPages, retryReplace, maxLwtRetries, retryReplaceCount, rebound, processors); } } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java index 938475f7d..9e6dfcad9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlPreparedStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { - super(session,maxpages,retryreplace,maxLwtRetries,processors); + public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxPages, boolean retryReplace, int maxLwtRetries, RSProcessors processors) { + super(session,maxPages,retryReplace,maxLwtRetries,processors); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java index 3fb6a9578..0f119c91d 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java @@ -23,8 +23,8 @@ import io.nosqlbench.adapter.cqld4.RSProcessors; public class Cqld4CqlSimpleStatement extends Cqld4CqlOp { private final SimpleStatement stmt; - public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace, int maxlwtretries) { - super(session, maxpages,retryreplace, maxlwtretries, new RSProcessors()); + public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxPages, boolean retryReplace, int maxLwtRetries) { + super(session, maxPages,retryReplace, maxLwtRetries, new RSProcessors()); this.stmt = stmt; } From c4c13bbadd02b30ead68d8356f84cedfe6ea65c7 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 16:30:18 -0600 Subject: [PATCH 17/20] minor features release for blocked users --- RELEASENOTES.md | 215 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 203 insertions(+), 12 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e2e130ab7..ff78ef769 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,12 +1,203 @@ -- 114aea71b (HEAD -> main) Merge branch 'main' of github.com:nosqlbench/nosqlbench -- 0fd85c09b (origin/main) Merge pull request #728 from nosqlbench/feature/mongodb_baselines2_workloads -- 99f0226fc Merge pull request #729 from nosqlbench/snyk-upgrade-2d988862477c7e76f15ff8b65bcdc3a4 -- d22413259 Merge pull request #727 from nosqlbench/snyk-upgrade-b28610be666fa7e80936b0c2f87df569 -- d49a5087d improved build diagnostics -- e594aab92 (origin/snyk-upgrade-2d988862477c7e76f15ff8b65bcdc3a4) fix: upgrade com.datastax.oss:pulsar-jms from 2.4.4 to 2.4.9 -- 64990c412 (origin/feature/mongodb_baselines2_workloads) Initial working draft of MongoDB timeseries -- 7ebb16a06 (origin/snyk-upgrade-b28610be666fa7e80936b0c2f87df569) fix: upgrade org.postgresql:postgresql from 42.4.2 to 42.5.0 -- 68cdd075b new function, security updates, actions fix -- ec8e6ee71 Merge branch 'main' of github.com:nosqlbench/nosqlbench -- a63fa951c actions fix release -- 0f6bce0b0 fix typo in docker push logic +- d0f25f5c6 (HEAD -> main, origin/main) Merge pull request #831 from nosqlbench/nosqlbench-830 +- 03a3afd86 Merge pull request #828 from nosqlbench/nosqlbench-824 +- 2b63b8e64 (origin/nosqlbench-830, nosqlbench-830) fix camel case across all affected method signatures +- 6fbbfb5d0 (origin/nosqlbench-824, nosqlbench-824) diagram updates +- a1fbb6dcc use average instead of median, add safety check for average==0 +- 15f15ebc9 nosqlbench-828 nosqlbench-824 +- 7737ffc0f nosqlbench-828 nosqlbench-824 +- d90731ec7 typo fix +- b33e93eae Merge pull request #827 from nosqlbench/snyk-upgrade-5c7e9a58ec726ce1a5540b1007997a68 +- 3677a60ec nosqlbench-830 limit spin-looping with cqld4 retryreplace option. +- 97cf9a32c add ad-hoc doc to show publishing flow +- dc7428395 nosqlbench-824 Add function to provide clustered values with monotonic stepping +- eaa8c5671 Merge pull request #826 from nosqlbench/snyk-upgrade-62cc0785172d699541ae5c0e9e487268 +- a1e7eb198 Merge pull request #825 from nosqlbench/snyk-upgrade-32a05328633bd6d7b922681265c560ee +- 14df638f7 Merge pull request #823 from nosqlbench/snyk-upgrade-d560c5ed862bae1f5c8558515d8e4571 +- cde915914 Merge pull request #818 from nosqlbench/snyk-upgrade-e5f0f6d488b383219dd2ca00632f1dde +- b13c899e8 Merge pull request #815 from nosqlbench/javadoc_improvements +- f8623f3b7 (origin/snyk-upgrade-5c7e9a58ec726ce1a5540b1007997a68) fix: upgrade io.swagger.core.v3:swagger-models from 2.2.4 to 2.2.6 +- 76f5507e4 (origin/snyk-upgrade-62cc0785172d699541ae5c0e9e487268) fix: upgrade org.apache.commons:commons-compress from 1.21 to 1.22 +- 150793cda (origin/snyk-upgrade-32a05328633bd6d7b922681265c560ee) fix: upgrade org.glassfish.jersey.media:jersey-media-json-jackson from 3.0.8 to 3.1.0 +- 82bfa4485 (origin/snyk-upgrade-d560c5ed862bae1f5c8558515d8e4571) fix: upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.340 to 1.12.341 +- 2ca4320c2 Merge pull request #819 from nosqlbench/snyk-upgrade-cab2f09370a21c3a871a0379d2ad3792 +- 569d35f2b Merge pull request #820 from nosqlbench/snyk-upgrade-a30d7c35198a17d29ecdca13feba6579 +- 5595f5083 Merge pull request #821 from nosqlbench/snyk-upgrade-f3ed4565eab47a4f529c1dfe1685b618 +- 8eb934c56 Merge pull request #822 from nosqlbench/snyk-upgrade-292f7f0db6ee968fd7ce222173de764c +- 141bfe088 fix: upgrade org.graalvm.js:js-scriptengine from 21.3.3.1 to 21.3.4 +- fd4673f15 fix: upgrade io.dropwizard.metrics:metrics-graphite from 4.2.10 to 4.2.12 +- 3030e58df fix: upgrade org.graalvm.tools:profiler from 20.3.6.1 to 20.3.8 +- 1e6367ecb fix: upgrade org.graalvm.js:js from 21.3.3.1 to 21.3.4 +- 52ef69373 (origin/snyk-upgrade-e5f0f6d488b383219dd2ca00632f1dde) fix: upgrade io.netty:netty-handler from 4.1.84.Final to 4.1.85.Final +- 726028059 (origin/javadoc_improvements, javadoc_improvements) update docs for op types +- b4b09048f update docs for op types +- 98493cfcb Merge pull request #812 from nosqlbench/snyk-upgrade-1754fe16038ae415d7733b7b3fdfb0ad +- 842427e4f Merge pull request #813 from nosqlbench/snyk-upgrade-ca34705c36a67d06ea66413eae078875 +- b06996319 Merge pull request #814 from nosqlbench/snyk-upgrade-a37d7e3729b4fe18258665c47ebd0cf4 +- b3e20c16e Merge pull request #809 from nosqlbench/nosqlbench-808 +- 6ad405d9f fix: upgrade org.glassfish.jersey.core:jersey-server from 3.0.8 to 3.1.0 +- db6594d41 Merge pull request #811 from nosqlbench/snyk-upgrade-8275b1467b7f05117180335fa4d5f944 +- b6cc8fcf0 Merge pull request #810 from nosqlbench/snyk-upgrade-342e4814a0e11c6d2f22b112ba735c12 +- d88359a6a fix: upgrade org.snakeyaml:snakeyaml-engine from 2.4 to 2.5 +- f413a5af7 fix: upgrade org.codehaus.groovy:groovy from 3.0.12 to 3.0.13 +- 34b51b198 fix: upgrade com.datastax.oss:java-driver-query-builder from 4.14.1 to 4.15.0 +- c89339839 fix: upgrade joda-time:joda-time from 2.11.2 to 2.12.1 +- 9bca349e4 (origin/nosqlbench-808, nosqlbench-808) use correct value in exception handlers +- bf518c375 Merge pull request #804 from nosqlbench/snyk-upgrade-4a7ee2762e595acb421d164dc872273b +- b16de9edb Merge pull request #806 from nosqlbench/snyk-fix-d203bc55bd9076b01b05bf8a45a65046 +- 7c8727e15 Merge pull request #805 from nosqlbench/snyk-upgrade-18902492bf09462887646247db53d19b +- 017fcf8ff Merge pull request #803 from nosqlbench/snyk-upgrade-12d61683e1022753a4e624d6d62d5a19 +- 1f96e625d Merge pull request #802 from nosqlbench/snyk-upgrade-cf1da0c80b868193683f0a03748b3835 +- ce353d899 Merge pull request #801 from nosqlbench/snyk-upgrade-399641fb454b01fc3feead152acf52d5 +- 74ae911e5 Merge pull request #800 from nosqlbench/dependabot/maven/driver-cockroachdb/org.postgresql-postgresql-42.5.1 +- 82c253acb (origin/snyk-fix-d203bc55bd9076b01b05bf8a45a65046) fix: driver-cockroachdb/pom.xml to reduce vulnerabilities +- fec156a25 (origin/snyk-upgrade-18902492bf09462887646247db53d19b) fix: upgrade io.netty:netty-handler from 4.1.82.Final to 4.1.84.Final +- d622670f7 (origin/snyk-upgrade-4a7ee2762e595acb421d164dc872273b) fix: upgrade org.graalvm.sdk:graal-sdk from 21.3.3.1 to 21.3.4 +- ec858f69d (origin/snyk-upgrade-12d61683e1022753a4e624d6d62d5a19) fix: upgrade info.picocli:picocli from 4.6.3 to 4.7.0 +- 96be7811a (origin/snyk-upgrade-cf1da0c80b868193683f0a03748b3835) fix: upgrade com.google.code.gson:gson from 2.9.1 to 2.10 +- 64f11bed1 (origin/snyk-upgrade-399641fb454b01fc3feead152acf52d5) fix: upgrade com.github.oshi:oshi-core-java11 from 6.2.2 to 6.3.1 +- 702692058 (origin/dependabot/maven/driver-cockroachdb/org.postgresql-postgresql-42.5.1) build(deps): bump postgresql in /driver-cockroachdb +- f39ba9331 fix: upgrade io.swagger.core.v3:swagger-models from 2.2.3 to 2.2.4 (#799) +- 9afe376b4 fix: upgrade io.swagger.parser.v3:swagger-parser from 2.1.4 to 2.1.7 (#798) +- 79a2d0977 fix: upgrade org.apache.pulsar:pulsar-client from 2.10.1 to 2.10.2 (#796) +- 523f500cc Merge pull request #773 from nosqlbench/snyk-fix-8aa6ab863bb5432def89d1b31da171c7 +- 26ee71883 Merge pull request #772 from nosqlbench/snyk-fix-ab49d52aab0b82f5b5b84c1e7389d4b1 +- 8b87b10ca Merge branch 'main' into snyk-fix-ab49d52aab0b82f5b5b84c1e7389d4b1 +- 00e0596fd Merge pull request #771 from nosqlbench/snyk-fix-ac633ddba1da2c7ec65dff2ae08fa725 +- 1e0ac38b4 Merge branch 'main' into snyk-fix-ac633ddba1da2c7ec65dff2ae08fa725 +- f9adeff1d Merge pull request #774 from nosqlbench/snyk-fix-b2c236df12318590f34b590edea9705e +- 5ffda7d1e Merge branch 'main' into snyk-fix-b2c236df12318590f34b590edea9705e +- e5f03b91a Merge pull request #775 from nosqlbench/snyk-fix-8c31cd4a0b1166676ed0fe1e7cf9a216 +- c7e5e7291 Merge branch 'main' into snyk-fix-8c31cd4a0b1166676ed0fe1e7cf9a216 +- 3ceddb631 Merge pull request #776 from nosqlbench/snyk-fix-6ba0467ba1a5842fab939a7c4f8b6a14 +- e39954ccc Merge branch 'main' into snyk-fix-6ba0467ba1a5842fab939a7c4f8b6a14 +- 56470956b Merge pull request #778 from nosqlbench/snyk-fix-62d2529ba6efa1321216d8e295c48e5d +- 59b430b12 Merge branch 'main' into snyk-fix-62d2529ba6efa1321216d8e295c48e5d +- 4c764250d Merge pull request #794 from nosqlbench/snyk-fix-2ac9869bf1d47aa3f30a82f3655c5432 +- 7491370ba Merge branch 'main' into snyk-fix-2ac9869bf1d47aa3f30a82f3655c5432 +- 47db96c06 Merge pull request #795 from nosqlbench/snyk-fix-3f81768022b768b87ace72058200f7ac +- fa528eebe Merge pull request #779 from nosqlbench/shutdown_hooks +- 875e2d8f9 (origin/shutdown_hooks, shutdown_hooks) temporarily disable test for close exception handler +- 901034875 fix for second noisy shutdown test +- 2db6c6cf6 Update codeql-analysis.yml +- 18ba2fdaf Merge branch 'main' into shutdown_hooks +- 8602d5b53 Merge pull request #793 from yabinmeng/main +- 3b616d7d2 (origin/snyk-fix-3f81768022b768b87ace72058200f7ac) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- eaefd9a1b Merge pull request #781 from nosqlbench/780-sporadic-buildtest-failures-gh-actions +- 69617042b (origin/780-sporadic-buildtest-failures-gh-actions, 780-sporadic-buildtest-failures-gh-actions) minor fixes on PR +- 28f561aed direct work-around for flaky test, simple improvements to logging, some improvements to consistent view of status, misc cleanups +- 0193ed355 (origin/snyk-fix-2ac9869bf1d47aa3f30a82f3655c5432) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- c077218e8 Fix example yaml file producer and consumer parameter names +- 16417f37b additional diagnostics for spurious test +- f7c9e50f3 Add README file and adjust sample yaml files +- eb0013f16 logging updates for build sanity checking +- bc4773269 build workflow should upload logfiles for success() or failure() of previous jobs, but not when canceled +- 40c968234 Merge branch '780-sporadic-buildtest-failures-gh-actions' of github.com:nosqlbench/nosqlbench into 780-sporadic-buildtest-failures-gh-actions +- dcf7baf86 Dead code utest resurrection and timing w/ gh actions Cyclerate=10 to test github actions part2 Debug and exception handling Detailed error handler logging System out diagnostics Capture step included Try-catch diagnostics. sysout cleanup; general cleanup +- 20ed4950d removing broken actions plugin on main +- 2831d8c3f Merge branch 'main' of github.com:nosqlbench/nosqlbench +- 3e8153dd8 Merge pull request #792 from yabinmeng/main +- b8684107b memoize retries in hot code path +- ebb6f2c58 include space usage in diag for testing +- 48192cbde close native driver connections on on activity+space shutdown +- 4471d90cc implement closeable spaces via decorator interface +- bd8aff908 Added support for 1) subscription initial position and 2) regex subscription mode +- 35eec4d81 Dead code utest resurrection and timing w/ gh actions Cyclerate=10 to test github actions part2 Debug and exception handling Detailed error handler logging System out diagnostics Capture step included Try-catch diagnostics. sysout cleanup; general cleanup +- e80e9926c Merge pull request #791 from yabinmeng/main +- 0de710288 Add support for 1) producer message compression 2) consumer DLT/negAck/ackTimeout policy +- 12f8697e0 Complete the first draft of NB5 Pulsar adapter code, except the per-thread rate limiter. +- e128d2867 Merge branch 'nosqlbench:main' into main +- 0c71696b1 Completed NB4 Pulsar driver code migration to NB5. But there are still a few lingering issues due to the difference of how NB4 vs NB5 driver/adapter interacts with the NB engine. +- 33e330dc3 [Snyk] Security upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.325 to 1.12.330 (#768) +- 2158dfa33 fix: upgrade io.netty:netty-handler from 4.1.81.Final to 4.1.82.Final (#767) +- 5fc22bbaa fix: upgrade com.google.code.gson:gson from 2.9.0 to 2.9.1 (#766) +- 6999a675f [Snyk] Upgrade io.dropwizard.metrics:metrics-core from 4.2.10 to 4.2.12 (#765) +- ca6f2b052 Add PulsarAdapter specific metrics +- 8b76d1fcf add shutdown hooks for adapters and spaces +- 8c3d744a0 Merge pull request #764 from nosqlbench/snyk-upgrade-6693c12bca4fafc634662d8962afcb9a +- eb1de8f1d Timing changes for github actions to properly perform build/test step. +- a05c511de fix: upgrade org.eclipse.jetty:jetty-server from 11.0.11 to 11.0.12 (#763) +- c309d200a - Delete unsed code "driver-jms" - NB5 Pulsar driver Admin functionality in place - create/delete tenant, namespace, and topic +- 2b9452fde Buildfixes, trying to unblock current builds (#777) +- fe268d7f8 (origin/snyk-fix-62d2529ba6efa1321216d8e295c48e5d) fix: nb-api/pom.xml to reduce vulnerabilities +- d47462929 (origin/buildfixes, buildfixes) remove blocking issues github actions plugin, since it is broken +- 4dc830aa1 improve wording around op template resolution +- b2f74d329 make example/test script more robust for meager github actions environment +- cbb01fb7f (origin/snyk-fix-6ba0467ba1a5842fab939a7c4f8b6a14) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- e50098800 (origin/snyk-fix-8c31cd4a0b1166676ed0fe1e7cf9a216) fix: nb-api/pom.xml to reduce vulnerabilities +- 422849209 (origin/snyk-fix-b2c236df12318590f34b590edea9705e) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- c5b632518 (origin/snyk-fix-8aa6ab863bb5432def89d1b31da171c7) fix: docsys/pom.xml to reduce vulnerabilities +- f8af301fb (origin/snyk-fix-ab49d52aab0b82f5b5b84c1e7389d4b1) fix: nb-api/pom.xml to reduce vulnerabilities +- a5974919a (origin/snyk-fix-ac633ddba1da2c7ec65dff2ae08fa725) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- 7c1fb1963 Merge pull request #770 from nosqlbench/ms-mongodb-keyvalue-schema-fix +- 98c7b1a97 Merge pull request #769 from nosqlbench/base64 +- 45ee75fef bump min_version +- 8f32c9496 Updated MongoDB key-value collection to have a 'value' field +- 9a92129a8 (origin/base64) base64 +- bb27a6f7f (origin/snyk-upgrade-6693c12bca4fafc634662d8962afcb9a) fix: upgrade io.swagger.core.v3:swagger-models from 2.2.2 to 2.2.3 +- 0e3893190 (origin/jeffb/nb736) Merge pull request #757 from nosqlbench/snyk-upgrade-de963ecc07996edad35bfd93b9db28c2 +- 92e41e7f7 Merge pull request #758 from nosqlbench/snyk-upgrade-38e72059fc3a8a2099fed05a4e8be9b0 +- 64093b2ab Merge pull request #759 from nosqlbench/snyk-upgrade-5f4f139c9c2fc23d4a2117f5bda8f31e +- 6d25c03ff Merge pull request #760 from nosqlbench/snyk-upgrade-c29375a9a40341a121dfc342ee787201 +- a92897b1d Merge pull request #761 from nosqlbench/snyk-upgrade-c51251ba7d6c428fd60b9aa362f5d4b4 +- 927f4e2c6 fix: upgrade org.eclipse.jetty:jetty-servlets from 11.0.11 to 11.0.12 +- f64a25280 fix: upgrade org.eclipse.jetty:jetty-servlet from 11.0.11 to 11.0.12 +- 74db1d97e fix: upgrade org.eclipse.jetty:jetty-rewrite from 11.0.11 to 11.0.12 +- 02257d41b fix: upgrade org.yaml:snakeyaml from 1.32 to 1.33 +- ed1365773 fix: upgrade joda-time:joda-time from 2.11.1 to 2.11.2 +- dae02bb60 Merge pull request #746 from nosqlbench/snyk-fix-c33fb16683078e999e1d6cab62020656 +- 90bf9dd47 Merge pull request #748 from nosqlbench/snyk-fix-4981c736a854543f414acc756aa6773d +- 2cbb844db Merge pull request #756 from nosqlbench/dependabot/maven/mvn-defaults/org.apache.commons-commons-text-1.10.0 +- 702187794 Merge pull request #744 from nosqlbench/snyk-fix-26f3021e2a4eb5d42b86ca025e907044 +- def46982f Merge branch 'main' into snyk-fix-26f3021e2a4eb5d42b86ca025e907044 +- 2292c6a21 Merge branch 'main' into snyk-fix-4981c736a854543f414acc756aa6773d +- 0021e1cf5 Merge pull request #740 from nosqlbench/snyk-upgrade-e3eae2348ed5c3a9c5a4df3da5434294 +- 2874bdd6a Merge branch 'main' into snyk-fix-c33fb16683078e999e1d6cab62020656 +- 5fb062c1a Merge pull request #749 from nosqlbench/snyk-fix-01ab345df3b2b9725654404c28451b69 +- f684760ee Merge branch 'main' into snyk-fix-01ab345df3b2b9725654404c28451b69 +- 25fe0a541 Merge pull request #739 from nosqlbench/snyk-upgrade-61e7fcecc7f6c453bf8ee04e1799fe04 +- 0cb654259 Merge pull request #738 from nosqlbench/snyk-upgrade-de204ed7275df7f0d05e2783982c6ac7 +- 6bcc1cfd2 build(deps): bump commons-text from 1.9 to 1.10.0 in /mvn-defaults +- 974b29f11 Merge pull request #742 from nosqlbench/snyk-upgrade-dc69205a67c70990049a72696a0c367b +- 88987fb04 Merge pull request #743 from nosqlbench/snyk-upgrade-ac680967c12a71fb0828a5fb85bd8259 +- 879a8778f Merge pull request #745 from nosqlbench/snyk-fix-6accd862435675058d9b3c98aefe4f4a +- af6380f70 Merge pull request #747 from nosqlbench/snyk-fix-fc4ff10e48c0a29879ed09f2c567dd08 +- 47489b075 Merge pull request #750 from nosqlbench/snyk-fix-30fed3e9e7bf54aa1715f6cb0cd3bd93 +- bc1039a11 Merge pull request #751 from nosqlbench/snyk-fix-eeda5403343ff40d314d648afcfdf408 +- 256d7b721 Merge pull request #752 from nosqlbench/snyk-fix-b9ee34aa87226cd6400a08d1f6f78f84 +- eb3e57041 Merge pull request #754 from nosqlbench/snyk-fix-5ff726edd68fbb5f2553166c8f1878d6 +- b478a3766 Merge pull request #755 from nosqlbench/snyk-fix-fec660b2a5471e3538d424b7a8a66438 +- f875f2c7f fix: nb-api/pom.xml to reduce vulnerabilities +- e90580de2 Merge pull request #753 from nosqlbench/ms-trivial-mongodb-workload-fix +- c35ec732e fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- 60bd26104 Minor update to timeseries clustering index name +- 3496f965c fix: mvn-defaults/pom.xml to reduce vulnerabilities +- e3187bc1e fix: mvn-defaults/pom.xml to reduce vulnerabilities +- 75aa1e45c fix: mvn-defaults/pom.xml to reduce vulnerabilities +- ad369143d fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- 9b279895e fix: nb-api/pom.xml to reduce vulnerabilities +- 49309872c fix: engine-rest/pom.xml to reduce vulnerabilities +- 35d57fca5 fix: nb-api/pom.xml & mvn-defaults/pom.xml to reduce vulnerabilities +- 5cb5bd5b0 fix: mvn-defaults/pom.xml to reduce vulnerabilities +- 8a3720792 fix: adapter-dynamodb/pom.xml to reduce vulnerabilities +- 7e5bd8f7f fix: upgrade com.datastax.oss:java-driver-core from 4.14.1 to 4.15.0 +- cb3191a1a fix: upgrade com.datastax.oss:pulsar-jms from 2.4.9 to 2.4.11 +- 706880c01 fix: upgrade org.apache.logging.log4j:log4j-core from 2.18.0 to 2.19.0 +- dc4c92eca fix: upgrade org.apache.logging.log4j:log4j-api from 2.18.0 to 2.19.0 +- e7a92d68d fix: upgrade org.apache.logging.log4j:log4j-jcl from 2.18.0 to 2.19.0 +- 87c3904f9 Merge pull request #730 from nosqlbench/snyk-upgrade-497803c521a3e4b5bf1f8320886e4693 +- c769c59af Merge pull request #731 from nosqlbench/snyk-upgrade-4de9e27b335c4ba704d719c6b8208fc9 +- ee4243af7 Merge pull request #732 from nosqlbench/snyk-upgrade-b07f4c6dc36ef0b84aac016e42bc0ac0 +- 59a0b3fbf Merge pull request #733 from nosqlbench/snyk-upgrade-9d3ff80bbe2914cac41eefa7bf016fc4 +- a67e9604b Merge pull request #734 from nosqlbench/snyk-upgrade-6f292d686b89f8516e45eb37ec3e77bb +- 1929bc87c Merge pull request #735 from nosqlbench/snyk-fix-d6c9e33a2e55402294f57e1ce7c62a6e +- ab7487e98 Merge pull request #737 from jeffbanks/jeffb/count-warn-nb561 +- 9bc3a2fd1 Notify user when using error=count vs. counter. +- b1d5411af Updated min_version to be 4.17.30 +- 5abef6db3 Updated min_version to be 4.17.30 +- 84b3b5e25 Updated min_version to be 4.17.30 +- a60c41256 (origin/snyk-fix-d6c9e33a2e55402294f57e1ce7c62a6e) fix: docsys/pom.xml to reduce vulnerabilities +- 35d5c0cee (origin/snyk-upgrade-6f292d686b89f8516e45eb37ec3e77bb) fix: upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.269 to 1.12.300 +- 9d3310413 (origin/snyk-upgrade-9d3ff80bbe2914cac41eefa7bf016fc4) fix: upgrade org.antlr:antlr4-runtime from 4.10.1 to 4.11.1 +- c41b5990d (origin/snyk-upgrade-b07f4c6dc36ef0b84aac016e42bc0ac0) fix: upgrade com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider from 2.13.3 to 2.13.4 +- e0fb11da4 (origin/snyk-upgrade-4de9e27b335c4ba704d719c6b8208fc9) fix: upgrade io.netty:netty-handler from 4.1.80.Final to 4.1.81.Final +- c6b327161 (origin/snyk-upgrade-497803c521a3e4b5bf1f8320886e4693) fix: upgrade com.amazonaws:aws-java-sdk-dynamodb from 1.12.262 to 1.12.299 From fb131e9b0977a8dc112f05829f2138afb772bdfa Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 7 Dec 2022 23:30:02 +0000 Subject: [PATCH 18/20] [maven-release-plugin] prepare release nosqlbench-4.17.31 --- adapter-cqld4/pom.xml | 4 ++-- adapter-diag/pom.xml | 6 +++--- adapter-dynamodb/pom.xml | 4 ++-- adapter-http/pom.xml | 4 ++-- adapter-mongodb/pom.xml | 4 ++-- adapter-pulsar/pom.xml | 6 +++--- adapter-stdout/pom.xml | 6 +++--- adapter-tcp/pom.xml | 4 ++-- adapters-api/pom.xml | 8 ++++---- docsys/pom.xml | 6 +++--- engine-api/pom.xml | 12 ++++++------ engine-cli/pom.xml | 6 +++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 6 +++--- 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-spectest/pom.xml | 2 +- nb5/pom.xml | 22 +++++++++++----------- nbr-examples/pom.xml | 6 +++--- nbr/pom.xml | 14 +++++++------- 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 ++++++++-------- 34 files changed, 101 insertions(+), 101 deletions(-) diff --git a/adapter-cqld4/pom.xml b/adapter-cqld4/pom.xml index 4e8c8d41a..9988fb06c 100644 --- a/adapter-cqld4/pom.xml +++ b/adapter-cqld4/pom.xml @@ -20,7 +20,7 @@ io.nosqlbench mvn-defaults - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -38,7 +38,7 @@ io.nosqlbench adapters-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/adapter-diag/pom.xml b/adapter-diag/pom.xml index 302538264..0811ac0e5 100644 --- a/adapter-diag/pom.xml +++ b/adapter-diag/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -37,13 +37,13 @@ io.nosqlbench nb-annotations - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 compile diff --git a/adapter-dynamodb/pom.xml b/adapter-dynamodb/pom.xml index 5d6d2d48e..c12b98c50 100644 --- a/adapter-dynamodb/pom.xml +++ b/adapter-dynamodb/pom.xml @@ -20,7 +20,7 @@ io.nosqlbench mvn-defaults - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -39,7 +39,7 @@ io.nosqlbench adapters-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/adapter-http/pom.xml b/adapter-http/pom.xml index b6ccd52eb..847bb3835 100644 --- a/adapter-http/pom.xml +++ b/adapter-http/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -38,7 +38,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 compile diff --git a/adapter-mongodb/pom.xml b/adapter-mongodb/pom.xml index e60032009..fb4c143d1 100644 --- a/adapter-mongodb/pom.xml +++ b/adapter-mongodb/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -36,7 +36,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/adapter-pulsar/pom.xml b/adapter-pulsar/pom.xml index 2428c54fe..891fe9d9a 100644 --- a/adapter-pulsar/pom.xml +++ b/adapter-pulsar/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -41,13 +41,13 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapters-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/adapter-stdout/pom.xml b/adapter-stdout/pom.xml index 285f86353..95e747c1c 100644 --- a/adapter-stdout/pom.xml +++ b/adapter-stdout/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -38,14 +38,14 @@ io.nosqlbench nb-annotations - 4.17.31-SNAPSHOT + 4.17.31 compile io.nosqlbench adapters-api - 4.17.31-SNAPSHOT + 4.17.31 compile diff --git a/adapter-tcp/pom.xml b/adapter-tcp/pom.xml index 6204a442b..5c1029def 100644 --- a/adapter-tcp/pom.xml +++ b/adapter-tcp/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -40,7 +40,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/adapters-api/pom.xml b/adapters-api/pom.xml index ea91c96ca..39beee7a0 100644 --- a/adapters-api/pom.xml +++ b/adapters-api/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -39,19 +39,19 @@ io.nosqlbench nb-spectest - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench nb-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-userlibs - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/docsys/pom.xml b/docsys/pom.xml index 5735bd869..aa8d7a3cc 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -28,7 +28,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -37,7 +37,7 @@ io.nosqlbench nb-api - 4.17.31-SNAPSHOT + 4.17.31 @@ -133,7 +133,7 @@ io.nosqlbench virtdata-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 9db3bb359..ef7547237 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -39,31 +39,31 @@ io.nosqlbench nb-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapters-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench nb-spectest - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench nb-annotations - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-userlibs - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index abccb1e38..f9e2bf0e4 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench engine-docker - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index cc761c986..6a3581c4e 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 20caa2538..00e2b0077 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -38,7 +38,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 @@ -89,7 +89,7 @@ io.nosqlbench engine-clients - 4.17.31-SNAPSHOT + 4.17.31 compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index bd03836dc..88d25d2ae 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 8c5838d89..7310fc54d 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 9a700fb61..376fc0f04 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 58df73fa6..0591cdaee 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index a20b9ac09..d891e7c7f 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -19,7 +19,7 @@ io.nosqlbench mvn-defaults - 4.17.31-SNAPSHOT + 4.17.31 pom @@ -89,7 +89,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.17.31 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 5447fe35e..0af134a6a 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index e26f8e869..1472b30fe 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -58,7 +58,7 @@ io.nosqlbench nb-annotations - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/nb-spectest/pom.xml b/nb-spectest/pom.xml index 274b325f7..3a6029bbc 100644 --- a/nb-spectest/pom.xml +++ b/nb-spectest/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults diff --git a/nb5/pom.xml b/nb5/pom.xml index f801d40cd..4fef97492 100644 --- a/nb5/pom.xml +++ b/nb5/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -40,7 +40,7 @@ io.nosqlbench nbr - 4.17.31-SNAPSHOT + 4.17.31 @@ -49,49 +49,49 @@ io.nosqlbench adapter-tcp - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-mongodb - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-stdout - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-diag - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-dynamodb - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-cqld4 - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-http - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-pulsar - 4.17.31-SNAPSHOT + 4.17.31 @@ -166,7 +166,7 @@ io.nosqlbench adapter-mongodb - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/nbr-examples/pom.xml b/nbr-examples/pom.xml index 6e8e73730..fea18e7b3 100644 --- a/nbr-examples/pom.xml +++ b/nbr-examples/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -39,13 +39,13 @@ io.nosqlbench nbr - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-diag - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/nbr/pom.xml b/nbr/pom.xml index 9dca9b6cf..8e2be4939 100644 --- a/nbr/pom.xml +++ b/nbr/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -40,37 +40,37 @@ io.nosqlbench engine-rest - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench engine-cli - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench engine-docs - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench engine-core - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench engine-extensions - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench adapter-diag - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/pom.xml b/pom.xml index 7eac71c2c..5276d67f4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 mvn-defaults @@ -188,7 +188,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-4.17.31 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 4124f7e4b..62cb79ef9 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 nb-api io.nosqlbench virtdata-lang - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 3fbb276f7..0fd7b2e89 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index a84409b13..e1434146b 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 8dcdd827d..801106ac8 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-lib-basics - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 3ae330a56..3e1c0c61a 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-lib-basics - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index c72acb3ad..361fabc0d 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index d16316af5..dab911084 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.17.31-SNAPSHOT + 4.17.31 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 9ae56cc89..ccc25bf19 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31-SNAPSHOT + 4.17.31 ../mvn-defaults @@ -34,42 +34,42 @@ io.nosqlbench virtdata-realdata - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-lib-realer - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-api - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-lib-random - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-lib-basics - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench virtdata-lib-curves4 - 4.17.31-SNAPSHOT + 4.17.31 io.nosqlbench docsys - 4.17.31-SNAPSHOT + 4.17.31 compile From 02522a468e82ee9c4f6a98fc3f391e249d0609d8 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 7 Dec 2022 23:30:05 +0000 Subject: [PATCH 19/20] [maven-release-plugin] prepare for next development iteration --- adapter-cqld4/pom.xml | 4 ++-- adapter-diag/pom.xml | 6 +++--- adapter-dynamodb/pom.xml | 4 ++-- adapter-http/pom.xml | 4 ++-- adapter-mongodb/pom.xml | 4 ++-- adapter-pulsar/pom.xml | 6 +++--- adapter-stdout/pom.xml | 6 +++--- adapter-tcp/pom.xml | 4 ++-- adapters-api/pom.xml | 8 ++++---- docsys/pom.xml | 6 +++--- engine-api/pom.xml | 12 ++++++------ engine-cli/pom.xml | 6 +++--- engine-clients/pom.xml | 4 ++-- engine-core/pom.xml | 6 +++--- 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-spectest/pom.xml | 2 +- nb5/pom.xml | 22 +++++++++++----------- nbr-examples/pom.xml | 6 +++--- nbr/pom.xml | 14 +++++++------- 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 ++++++++-------- 34 files changed, 101 insertions(+), 101 deletions(-) diff --git a/adapter-cqld4/pom.xml b/adapter-cqld4/pom.xml index 9988fb06c..bc0c902af 100644 --- a/adapter-cqld4/pom.xml +++ b/adapter-cqld4/pom.xml @@ -20,7 +20,7 @@ io.nosqlbench mvn-defaults - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -38,7 +38,7 @@ io.nosqlbench adapters-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/adapter-diag/pom.xml b/adapter-diag/pom.xml index 0811ac0e5..55c07a912 100644 --- a/adapter-diag/pom.xml +++ b/adapter-diag/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -37,13 +37,13 @@ io.nosqlbench nb-annotations - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT compile diff --git a/adapter-dynamodb/pom.xml b/adapter-dynamodb/pom.xml index c12b98c50..30c918124 100644 --- a/adapter-dynamodb/pom.xml +++ b/adapter-dynamodb/pom.xml @@ -20,7 +20,7 @@ io.nosqlbench mvn-defaults - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -39,7 +39,7 @@ io.nosqlbench adapters-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/adapter-http/pom.xml b/adapter-http/pom.xml index 847bb3835..5db53ca97 100644 --- a/adapter-http/pom.xml +++ b/adapter-http/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -38,7 +38,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT compile diff --git a/adapter-mongodb/pom.xml b/adapter-mongodb/pom.xml index fb4c143d1..7cb99c906 100644 --- a/adapter-mongodb/pom.xml +++ b/adapter-mongodb/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -36,7 +36,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/adapter-pulsar/pom.xml b/adapter-pulsar/pom.xml index 891fe9d9a..d59350f27 100644 --- a/adapter-pulsar/pom.xml +++ b/adapter-pulsar/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -41,13 +41,13 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapters-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/adapter-stdout/pom.xml b/adapter-stdout/pom.xml index 95e747c1c..c094c1509 100644 --- a/adapter-stdout/pom.xml +++ b/adapter-stdout/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -38,14 +38,14 @@ io.nosqlbench nb-annotations - 4.17.31 + 4.17.32-SNAPSHOT compile io.nosqlbench adapters-api - 4.17.31 + 4.17.32-SNAPSHOT compile diff --git a/adapter-tcp/pom.xml b/adapter-tcp/pom.xml index 5c1029def..d75a37401 100644 --- a/adapter-tcp/pom.xml +++ b/adapter-tcp/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -40,7 +40,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/adapters-api/pom.xml b/adapters-api/pom.xml index 39beee7a0..e17269322 100644 --- a/adapters-api/pom.xml +++ b/adapters-api/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -39,19 +39,19 @@ io.nosqlbench nb-spectest - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench nb-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/docsys/pom.xml b/docsys/pom.xml index aa8d7a3cc..ade6388b4 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -28,7 +28,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -37,7 +37,7 @@ io.nosqlbench nb-api - 4.17.31 + 4.17.32-SNAPSHOT @@ -133,7 +133,7 @@ io.nosqlbench virtdata-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index ef7547237..cc8b4087f 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -39,31 +39,31 @@ io.nosqlbench nb-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapters-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench nb-spectest - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench nb-annotations - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-userlibs - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index f9e2bf0e4..8936515c5 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-core - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench engine-docker - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-clients/pom.xml b/engine-clients/pom.xml index 6a3581c4e..7fad28143 100644 --- a/engine-clients/pom.xml +++ b/engine-clients/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 00e2b0077..e21236d2e 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -38,7 +38,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT @@ -89,7 +89,7 @@ io.nosqlbench engine-clients - 4.17.31 + 4.17.32-SNAPSHOT compile diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 88d25d2ae..977483fd3 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -56,7 +56,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 7310fc54d..8b7e603dd 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 376fc0f04..74120d0c3 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index 0591cdaee..a42221e15 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -35,7 +35,7 @@ io.nosqlbench engine-cli - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index d891e7c7f..11f90877d 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -19,7 +19,7 @@ io.nosqlbench mvn-defaults - 4.17.31 + 4.17.32-SNAPSHOT pom @@ -89,7 +89,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-4.17.31 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 0af134a6a..d2dc538f8 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 1472b30fe..07982e077 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -58,7 +58,7 @@ io.nosqlbench nb-annotations - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/nb-spectest/pom.xml b/nb-spectest/pom.xml index 3a6029bbc..55d9a88f6 100644 --- a/nb-spectest/pom.xml +++ b/nb-spectest/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults diff --git a/nb5/pom.xml b/nb5/pom.xml index 4fef97492..72f370c30 100644 --- a/nb5/pom.xml +++ b/nb5/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -40,7 +40,7 @@ io.nosqlbench nbr - 4.17.31 + 4.17.32-SNAPSHOT @@ -49,49 +49,49 @@ io.nosqlbench adapter-tcp - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-mongodb - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-stdout - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-diag - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-dynamodb - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-cqld4 - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-http - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-pulsar - 4.17.31 + 4.17.32-SNAPSHOT @@ -166,7 +166,7 @@ io.nosqlbench adapter-mongodb - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/nbr-examples/pom.xml b/nbr-examples/pom.xml index fea18e7b3..5613dc4ad 100644 --- a/nbr-examples/pom.xml +++ b/nbr-examples/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -39,13 +39,13 @@ io.nosqlbench nbr - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-diag - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/nbr/pom.xml b/nbr/pom.xml index 8e2be4939..cc59c9caa 100644 --- a/nbr/pom.xml +++ b/nbr/pom.xml @@ -21,7 +21,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -40,37 +40,37 @@ io.nosqlbench engine-rest - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench engine-cli - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench engine-docs - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench engine-core - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench engine-extensions - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench adapter-diag - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5276d67f4..7aab0a099 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT mvn-defaults @@ -188,7 +188,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-4.17.31 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 62cb79ef9..f3c2ac971 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 0fd7b2e89..f82be7747 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -23,7 +23,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index e1434146b..ca1882850 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 801106ac8..744a88b0d 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 3e1c0c61a..6e75f9ccb 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 361fabc0d..83995db65 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-lib-basics - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index dab911084..3741c45b6 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 4.17.31 + 4.17.32-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index ccc25bf19..b2d8e38ef 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -20,7 +20,7 @@ mvn-defaults io.nosqlbench - 4.17.31 + 4.17.32-SNAPSHOT ../mvn-defaults @@ -34,42 +34,42 @@ io.nosqlbench virtdata-realdata - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-lib-realer - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-api - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-lib-random - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-lib-basics - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench virtdata-lib-curves4 - 4.17.31 + 4.17.32-SNAPSHOT io.nosqlbench docsys - 4.17.31 + 4.17.32-SNAPSHOT compile From c102b213a8020f0bd32ab6f18a559a781aa504b5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 19:16:21 -0600 Subject: [PATCH 20/20] github actions release test --- RELEASENOTES.md | 203 ------------------------------------------------ 1 file changed, 203 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ff78ef769..e69de29bb 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,203 +0,0 @@ -- d0f25f5c6 (HEAD -> main, origin/main) Merge pull request #831 from nosqlbench/nosqlbench-830 -- 03a3afd86 Merge pull request #828 from nosqlbench/nosqlbench-824 -- 2b63b8e64 (origin/nosqlbench-830, nosqlbench-830) fix camel case across all affected method signatures -- 6fbbfb5d0 (origin/nosqlbench-824, nosqlbench-824) diagram updates -- a1fbb6dcc use average instead of median, add safety check for average==0 -- 15f15ebc9 nosqlbench-828 nosqlbench-824 -- 7737ffc0f nosqlbench-828 nosqlbench-824 -- d90731ec7 typo fix -- b33e93eae Merge pull request #827 from nosqlbench/snyk-upgrade-5c7e9a58ec726ce1a5540b1007997a68 -- 3677a60ec nosqlbench-830 limit spin-looping with cqld4 retryreplace option. -- 97cf9a32c add ad-hoc doc to show publishing flow -- dc7428395 nosqlbench-824 Add function to provide clustered values with monotonic stepping -- eaa8c5671 Merge pull request #826 from nosqlbench/snyk-upgrade-62cc0785172d699541ae5c0e9e487268 -- a1e7eb198 Merge pull request #825 from nosqlbench/snyk-upgrade-32a05328633bd6d7b922681265c560ee -- 14df638f7 Merge pull request #823 from nosqlbench/snyk-upgrade-d560c5ed862bae1f5c8558515d8e4571 -- cde915914 Merge pull request #818 from nosqlbench/snyk-upgrade-e5f0f6d488b383219dd2ca00632f1dde -- b13c899e8 Merge pull request #815 from nosqlbench/javadoc_improvements -- f8623f3b7 (origin/snyk-upgrade-5c7e9a58ec726ce1a5540b1007997a68) fix: upgrade io.swagger.core.v3:swagger-models from 2.2.4 to 2.2.6 -- 76f5507e4 (origin/snyk-upgrade-62cc0785172d699541ae5c0e9e487268) fix: upgrade org.apache.commons:commons-compress from 1.21 to 1.22 -- 150793cda (origin/snyk-upgrade-32a05328633bd6d7b922681265c560ee) fix: upgrade org.glassfish.jersey.media:jersey-media-json-jackson from 3.0.8 to 3.1.0 -- 82bfa4485 (origin/snyk-upgrade-d560c5ed862bae1f5c8558515d8e4571) fix: upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.340 to 1.12.341 -- 2ca4320c2 Merge pull request #819 from nosqlbench/snyk-upgrade-cab2f09370a21c3a871a0379d2ad3792 -- 569d35f2b Merge pull request #820 from nosqlbench/snyk-upgrade-a30d7c35198a17d29ecdca13feba6579 -- 5595f5083 Merge pull request #821 from nosqlbench/snyk-upgrade-f3ed4565eab47a4f529c1dfe1685b618 -- 8eb934c56 Merge pull request #822 from nosqlbench/snyk-upgrade-292f7f0db6ee968fd7ce222173de764c -- 141bfe088 fix: upgrade org.graalvm.js:js-scriptengine from 21.3.3.1 to 21.3.4 -- fd4673f15 fix: upgrade io.dropwizard.metrics:metrics-graphite from 4.2.10 to 4.2.12 -- 3030e58df fix: upgrade org.graalvm.tools:profiler from 20.3.6.1 to 20.3.8 -- 1e6367ecb fix: upgrade org.graalvm.js:js from 21.3.3.1 to 21.3.4 -- 52ef69373 (origin/snyk-upgrade-e5f0f6d488b383219dd2ca00632f1dde) fix: upgrade io.netty:netty-handler from 4.1.84.Final to 4.1.85.Final -- 726028059 (origin/javadoc_improvements, javadoc_improvements) update docs for op types -- b4b09048f update docs for op types -- 98493cfcb Merge pull request #812 from nosqlbench/snyk-upgrade-1754fe16038ae415d7733b7b3fdfb0ad -- 842427e4f Merge pull request #813 from nosqlbench/snyk-upgrade-ca34705c36a67d06ea66413eae078875 -- b06996319 Merge pull request #814 from nosqlbench/snyk-upgrade-a37d7e3729b4fe18258665c47ebd0cf4 -- b3e20c16e Merge pull request #809 from nosqlbench/nosqlbench-808 -- 6ad405d9f fix: upgrade org.glassfish.jersey.core:jersey-server from 3.0.8 to 3.1.0 -- db6594d41 Merge pull request #811 from nosqlbench/snyk-upgrade-8275b1467b7f05117180335fa4d5f944 -- b6cc8fcf0 Merge pull request #810 from nosqlbench/snyk-upgrade-342e4814a0e11c6d2f22b112ba735c12 -- d88359a6a fix: upgrade org.snakeyaml:snakeyaml-engine from 2.4 to 2.5 -- f413a5af7 fix: upgrade org.codehaus.groovy:groovy from 3.0.12 to 3.0.13 -- 34b51b198 fix: upgrade com.datastax.oss:java-driver-query-builder from 4.14.1 to 4.15.0 -- c89339839 fix: upgrade joda-time:joda-time from 2.11.2 to 2.12.1 -- 9bca349e4 (origin/nosqlbench-808, nosqlbench-808) use correct value in exception handlers -- bf518c375 Merge pull request #804 from nosqlbench/snyk-upgrade-4a7ee2762e595acb421d164dc872273b -- b16de9edb Merge pull request #806 from nosqlbench/snyk-fix-d203bc55bd9076b01b05bf8a45a65046 -- 7c8727e15 Merge pull request #805 from nosqlbench/snyk-upgrade-18902492bf09462887646247db53d19b -- 017fcf8ff Merge pull request #803 from nosqlbench/snyk-upgrade-12d61683e1022753a4e624d6d62d5a19 -- 1f96e625d Merge pull request #802 from nosqlbench/snyk-upgrade-cf1da0c80b868193683f0a03748b3835 -- ce353d899 Merge pull request #801 from nosqlbench/snyk-upgrade-399641fb454b01fc3feead152acf52d5 -- 74ae911e5 Merge pull request #800 from nosqlbench/dependabot/maven/driver-cockroachdb/org.postgresql-postgresql-42.5.1 -- 82c253acb (origin/snyk-fix-d203bc55bd9076b01b05bf8a45a65046) fix: driver-cockroachdb/pom.xml to reduce vulnerabilities -- fec156a25 (origin/snyk-upgrade-18902492bf09462887646247db53d19b) fix: upgrade io.netty:netty-handler from 4.1.82.Final to 4.1.84.Final -- d622670f7 (origin/snyk-upgrade-4a7ee2762e595acb421d164dc872273b) fix: upgrade org.graalvm.sdk:graal-sdk from 21.3.3.1 to 21.3.4 -- ec858f69d (origin/snyk-upgrade-12d61683e1022753a4e624d6d62d5a19) fix: upgrade info.picocli:picocli from 4.6.3 to 4.7.0 -- 96be7811a (origin/snyk-upgrade-cf1da0c80b868193683f0a03748b3835) fix: upgrade com.google.code.gson:gson from 2.9.1 to 2.10 -- 64f11bed1 (origin/snyk-upgrade-399641fb454b01fc3feead152acf52d5) fix: upgrade com.github.oshi:oshi-core-java11 from 6.2.2 to 6.3.1 -- 702692058 (origin/dependabot/maven/driver-cockroachdb/org.postgresql-postgresql-42.5.1) build(deps): bump postgresql in /driver-cockroachdb -- f39ba9331 fix: upgrade io.swagger.core.v3:swagger-models from 2.2.3 to 2.2.4 (#799) -- 9afe376b4 fix: upgrade io.swagger.parser.v3:swagger-parser from 2.1.4 to 2.1.7 (#798) -- 79a2d0977 fix: upgrade org.apache.pulsar:pulsar-client from 2.10.1 to 2.10.2 (#796) -- 523f500cc Merge pull request #773 from nosqlbench/snyk-fix-8aa6ab863bb5432def89d1b31da171c7 -- 26ee71883 Merge pull request #772 from nosqlbench/snyk-fix-ab49d52aab0b82f5b5b84c1e7389d4b1 -- 8b87b10ca Merge branch 'main' into snyk-fix-ab49d52aab0b82f5b5b84c1e7389d4b1 -- 00e0596fd Merge pull request #771 from nosqlbench/snyk-fix-ac633ddba1da2c7ec65dff2ae08fa725 -- 1e0ac38b4 Merge branch 'main' into snyk-fix-ac633ddba1da2c7ec65dff2ae08fa725 -- f9adeff1d Merge pull request #774 from nosqlbench/snyk-fix-b2c236df12318590f34b590edea9705e -- 5ffda7d1e Merge branch 'main' into snyk-fix-b2c236df12318590f34b590edea9705e -- e5f03b91a Merge pull request #775 from nosqlbench/snyk-fix-8c31cd4a0b1166676ed0fe1e7cf9a216 -- c7e5e7291 Merge branch 'main' into snyk-fix-8c31cd4a0b1166676ed0fe1e7cf9a216 -- 3ceddb631 Merge pull request #776 from nosqlbench/snyk-fix-6ba0467ba1a5842fab939a7c4f8b6a14 -- e39954ccc Merge branch 'main' into snyk-fix-6ba0467ba1a5842fab939a7c4f8b6a14 -- 56470956b Merge pull request #778 from nosqlbench/snyk-fix-62d2529ba6efa1321216d8e295c48e5d -- 59b430b12 Merge branch 'main' into snyk-fix-62d2529ba6efa1321216d8e295c48e5d -- 4c764250d Merge pull request #794 from nosqlbench/snyk-fix-2ac9869bf1d47aa3f30a82f3655c5432 -- 7491370ba Merge branch 'main' into snyk-fix-2ac9869bf1d47aa3f30a82f3655c5432 -- 47db96c06 Merge pull request #795 from nosqlbench/snyk-fix-3f81768022b768b87ace72058200f7ac -- fa528eebe Merge pull request #779 from nosqlbench/shutdown_hooks -- 875e2d8f9 (origin/shutdown_hooks, shutdown_hooks) temporarily disable test for close exception handler -- 901034875 fix for second noisy shutdown test -- 2db6c6cf6 Update codeql-analysis.yml -- 18ba2fdaf Merge branch 'main' into shutdown_hooks -- 8602d5b53 Merge pull request #793 from yabinmeng/main -- 3b616d7d2 (origin/snyk-fix-3f81768022b768b87ace72058200f7ac) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- eaefd9a1b Merge pull request #781 from nosqlbench/780-sporadic-buildtest-failures-gh-actions -- 69617042b (origin/780-sporadic-buildtest-failures-gh-actions, 780-sporadic-buildtest-failures-gh-actions) minor fixes on PR -- 28f561aed direct work-around for flaky test, simple improvements to logging, some improvements to consistent view of status, misc cleanups -- 0193ed355 (origin/snyk-fix-2ac9869bf1d47aa3f30a82f3655c5432) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- c077218e8 Fix example yaml file producer and consumer parameter names -- 16417f37b additional diagnostics for spurious test -- f7c9e50f3 Add README file and adjust sample yaml files -- eb0013f16 logging updates for build sanity checking -- bc4773269 build workflow should upload logfiles for success() or failure() of previous jobs, but not when canceled -- 40c968234 Merge branch '780-sporadic-buildtest-failures-gh-actions' of github.com:nosqlbench/nosqlbench into 780-sporadic-buildtest-failures-gh-actions -- dcf7baf86 Dead code utest resurrection and timing w/ gh actions Cyclerate=10 to test github actions part2 Debug and exception handling Detailed error handler logging System out diagnostics Capture step included Try-catch diagnostics. sysout cleanup; general cleanup -- 20ed4950d removing broken actions plugin on main -- 2831d8c3f Merge branch 'main' of github.com:nosqlbench/nosqlbench -- 3e8153dd8 Merge pull request #792 from yabinmeng/main -- b8684107b memoize retries in hot code path -- ebb6f2c58 include space usage in diag for testing -- 48192cbde close native driver connections on on activity+space shutdown -- 4471d90cc implement closeable spaces via decorator interface -- bd8aff908 Added support for 1) subscription initial position and 2) regex subscription mode -- 35eec4d81 Dead code utest resurrection and timing w/ gh actions Cyclerate=10 to test github actions part2 Debug and exception handling Detailed error handler logging System out diagnostics Capture step included Try-catch diagnostics. sysout cleanup; general cleanup -- e80e9926c Merge pull request #791 from yabinmeng/main -- 0de710288 Add support for 1) producer message compression 2) consumer DLT/negAck/ackTimeout policy -- 12f8697e0 Complete the first draft of NB5 Pulsar adapter code, except the per-thread rate limiter. -- e128d2867 Merge branch 'nosqlbench:main' into main -- 0c71696b1 Completed NB4 Pulsar driver code migration to NB5. But there are still a few lingering issues due to the difference of how NB4 vs NB5 driver/adapter interacts with the NB engine. -- 33e330dc3 [Snyk] Security upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.325 to 1.12.330 (#768) -- 2158dfa33 fix: upgrade io.netty:netty-handler from 4.1.81.Final to 4.1.82.Final (#767) -- 5fc22bbaa fix: upgrade com.google.code.gson:gson from 2.9.0 to 2.9.1 (#766) -- 6999a675f [Snyk] Upgrade io.dropwizard.metrics:metrics-core from 4.2.10 to 4.2.12 (#765) -- ca6f2b052 Add PulsarAdapter specific metrics -- 8b76d1fcf add shutdown hooks for adapters and spaces -- 8c3d744a0 Merge pull request #764 from nosqlbench/snyk-upgrade-6693c12bca4fafc634662d8962afcb9a -- eb1de8f1d Timing changes for github actions to properly perform build/test step. -- a05c511de fix: upgrade org.eclipse.jetty:jetty-server from 11.0.11 to 11.0.12 (#763) -- c309d200a - Delete unsed code "driver-jms" - NB5 Pulsar driver Admin functionality in place - create/delete tenant, namespace, and topic -- 2b9452fde Buildfixes, trying to unblock current builds (#777) -- fe268d7f8 (origin/snyk-fix-62d2529ba6efa1321216d8e295c48e5d) fix: nb-api/pom.xml to reduce vulnerabilities -- d47462929 (origin/buildfixes, buildfixes) remove blocking issues github actions plugin, since it is broken -- 4dc830aa1 improve wording around op template resolution -- b2f74d329 make example/test script more robust for meager github actions environment -- cbb01fb7f (origin/snyk-fix-6ba0467ba1a5842fab939a7c4f8b6a14) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- e50098800 (origin/snyk-fix-8c31cd4a0b1166676ed0fe1e7cf9a216) fix: nb-api/pom.xml to reduce vulnerabilities -- 422849209 (origin/snyk-fix-b2c236df12318590f34b590edea9705e) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- c5b632518 (origin/snyk-fix-8aa6ab863bb5432def89d1b31da171c7) fix: docsys/pom.xml to reduce vulnerabilities -- f8af301fb (origin/snyk-fix-ab49d52aab0b82f5b5b84c1e7389d4b1) fix: nb-api/pom.xml to reduce vulnerabilities -- a5974919a (origin/snyk-fix-ac633ddba1da2c7ec65dff2ae08fa725) fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- 7c1fb1963 Merge pull request #770 from nosqlbench/ms-mongodb-keyvalue-schema-fix -- 98c7b1a97 Merge pull request #769 from nosqlbench/base64 -- 45ee75fef bump min_version -- 8f32c9496 Updated MongoDB key-value collection to have a 'value' field -- 9a92129a8 (origin/base64) base64 -- bb27a6f7f (origin/snyk-upgrade-6693c12bca4fafc634662d8962afcb9a) fix: upgrade io.swagger.core.v3:swagger-models from 2.2.2 to 2.2.3 -- 0e3893190 (origin/jeffb/nb736) Merge pull request #757 from nosqlbench/snyk-upgrade-de963ecc07996edad35bfd93b9db28c2 -- 92e41e7f7 Merge pull request #758 from nosqlbench/snyk-upgrade-38e72059fc3a8a2099fed05a4e8be9b0 -- 64093b2ab Merge pull request #759 from nosqlbench/snyk-upgrade-5f4f139c9c2fc23d4a2117f5bda8f31e -- 6d25c03ff Merge pull request #760 from nosqlbench/snyk-upgrade-c29375a9a40341a121dfc342ee787201 -- a92897b1d Merge pull request #761 from nosqlbench/snyk-upgrade-c51251ba7d6c428fd60b9aa362f5d4b4 -- 927f4e2c6 fix: upgrade org.eclipse.jetty:jetty-servlets from 11.0.11 to 11.0.12 -- f64a25280 fix: upgrade org.eclipse.jetty:jetty-servlet from 11.0.11 to 11.0.12 -- 74db1d97e fix: upgrade org.eclipse.jetty:jetty-rewrite from 11.0.11 to 11.0.12 -- 02257d41b fix: upgrade org.yaml:snakeyaml from 1.32 to 1.33 -- ed1365773 fix: upgrade joda-time:joda-time from 2.11.1 to 2.11.2 -- dae02bb60 Merge pull request #746 from nosqlbench/snyk-fix-c33fb16683078e999e1d6cab62020656 -- 90bf9dd47 Merge pull request #748 from nosqlbench/snyk-fix-4981c736a854543f414acc756aa6773d -- 2cbb844db Merge pull request #756 from nosqlbench/dependabot/maven/mvn-defaults/org.apache.commons-commons-text-1.10.0 -- 702187794 Merge pull request #744 from nosqlbench/snyk-fix-26f3021e2a4eb5d42b86ca025e907044 -- def46982f Merge branch 'main' into snyk-fix-26f3021e2a4eb5d42b86ca025e907044 -- 2292c6a21 Merge branch 'main' into snyk-fix-4981c736a854543f414acc756aa6773d -- 0021e1cf5 Merge pull request #740 from nosqlbench/snyk-upgrade-e3eae2348ed5c3a9c5a4df3da5434294 -- 2874bdd6a Merge branch 'main' into snyk-fix-c33fb16683078e999e1d6cab62020656 -- 5fb062c1a Merge pull request #749 from nosqlbench/snyk-fix-01ab345df3b2b9725654404c28451b69 -- f684760ee Merge branch 'main' into snyk-fix-01ab345df3b2b9725654404c28451b69 -- 25fe0a541 Merge pull request #739 from nosqlbench/snyk-upgrade-61e7fcecc7f6c453bf8ee04e1799fe04 -- 0cb654259 Merge pull request #738 from nosqlbench/snyk-upgrade-de204ed7275df7f0d05e2783982c6ac7 -- 6bcc1cfd2 build(deps): bump commons-text from 1.9 to 1.10.0 in /mvn-defaults -- 974b29f11 Merge pull request #742 from nosqlbench/snyk-upgrade-dc69205a67c70990049a72696a0c367b -- 88987fb04 Merge pull request #743 from nosqlbench/snyk-upgrade-ac680967c12a71fb0828a5fb85bd8259 -- 879a8778f Merge pull request #745 from nosqlbench/snyk-fix-6accd862435675058d9b3c98aefe4f4a -- af6380f70 Merge pull request #747 from nosqlbench/snyk-fix-fc4ff10e48c0a29879ed09f2c567dd08 -- 47489b075 Merge pull request #750 from nosqlbench/snyk-fix-30fed3e9e7bf54aa1715f6cb0cd3bd93 -- bc1039a11 Merge pull request #751 from nosqlbench/snyk-fix-eeda5403343ff40d314d648afcfdf408 -- 256d7b721 Merge pull request #752 from nosqlbench/snyk-fix-b9ee34aa87226cd6400a08d1f6f78f84 -- eb3e57041 Merge pull request #754 from nosqlbench/snyk-fix-5ff726edd68fbb5f2553166c8f1878d6 -- b478a3766 Merge pull request #755 from nosqlbench/snyk-fix-fec660b2a5471e3538d424b7a8a66438 -- f875f2c7f fix: nb-api/pom.xml to reduce vulnerabilities -- e90580de2 Merge pull request #753 from nosqlbench/ms-trivial-mongodb-workload-fix -- c35ec732e fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- 60bd26104 Minor update to timeseries clustering index name -- 3496f965c fix: mvn-defaults/pom.xml to reduce vulnerabilities -- e3187bc1e fix: mvn-defaults/pom.xml to reduce vulnerabilities -- 75aa1e45c fix: mvn-defaults/pom.xml to reduce vulnerabilities -- ad369143d fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- 9b279895e fix: nb-api/pom.xml to reduce vulnerabilities -- 49309872c fix: engine-rest/pom.xml to reduce vulnerabilities -- 35d57fca5 fix: nb-api/pom.xml & mvn-defaults/pom.xml to reduce vulnerabilities -- 5cb5bd5b0 fix: mvn-defaults/pom.xml to reduce vulnerabilities -- 8a3720792 fix: adapter-dynamodb/pom.xml to reduce vulnerabilities -- 7e5bd8f7f fix: upgrade com.datastax.oss:java-driver-core from 4.14.1 to 4.15.0 -- cb3191a1a fix: upgrade com.datastax.oss:pulsar-jms from 2.4.9 to 2.4.11 -- 706880c01 fix: upgrade org.apache.logging.log4j:log4j-core from 2.18.0 to 2.19.0 -- dc4c92eca fix: upgrade org.apache.logging.log4j:log4j-api from 2.18.0 to 2.19.0 -- e7a92d68d fix: upgrade org.apache.logging.log4j:log4j-jcl from 2.18.0 to 2.19.0 -- 87c3904f9 Merge pull request #730 from nosqlbench/snyk-upgrade-497803c521a3e4b5bf1f8320886e4693 -- c769c59af Merge pull request #731 from nosqlbench/snyk-upgrade-4de9e27b335c4ba704d719c6b8208fc9 -- ee4243af7 Merge pull request #732 from nosqlbench/snyk-upgrade-b07f4c6dc36ef0b84aac016e42bc0ac0 -- 59a0b3fbf Merge pull request #733 from nosqlbench/snyk-upgrade-9d3ff80bbe2914cac41eefa7bf016fc4 -- a67e9604b Merge pull request #734 from nosqlbench/snyk-upgrade-6f292d686b89f8516e45eb37ec3e77bb -- 1929bc87c Merge pull request #735 from nosqlbench/snyk-fix-d6c9e33a2e55402294f57e1ce7c62a6e -- ab7487e98 Merge pull request #737 from jeffbanks/jeffb/count-warn-nb561 -- 9bc3a2fd1 Notify user when using error=count vs. counter. -- b1d5411af Updated min_version to be 4.17.30 -- 5abef6db3 Updated min_version to be 4.17.30 -- 84b3b5e25 Updated min_version to be 4.17.30 -- a60c41256 (origin/snyk-fix-d6c9e33a2e55402294f57e1ce7c62a6e) fix: docsys/pom.xml to reduce vulnerabilities -- 35d5c0cee (origin/snyk-upgrade-6f292d686b89f8516e45eb37ec3e77bb) fix: upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.269 to 1.12.300 -- 9d3310413 (origin/snyk-upgrade-9d3ff80bbe2914cac41eefa7bf016fc4) fix: upgrade org.antlr:antlr4-runtime from 4.10.1 to 4.11.1 -- c41b5990d (origin/snyk-upgrade-b07f4c6dc36ef0b84aac016e42bc0ac0) fix: upgrade com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider from 2.13.3 to 2.13.4 -- e0fb11da4 (origin/snyk-upgrade-4de9e27b335c4ba704d719c6b8208fc9) fix: upgrade io.netty:netty-handler from 4.1.80.Final to 4.1.81.Final -- c6b327161 (origin/snyk-upgrade-497803c521a3e4b5bf1f8320886e4693) fix: upgrade com.amazonaws:aws-java-sdk-dynamodb from 1.12.262 to 1.12.299