From 93644b76fccdc8cd9f9a055cc33e385c59efac9b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 18 May 2020 10:19:20 -0500 Subject: [PATCH 01/70] partial progress on cql-d4 --- .../datastax/driver/core/M3PTokenFilter.java | 45 +- .../driver/core/TokenRangeStmtFilter.java | 42 +- .../datastax/driver/core/TokenRangeUtil.java | 71 --- .../cqld4/api/StatementFilter.java | 2 +- .../activitytype/cqld4/core/CQLOptions.java | 420 +++++++++--------- .../activitytype/cqld4/core/CqlAction.java | 17 +- .../activitytype/cqld4/core/CqlActivity.java | 5 +- .../activitytype/cqld4/core/CqlOpData.java | 2 - .../exceptions/UnexpectedPagingException.java | 4 +- .../statements/core/CQLSessionCache.java | 86 ++-- .../core/NBCqlDriverConfigLoader.java | 18 + driver-cqld4/src/main/resources/cqld4.md | 88 ++-- 12 files changed, 371 insertions(+), 429 deletions(-) delete mode 100644 driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeUtil.java create mode 100644 driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java diff --git a/driver-cqld4/src/main/java/com/datastax/driver/core/M3PTokenFilter.java b/driver-cqld4/src/main/java/com/datastax/driver/core/M3PTokenFilter.java index fd942c546..663d898cc 100644 --- a/driver-cqld4/src/main/java/com/datastax/driver/core/M3PTokenFilter.java +++ b/driver-cqld4/src/main/java/com/datastax/driver/core/M3PTokenFilter.java @@ -1,5 +1,16 @@ package com.datastax.driver.core; +import com.datastax.oss.driver.api.core.ProtocolVersion; +import com.datastax.oss.driver.api.core.cql.Statement; +import com.datastax.oss.driver.api.core.metadata.Metadata; +import com.datastax.oss.driver.api.core.metadata.TokenMap; +import com.datastax.oss.driver.api.core.metadata.token.Token; +import com.datastax.oss.driver.api.core.metadata.token.TokenRange; +import com.datastax.oss.driver.api.core.session.Session; +import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; +import com.datastax.oss.driver.internal.core.metadata.token.Murmur3Token; +import org.jetbrains.annotations.NotNull; + import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -7,40 +18,32 @@ import java.util.OptionalLong; import java.util.Set; public class M3PTokenFilter { - private final TokenRange[] ranges; - private final ProtocolVersion protocolVersion; - private final CodecRegistry codecRegistry; - private final Metadata clusterMetadata; - private final Token.Factory factory; - public M3PTokenFilter(Set ranges, Cluster cluster) { - protocolVersion = cluster.getConfiguration().getProtocolOptions().getProtocolVersion(); - codecRegistry = cluster.getConfiguration().getCodecRegistry(); - clusterMetadata = cluster.getMetadata(); - factory = Token.getFactory(clusterMetadata.partitioner); - List rangeList = new ArrayList<>(); + private final TokenRange[] ranges; + + public M3PTokenFilter(Set ranges, Session session) { + TokenMap tokenMap = session.getMetadata().getTokenMap().orElseThrow(); + + List rangelist = new ArrayList<>(); + for (TokenRange range : ranges) { - if (!range.getStart().getType().equals(DataType.bigint())) { - throw new RuntimeException("This filter only works with bigint valued token types"); - } - rangeList.add(range); + rangelist.add(range); } - this.ranges=rangeList.toArray(new TokenRange[0]); + this.ranges = rangelist.toArray(new TokenRange[0]); if (this.ranges.length<1) { throw new RuntimeException("There were no tokens found. Please check your keyspace and cluster settings."); } } - public OptionalLong matches(Statement statement) { - ByteBuffer routingKey = statement.getRoutingKey(protocolVersion, codecRegistry); - Token token = factory.hash(routingKey); + public boolean matches(Statement statement) { + Token token = statement.getRoutingToken(); for (TokenRange range : ranges) { if (range.contains(token)) { - return OptionalLong.of((long)token.getValue()); + return true; } } - return OptionalLong.empty(); + return false; } diff --git a/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java b/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java index 9b1a0b234..ad7d46689 100644 --- a/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java +++ b/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java @@ -1,5 +1,15 @@ package com.datastax.driver.core; +import com.datastax.oss.driver.api.core.ProtocolVersion; +import com.datastax.oss.driver.api.core.cql.Statement; +import com.datastax.oss.driver.api.core.metadata.Metadata; +import com.datastax.oss.driver.api.core.metadata.token.Token; +import com.datastax.oss.driver.api.core.metadata.token.TokenRange; +import com.datastax.oss.driver.api.core.session.Session; +import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; +import com.datastax.oss.driver.internal.core.metadata.token.Murmur3Token; +import com.datastax.oss.driver.internal.core.metadata.token.Murmur3TokenFactory; +import com.datastax.oss.driver.internal.core.metadata.token.Murmur3TokenRange; import io.nosqlbench.activitytype.cqld4.api.StatementFilter; import java.nio.ByteBuffer; @@ -13,41 +23,41 @@ public class TokenRangeStmtFilter implements StatementFilter { private final Metadata clusterMetadata; private final ProtocolVersion protocolVersion; private final CodecRegistry codecRegistry; - private final Token.Factory factory; +// private final Token.Factory factory; private TokenRange[] ranges; - public TokenRangeStmtFilter(Cluster cluster, String rangesSpec) { - clusterMetadata = cluster.getMetadata(); - protocolVersion = cluster.getConfiguration().getProtocolOptions().getProtocolVersion(); - codecRegistry = cluster.getConfiguration().getCodecRegistry(); - factory = Token.getFactory(clusterMetadata.partitioner); - ranges = parseRanges(factory, rangesSpec); + public TokenRangeStmtFilter(Session session, String rangesSpec) { + clusterMetadata = session.getMetadata(); + protocolVersion = session.getContext().getProtocolVersion(); + codecRegistry = session.getContext().getCodecRegistry(); + ranges = parseRanges(session, rangesSpec); } - private TokenRange[] parseRanges(Token.Factory factory, String rangesStr) { + private TokenRange[] parseRanges(Session session, String rangesStr) { String[] ranges = rangesStr.split(","); List tr = new ArrayList<>(); for (String range : ranges) { String[] interval = range.split(":"); - Token start = factory.fromString(interval[0]); - Token end = factory.fromString(interval[1]); - TokenRange tokenRange = new TokenRange(start, end, factory); + Murmur3TokenFactory m3f = new Murmur3TokenFactory(); + Token start = m3f.parse(interval[0]); + Token end = m3f.parse(interval[1]); + TokenRange tokenRange = m3f.range(start,end); tr.add(tokenRange); } - return tr.toArray(new TokenRange[tr.size()]); + return tr.toArray(new TokenRange[0]); } @Override - public boolean matches(Statement statement) { - ByteBuffer routingKey = statement.getRoutingKey(protocolVersion, codecRegistry); - Token token = factory.hash(routingKey); + public boolean matches(Statement statement) { + Token routingToken = statement.getRoutingToken(); for (TokenRange range : ranges) { - if (range.contains(token)) { + if (range.contains(routingToken)) { return true; } } return false; + } @Override diff --git a/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeUtil.java b/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeUtil.java deleted file mode 100644 index 3f4f23e0e..000000000 --- a/driver-cqld4/src/main/java/com/datastax/driver/core/TokenRangeUtil.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.datastax.driver.core; - -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Comparator; -import java.util.Set; - -public class TokenRangeUtil { - - private final Metadata clusterMetadata; - private final ProtocolVersion protocolVersion; - private final CodecRegistry codecRegistry; - private final Token.Factory factory; - private final Cluster cluster; - - public TokenRangeUtil(Cluster cluster) { - this.cluster= cluster; - clusterMetadata = cluster.getMetadata(); - protocolVersion = cluster.getConfiguration().getProtocolOptions().getProtocolVersion(); - codecRegistry = cluster.getConfiguration().getCodecRegistry(); - factory = Token.getFactory(clusterMetadata.partitioner); - } - - public Set getTokenRangesFor(String keyspace, String hostaddress) { - Host host=null; - if (hostaddress.matches("\\d+")) { - int hostenum = Integer.parseInt(hostaddress); - host = clusterMetadata.getAllHosts().stream() - .sorted(Comparator.comparing(h -> h.getAddress().toString())) - .skip(hostenum) - .findFirst() - .orElseThrow(); - } else if (!hostaddress.isEmpty()) { - host = clusterMetadata.getAllHosts().stream() - .filter(h -> h.getAddress().toString().replaceAll("/","").equals(hostaddress)) - .findFirst() - .orElseThrow(); - } else { - throw new RuntimeException("You must specify a host enum in order or a host address."); - } - return clusterMetadata.getTokenRanges(keyspace,host); - } - - - public void printRanges(String tokensks) { - Set hosts = clusterMetadata.getAllHosts(); - - for (Host host : hosts) { - String address = host.getAddress().toString().substring(1); - BufferedWriter writer = null; - try { - writer = new BufferedWriter(new FileWriter("ranges-"+address)); - String ranges = getTokenRangesFor(tokensks, address).toString(); - writer.write(ranges); - - writer.close(); - } catch (IOException e) { - e.printStackTrace(); - throw new RuntimeException("Can't write token range files"); - } - } - - } - - - public M3PTokenFilter getFilterFor(Set ranges) { - return new M3PTokenFilter(ranges, this.cluster); - } - -} diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/api/StatementFilter.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/api/StatementFilter.java index 85e7b70cf..6beacd73c 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/api/StatementFilter.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/api/StatementFilter.java @@ -3,5 +3,5 @@ package io.nosqlbench.activitytype.cqld4.api; import com.datastax.oss.driver.api.core.cql.Statement; public interface StatementFilter { - boolean matches(Statement statement); + boolean matches(Statement statement); } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java index e94f6a61a..9143026a8 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLOptions.java @@ -1,226 +1,202 @@ package io.nosqlbench.activitytype.cqld4.core; -import com.datastax.oss.driver.api.core.connection.ReconnectionPolicy; -import com.datastax.oss.driver.api.core.context.DriverContext; -import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; -import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import com.datastax.oss.driver.api.core.session.Session; -import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; -import com.datastax.oss.driver.internal.core.connection.ConstantReconnectionPolicy; -import com.datastax.oss.driver.internal.core.connection.ExponentialReconnectionPolicy; -import com.datastax.oss.driver.internal.core.context.NettyOptions; -import com.datastax.oss.driver.internal.core.retry.DefaultRetryPolicy; -import com.datastax.oss.driver.internal.core.specex.ConstantSpeculativeExecutionPolicy; -import io.netty.util.HashedWheelTimer; -import io.nosqlbench.nb.api.errors.BasicError; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.net.InetSocketAddress; -import java.util.*; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - public class CQLOptions { - private final static Logger logger = LoggerFactory.getLogger(CQLOptions.class); - - private final static Pattern CORE_AND_MAX_RQ_PATTERN = Pattern.compile("(?\\d+)(:(?\\d+)(:(?\\d+))?)?(,(?\\d+)(:(?\\d+)(:(?\\d+))?)?)?(,?heartbeat_interval_s:(?\\d+))?(,?idle_timeout_s:(?\\d+))?(,?pool_timeout_ms:(?\\d+))?"); - private final static Pattern PERCENTILE_EAGER_PATTERN = Pattern.compile("^p(?[^:]+)(:(?\\d+))?(:(?\\d+)ms)?$"); - private final static Pattern CONSTANT_EAGER_PATTERN = Pattern.compile("^((?\\d++)ms)(:(?\\d+))?$"); - - private static ConstantSpeculativeExecutionPolicy constantPolicy(DriverContext context, int threshold, int executions) { - return new ConstantSpeculativeExecutionPolicy(threshold, executions); - } - - private static SpeculativeExecutionPolicy percentilePolicy(long tracked, double threshold, int executions) { - PerHostPercentileTracker tracker = newTracker(tracked); - return new PercentileSpeculativeExecutionPolicy(tracker, threshold, executions); - } - - private static PerHostPercentileTracker newTracker(long millis) { - return PerHostPercentileTracker.builder(millis).build(); - } - - public static PoolingOptions poolingOptionsFor(String spec) { - Matcher matcher = CORE_AND_MAX_RQ_PATTERN.matcher(spec); - if (matcher.matches()) { - PoolingOptions poolingOptions = new PoolingOptions(); - - Optional.ofNullable(matcher.group("core")).map(Integer::valueOf) - .ifPresent(core -> poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, core)); - Optional.ofNullable(matcher.group("max")).map(Integer::valueOf) - .ifPresent(max -> poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, max)); - Optional.ofNullable(matcher.group("rq")).map(Integer::valueOf) - .ifPresent(rq -> poolingOptions.setMaxRequestsPerConnection(HostDistance.LOCAL, rq)); - - Optional.ofNullable(matcher.group("rcore")).map(Integer::valueOf) - .ifPresent(rcore -> poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, rcore)); - Optional.ofNullable(matcher.group("rmax")).map(Integer::valueOf) - .ifPresent(rmax -> poolingOptions.setMaxConnectionsPerHost(HostDistance.REMOTE, rmax)); - Optional.ofNullable(matcher.group("rrq")).map(Integer::valueOf) - .ifPresent(rrq -> poolingOptions.setMaxRequestsPerConnection(HostDistance.REMOTE, rrq)); - - Optional.ofNullable(matcher.group("heartbeatinterval")).map(Integer::valueOf) - .ifPresent(poolingOptions::setHeartbeatIntervalSeconds); - - Optional.ofNullable(matcher.group("idletimeout")).map(Integer::valueOf) - .ifPresent(poolingOptions::setIdleTimeoutSeconds); - - Optional.ofNullable(matcher.group("pooltimeout")).map(Integer::valueOf) - .ifPresent(poolingOptions::setPoolTimeoutMillis); - - return poolingOptions; - } - throw new RuntimeException("No pooling options could be parsed from spec: " + spec); - - } - - public static RetryPolicy retryPolicyFor(String spec, Session session) { - Set retryBehaviors = Arrays.stream(spec.split(",")).map(String::toLowerCase).collect(Collectors.toSet()); - RetryPolicy retryPolicy = new DefaultRetryPolicy(session.getContext(),"default"); - - if (retryBehaviors.contains("default")) { - return retryPolicy; - } // add other mutually-exclusive behaviors here with checks, if we want to extend beyond "default" - - if (retryBehaviors.contains("logging")) { - retryPolicy = new LoggingRetryPolicy(retryPolicy); - } - - return retryPolicy; - } - - public static ReconnectionPolicy reconnectPolicyFor(String spec, Session session) { - if(spec.startsWith("exponential(")){ - String argsString = spec.substring(12); - String[] args = argsString.substring(0, argsString.length() - 1).split("[,;]"); - if (args.length != 2){ - throw new BasicError("Invalid reconnectionpolicy, try reconnectionpolicy=exponential(, )"); - } - long baseDelay = Long.parseLong(args[0]); - long maxDelay = Long.parseLong(args[1]); - ExponentialReconnectionPolicy exponentialReconnectionPolicy = new ExponentialReconnectionPolicy(session.getContext()); - }else if(spec.startsWith("constant(")){ - String argsString = spec.substring(9); - long constantDelayMs= Long.parseLong(argsString.substring(0, argsString.length() - 1)); - return new ConstantReconnectionPolicy(constantDelayMs); - } - throw new BasicError("Invalid reconnectionpolicy, try reconnectionpolicy=exponential(, ) or constant()"); - } - - public static SocketOptions socketOptionsFor(String spec) { - String[] assignments = spec.split("[,;]"); - Map values = new HashMap<>(); - for (String assignment : assignments) { - String[] namevalue = assignment.split("[:=]", 2); - String name = namevalue[0]; - String value = namevalue[1]; - values.put(name, value); - } - - SocketOptions options = new SocketOptions(); - Optional.ofNullable(values.get("read_timeout_ms")).map(Integer::parseInt).ifPresent( - options::setReadTimeoutMillis - ); - Optional.ofNullable(values.get("connect_timeout_ms")).map(Integer::parseInt).ifPresent( - options::setConnectTimeoutMillis - ); - Optional.ofNullable(values.get("keep_alive")).map(Boolean::parseBoolean).ifPresent( - options::setKeepAlive - ); - Optional.ofNullable(values.get("reuse_address")).map(Boolean::parseBoolean).ifPresent( - options::setReuseAddress - ); - Optional.ofNullable(values.get("so_linger")).map(Integer::parseInt).ifPresent( - options::setSoLinger - ); - Optional.ofNullable(values.get("tcp_no_delay")).map(Boolean::parseBoolean).ifPresent( - options::setTcpNoDelay - ); - Optional.ofNullable(values.get("receive_buffer_size")).map(Integer::parseInt).ifPresent( - options::setReceiveBufferSize - ); - Optional.ofNullable(values.get("send_buffer_size")).map(Integer::parseInt).ifPresent( - options::setSendBufferSize - ); - - return options; - } - - public static SpeculativeExecutionPolicy defaultSpeculativePolicy() { - PerHostPercentileTracker tracker = PerHostPercentileTracker - .builder(15000) - .build(); - PercentileSpeculativeExecutionPolicy defaultSpecPolicy = - new PercentileSpeculativeExecutionPolicy(tracker, 99.0, 5); - return defaultSpecPolicy; - } - - public static SpeculativeExecutionPolicy speculativeFor(String spec) { - Matcher pctileMatcher = PERCENTILE_EAGER_PATTERN.matcher(spec); - Matcher constantMatcher = CONSTANT_EAGER_PATTERN.matcher(spec); - if (pctileMatcher.matches()) { - double pctile = Double.valueOf(pctileMatcher.group("pctile")); - if (pctile > 100.0 || pctile < 0.0) { - throw new RuntimeException("pctile must be between 0.0 and 100.0"); - } - String executionsSpec = pctileMatcher.group("executions"); - String trackedSpec = pctileMatcher.group("tracked"); - int executions = (executionsSpec != null && !executionsSpec.isEmpty()) ? Integer.valueOf(executionsSpec) : 5; - int tracked = (trackedSpec != null && !trackedSpec.isEmpty()) ? Integer.valueOf(trackedSpec) : 15000; - logger.debug("speculative: Creating new percentile tracker policy from spec '" + spec + "'"); - return percentilePolicy(tracked, pctile, executions); - } else if (constantMatcher.matches()) { - int threshold = Integer.valueOf(constantMatcher.group("msThreshold")); - String executionsSpec = constantMatcher.group("executions"); - int executions = (executionsSpec != null && !executionsSpec.isEmpty()) ? Integer.valueOf(executionsSpec) : 5; - logger.debug("speculative: Creating new constant policy from spec '" + spec + "'"); - return constantPolicy(threshold, executions); - } else { - throw new RuntimeException("Unable to parse pattern for speculative option: " + spec + ", it must be in " + - "an accepted form, like p99.0:5:15000, or p99.0:5, or 5000ms:5"); - } - - } - - public static LoadBalancingPolicy whitelistFor(String s, LoadBalancingPolicy innerPolicy) { - String[] addrSpecs = s.split(","); - List sockAddrs = Arrays.stream(addrSpecs) - .map(CQLOptions::toSocketAddr) - .collect(Collectors.toList()); - if (innerPolicy == null) { - innerPolicy = new RoundRobinPolicy(); - } - return new WhiteListPolicy(innerPolicy, sockAddrs); - } - - public static NettyOptions withTickDuration(String tick) { - logger.info("Cluster builder using custom tick duration value for HashedWheelTimer: " + tick + " milliseconds"); - int tickDuration = Integer.valueOf(tick); - return new NettyOptions() { - public io.netty.util.Timer timer(ThreadFactory threadFactory) { - return new HashedWheelTimer( - threadFactory, tickDuration, TimeUnit.MILLISECONDS); - } - }; - } - - private static InetSocketAddress toSocketAddr(String addr) { - String[] addrs = addr.split(":", 2); - String inetHost = addrs[0]; - String inetPort = (addrs.length == 2) ? addrs[1] : "9042"; - return new InetSocketAddress(inetHost, Integer.valueOf(inetPort)); - } - - public static ProtocolOptions.Compression withCompression(String compspec) { - try { - return ProtocolOptions.Compression.valueOf(compspec); - } catch (IllegalArgumentException iae) { - throw new RuntimeException("Compression option '" + compspec + "' was specified, but only " + - Arrays.toString(ProtocolOptions.Compression.values()) + " are available."); - } - } +// private final static Logger logger = LoggerFactory.getLogger(CQLOptions.class); +// +// private final static Pattern CORE_AND_MAX_RQ_PATTERN = Pattern.compile("(?\\d+)(:(?\\d+)(:(?\\d+))?)?(,(?\\d+)(:(?\\d+)(:(?\\d+))?)?)?(,?heartbeat_interval_s:(?\\d+))?(,?idle_timeout_s:(?\\d+))?(,?pool_timeout_ms:(?\\d+))?"); +// private final static Pattern PERCENTILE_EAGER_PATTERN = Pattern.compile("^p(?[^:]+)(:(?\\d+))?(:(?\\d+)ms)?$"); +// private final static Pattern CONSTANT_EAGER_PATTERN = Pattern.compile("^((?\\d++)ms)(:(?\\d+))?$"); +// +// private static ConstantSpeculativeExecutionPolicy constantPolicy(DriverContext context, int threshold, int executions) { +// return new ConstantSpeculativeExecutionPolicy(threshold, executions); +// } +// +// private static SpeculativeExecutionPolicy percentilePolicy(long tracked, double threshold, int executions) { +// PerHostPercentileTracker tracker = newTracker(tracked); +// return new PercentileSpeculativeExecutionPolicy(tracker, threshold, executions); +// } +// +// private static PerHostPercentileTracker newTracker(long millis) { +// return PerHostPercentileTracker.builder(millis).build(); +// } +// +// public static PoolingOptions poolingOptionsFor(String spec) { +// Matcher matcher = CORE_AND_MAX_RQ_PATTERN.matcher(spec); +// if (matcher.matches()) { +// PoolingOptions poolingOptions = new PoolingOptions(); +// +// Optional.ofNullable(matcher.group("core")).map(Integer::valueOf) +// .ifPresent(core -> poolingOptions.setCoreConnectionsPerHost(HostDistance.LOCAL, core)); +// Optional.ofNullable(matcher.group("max")).map(Integer::valueOf) +// .ifPresent(max -> poolingOptions.setMaxConnectionsPerHost(HostDistance.LOCAL, max)); +// Optional.ofNullable(matcher.group("rq")).map(Integer::valueOf) +// .ifPresent(rq -> poolingOptions.setMaxRequestsPerConnection(HostDistance.LOCAL, rq)); +// +// Optional.ofNullable(matcher.group("rcore")).map(Integer::valueOf) +// .ifPresent(rcore -> poolingOptions.setCoreConnectionsPerHost(HostDistance.REMOTE, rcore)); +// Optional.ofNullable(matcher.group("rmax")).map(Integer::valueOf) +// .ifPresent(rmax -> poolingOptions.setMaxConnectionsPerHost(HostDistance.REMOTE, rmax)); +// Optional.ofNullable(matcher.group("rrq")).map(Integer::valueOf) +// .ifPresent(rrq -> poolingOptions.setMaxRequestsPerConnection(HostDistance.REMOTE, rrq)); +// +// Optional.ofNullable(matcher.group("heartbeatinterval")).map(Integer::valueOf) +// .ifPresent(poolingOptions::setHeartbeatIntervalSeconds); +// +// Optional.ofNullable(matcher.group("idletimeout")).map(Integer::valueOf) +// .ifPresent(poolingOptions::setIdleTimeoutSeconds); +// +// Optional.ofNullable(matcher.group("pooltimeout")).map(Integer::valueOf) +// .ifPresent(poolingOptions::setPoolTimeoutMillis); +// +// return poolingOptions; +// } +// throw new RuntimeException("No pooling options could be parsed from spec: " + spec); +// +// } +// +// public static RetryPolicy retryPolicyFor(String spec, Session session) { +// Set retryBehaviors = Arrays.stream(spec.split(",")).map(String::toLowerCase).collect(Collectors.toSet()); +// RetryPolicy retryPolicy = new DefaultRetryPolicy(session.getContext(),"default"); +// +// if (retryBehaviors.contains("default")) { +// return retryPolicy; +// } // add other mutually-exclusive behaviors here with checks, if we want to extend beyond "default" +// +// if (retryBehaviors.contains("logging")) { +// retryPolicy = new LoggingRetryPolicy(retryPolicy); +// } +// +// return retryPolicy; +// } +// +// public static ReconnectionPolicy reconnectPolicyFor(String spec, Session session) { +// if(spec.startsWith("exponential(")){ +// String argsString = spec.substring(12); +// String[] args = argsString.substring(0, argsString.length() - 1).split("[,;]"); +// if (args.length != 2){ +// throw new BasicError("Invalid reconnectionpolicy, try reconnectionpolicy=exponential(, )"); +// } +// long baseDelay = Long.parseLong(args[0]); +// long maxDelay = Long.parseLong(args[1]); +// ExponentialReconnectionPolicy exponentialReconnectionPolicy = new ExponentialReconnectionPolicy(session.getContext()); +// }else if(spec.startsWith("constant(")){ +// String argsString = spec.substring(9); +// long constantDelayMs= Long.parseLong(argsString.substring(0, argsString.length() - 1)); +// return new ConstantReconnectionPolicy(constantDelayMs); +// } +// throw new BasicError("Invalid reconnectionpolicy, try reconnectionpolicy=exponential(, ) or constant()"); +// } +// +// public static SocketOptions socketOptionsFor(String spec) { +// String[] assignments = spec.split("[,;]"); +// Map values = new HashMap<>(); +// for (String assignment : assignments) { +// String[] namevalue = assignment.split("[:=]", 2); +// String name = namevalue[0]; +// String value = namevalue[1]; +// values.put(name, value); +// } +// +// SocketOptions options = new SocketOptions(); +// Optional.ofNullable(values.get("read_timeout_ms")).map(Integer::parseInt).ifPresent( +// options::setReadTimeoutMillis +// ); +// Optional.ofNullable(values.get("connect_timeout_ms")).map(Integer::parseInt).ifPresent( +// options::setConnectTimeoutMillis +// ); +// Optional.ofNullable(values.get("keep_alive")).map(Boolean::parseBoolean).ifPresent( +// options::setKeepAlive +// ); +// Optional.ofNullable(values.get("reuse_address")).map(Boolean::parseBoolean).ifPresent( +// options::setReuseAddress +// ); +// Optional.ofNullable(values.get("so_linger")).map(Integer::parseInt).ifPresent( +// options::setSoLinger +// ); +// Optional.ofNullable(values.get("tcp_no_delay")).map(Boolean::parseBoolean).ifPresent( +// options::setTcpNoDelay +// ); +// Optional.ofNullable(values.get("receive_buffer_size")).map(Integer::parseInt).ifPresent( +// options::setReceiveBufferSize +// ); +// Optional.ofNullable(values.get("send_buffer_size")).map(Integer::parseInt).ifPresent( +// options::setSendBufferSize +// ); +// +// return options; +// } +// +// public static SpeculativeExecutionPolicy defaultSpeculativePolicy() { +// PerHostPercentileTracker tracker = PerHostPercentileTracker +// .builder(15000) +// .build(); +// PercentileSpeculativeExecutionPolicy defaultSpecPolicy = +// new PercentileSpeculativeExecutionPolicy(tracker, 99.0, 5); +// return defaultSpecPolicy; +// } +// +// public static SpeculativeExecutionPolicy speculativeFor(String spec) { +// Matcher pctileMatcher = PERCENTILE_EAGER_PATTERN.matcher(spec); +// Matcher constantMatcher = CONSTANT_EAGER_PATTERN.matcher(spec); +// if (pctileMatcher.matches()) { +// double pctile = Double.valueOf(pctileMatcher.group("pctile")); +// if (pctile > 100.0 || pctile < 0.0) { +// throw new RuntimeException("pctile must be between 0.0 and 100.0"); +// } +// String executionsSpec = pctileMatcher.group("executions"); +// String trackedSpec = pctileMatcher.group("tracked"); +// int executions = (executionsSpec != null && !executionsSpec.isEmpty()) ? Integer.valueOf(executionsSpec) : 5; +// int tracked = (trackedSpec != null && !trackedSpec.isEmpty()) ? Integer.valueOf(trackedSpec) : 15000; +// logger.debug("speculative: Creating new percentile tracker policy from spec '" + spec + "'"); +// return percentilePolicy(tracked, pctile, executions); +// } else if (constantMatcher.matches()) { +// int threshold = Integer.valueOf(constantMatcher.group("msThreshold")); +// String executionsSpec = constantMatcher.group("executions"); +// int executions = (executionsSpec != null && !executionsSpec.isEmpty()) ? Integer.valueOf(executionsSpec) : 5; +// logger.debug("speculative: Creating new constant policy from spec '" + spec + "'"); +// return constantPolicy(threshold, executions); +// } else { +// throw new RuntimeException("Unable to parse pattern for speculative option: " + spec + ", it must be in " + +// "an accepted form, like p99.0:5:15000, or p99.0:5, or 5000ms:5"); +// } +// +// } +// +// public static LoadBalancingPolicy whitelistFor(String s, LoadBalancingPolicy innerPolicy) { +// String[] addrSpecs = s.split(","); +// List sockAddrs = Arrays.stream(addrSpecs) +// .map(CQLOptions::toSocketAddr) +// .collect(Collectors.toList()); +// if (innerPolicy == null) { +// innerPolicy = new RoundRobinPolicy(); +// } +// return new WhiteListPolicy(innerPolicy, sockAddrs); +// } +// +// public static NettyOptions withTickDuration(String tick) { +// logger.info("Cluster builder using custom tick duration value for HashedWheelTimer: " + tick + " milliseconds"); +// int tickDuration = Integer.valueOf(tick); +// return new NettyOptions() { +// public io.netty.util.Timer timer(ThreadFactory threadFactory) { +// return new HashedWheelTimer( +// threadFactory, tickDuration, TimeUnit.MILLISECONDS); +// } +// }; +// } +// +// private static InetSocketAddress toSocketAddr(String addr) { +// String[] addrs = addr.split(":", 2); +// String inetHost = addrs[0]; +// String inetPort = (addrs.length == 2) ? addrs[1] : "9042"; +// return new InetSocketAddress(inetHost, Integer.valueOf(inetPort)); +// } +// +// public static ProtocolOptions.Compression withCompression(String compspec) { +// try { +// return ProtocolOptions.Compression.valueOf(compspec); +// } catch (IllegalArgumentException iae) { +// throw new RuntimeException("Compression option '" + compspec + "' was specified, but only " + +// Arrays.toString(ProtocolOptions.Compression.values()) + " are available."); +// } +// } } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java index 320363678..8fba3e419 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAction.java @@ -1,8 +1,9 @@ package io.nosqlbench.activitytype.cqld4.core; import com.codahale.metrics.Timer; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Statement; +import com.datastax.oss.driver.api.core.config.DefaultDriverOption; +import com.datastax.oss.driver.api.core.cql.*; +import com.datastax.oss.driver.api.core.session.Session; import io.nosqlbench.activitytype.cqld4.api.ResultSetCycleOperator; import io.nosqlbench.activitytype.cqld4.api.RowCycleOperator; import io.nosqlbench.activitytype.cqld4.api.StatementFilter; @@ -22,6 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; +import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; @SuppressWarnings("Duplicates") @@ -81,7 +83,7 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser totalRowsFetchedForQuery = 0L; Statement statement; - ResultSetFuture resultSetFuture; + CompletionStage resultSetFuture; ReadyCQLStatement readyCQLStatement; int tries = 0; @@ -124,7 +126,7 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser } try (Timer.Context executeTime = cqlActivity.executeTimer.time()) { - resultSetFuture = cqlActivity.getSession().executeAsync(statement); + CompletionStage completion = cqlActivity.getSession().executeAsync(statement); } Timer.Context resultTime = cqlActivity.resultTimer.time(); @@ -149,7 +151,8 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser Row row = resultSet.one(); ColumnDefinitions defs = row.getColumnDefinitions(); if (retryReplace) { - statement = CQLBindHelper.rebindUnappliedStatement(statement, defs, row); + statement = + new CQLBindHelper(getCqlActivity().getSession()).rebindUnappliedStatement(statement, defs,row); } logger.trace(readyCQLStatement.getQueryString(cycleValue)); @@ -212,7 +215,7 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser readyCQLStatement.getQueryString(cycleValue), 1, cqlActivity.maxpages, - cqlActivity.getSession().getCluster().getConfiguration().getQueryOptions().getFetchSize() + cqlActivity.getSession().getContext().getConfig().getDefaultProfile().getInt(DefaultDriverOption.REQUEST_PAGE_SIZE) ); } } @@ -302,7 +305,7 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser pagingReadyStatement.getQueryString(cycleValue), pagesFetched, cqlActivity.maxpages, - cqlActivity.getSession().getCluster().getConfiguration().getQueryOptions().getFetchSize() + cqlActivity.getSession().getContext().getConfig().getDefaultProfile().getInt(DefaultDriverOption.REQUEST_PAGE_SIZE) ); } pagingResultSet = resultSet; diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java index c3c2b8cf0..85cf28994 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java @@ -4,6 +4,7 @@ import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; import com.datastax.driver.core.*; +import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.session.Session; import io.nosqlbench.activitytype.cqld4.codecsupport.UDTCodecInjector; import com.datastax.driver.core.TokenRangeStmtFilter; @@ -73,7 +74,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef Meter rowsCounter; private HashedCQLErrorHandler errorHandler; private OpSequence opsequence; - private Session session; + private CqlSession session; private int maxTries; private StatementFilter statementFilter; private Boolean showcql; @@ -125,7 +126,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef logger.debug("activity fully initialized: " + this.activityDef.getAlias()); } - public synchronized Session getSession() { + public synchronized CqlSession getSession() { if (session == null) { session = CQLSessionCache.get().getSession(this.getActivityDef()); } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java index cc2647db1..bdb38788a 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java @@ -1,10 +1,8 @@ package io.nosqlbench.activitytype.cqld4.core; import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.datastax.oss.driver.api.core.cql.Statement; import io.nosqlbench.activitytype.cqld4.statements.core.ReadyCQLStatement; -import com.google.common.util.concurrent.FutureCallback; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp; public class CqlOpData implements FutureCallback { diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/UnexpectedPagingException.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/UnexpectedPagingException.java index 1effe9fac..225aeec26 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/UnexpectedPagingException.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/UnexpectedPagingException.java @@ -49,7 +49,9 @@ public class UnexpectedPagingException extends CqlGenericCycleException { sb.append("Additional paging would be required to read the results from this query fully" + ", but the user has not explicitly indicated that paging was expected.") .append(" fetched/allowed: ").append(fetchedPages).append("/").append(maxpages) - .append(" fetchSize(").append(fetchSize).append("): ").append(queryString); + .append(" fetchSize(").append(fetchSize).append("): ").append(queryString).append(", note this value " + + "is shown for reference from the default driver profile. If you are using a custom profile, it may be " + + "different."); return sb.toString(); } } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java index 2770361ae..9c6d7903a 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java @@ -1,6 +1,10 @@ package io.nosqlbench.activitytype.cqld4.statements.core; +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.CqlSessionBuilder; +import com.datastax.oss.driver.api.core.config.DriverOption; import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; +import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; @@ -29,7 +33,8 @@ public class CQLSessionCache implements Shutdownable { private final static Logger logger = LoggerFactory.getLogger(CQLSessionCache.class); private final static String DEFAULT_SESSION_ID = "default"; private static CQLSessionCache instance = new CQLSessionCache(); - private Map sessionCache = new HashMap<>(); + private Map sessionCache = new HashMap<>(); + private Map> rawConfigs = new HashMap<>(); private CQLSessionCache() { } @@ -44,61 +49,62 @@ public class CQLSessionCache implements Shutdownable { session.close(); } - public Session getSession(ActivityDef activityDef) { + public CqlSession getSession(ActivityDef activityDef) { String key = activityDef.getParams().getOptionalString("clusterid").orElse(DEFAULT_SESSION_ID); return sessionCache.computeIfAbsent(key, (cid) -> createSession(activityDef, key)); } // cbopts=\".withLoadBalancingPolicy(LatencyAwarePolicy.builder(new TokenAwarePolicy(new DCAwareRoundRobinPolicy(\"dc1-us-east\", 0, false))).build()).withRetryPolicy(new LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE))\" - private Session createSession(ActivityDef activityDef, String sessid) { + private CqlSession createSession(ActivityDef activityDef, String sessid) { String host = activityDef.getParams().getOptionalString("host").orElse("localhost"); int port = activityDef.getParams().getOptionalInteger("port").orElse(9042); String driverType = activityDef.getParams().getOptionalString("cqldriver").orElse("dse"); - Cluster.Builder builder = - driverType.toLowerCase().equals("dse") ? DseCluster.builder() : - driverType.toLowerCase().equals("oss") ? Cluster.builder() : null; + activityDef.getParams().getOptionalString("cqldriver").ifPresent(v -> { + logger.warn("The cqldriver parameter is not needed in this version of the driver."); + }); - if (builder==null) { - throw new RuntimeException("The driver type '" + driverType + "' is not recognized"); + CqlSessionBuilder builder = CqlSession.builder(); + + Optional scb = activityDef.getParams().getOptionalString("secureconnectbundle") + .map(Path::of); + + Optional> hosts = activityDef.getParams().getOptionalString("host", "hosts") + .map(h -> h.split(",")).map(Arrays::asList); + + Optional port1 = activityDef.getParams().getOptionalInteger("port"); + + if (scb.isPresent()) { + scb.map(b -> { + logger.debug("adding secureconnectbundle: " + b.toString()); + return b; + }).ifPresent(builder::withCloudSecureConnectBundle); + + if (hosts.isPresent()) { + logger.warn("The host parameter is not valid when using secureconnectbundle="); + } + if (port1.isPresent()) { + logger.warn("the port parameter is not used with CQL when using secureconnectbundle="); + } + } else { + hosts.orElse(List.of("localhost")) + .stream() + .map(h -> InetSocketAddress.createUnresolved(h,port)) + .peek(h-> logger.debug("adding contact endpoint: " + h.getHostName()+":"+h.getPort())) + .forEachOrdered(builder::addContactPoint); } - logger.info("Using driver type '" + driverType.toUpperCase() + "'"); - - Optional scb = activityDef.getParams() - .getOptionalString("secureconnectbundle"); - scb.map(File::new) - .ifPresent(builder::withCloudSecureConnectBundle); - - activityDef.getParams() - .getOptionalString("insights").map(Boolean::parseBoolean) - .ifPresent(builder::withMonitorReporting); - - String[] contactPoints = activityDef.getParams().getOptionalString("host") - .map(h -> h.split(",")).orElse(null); - - if (contactPoints == null) { - contactPoints = activityDef.getParams().getOptionalString("hosts") - .map(h -> h.split(",")).orElse(null); - } - if (contactPoints == null && scb.isEmpty()) { - contactPoints = new String[]{"localhost"}; - } - - if (contactPoints != null) { - builder.addContactPoints(contactPoints); - } - - activityDef.getParams().getOptionalInteger("port").ifPresent(builder::withPort); - - builder.withCompression(ProtocolOptions.Compression.NONE); +// builder.withCompression(ProtocolOptions.Compression.NONE); + // TODO add map based configuration with compression defaults Optional usernameOpt = activityDef.getParams().getOptionalString("username"); Optional passwordOpt = activityDef.getParams().getOptionalString("password"); Optional passfileOpt = activityDef.getParams().getOptionalString("passfile"); + Optional authIdOpt = activityDef.getParams().getOptionalString("authid"); + if (usernameOpt.isPresent()) { String username = usernameOpt.get(); @@ -119,7 +125,11 @@ public class CQLSessionCache implements Shutdownable { logger.error(error); throw new RuntimeException(error); } - builder.withCredentials(username, password); + if (authIdOpt.isPresent()) { + builder.withAuthCredentials(username, password, authIdOpt.get()); + } else { + builder.withAuthCredentials(username, password); + } } Optional clusteropts = activityDef.getParams().getOptionalString("cbopts"); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java new file mode 100644 index 000000000..6a84bc79b --- /dev/null +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java @@ -0,0 +1,18 @@ +package io.nosqlbench.activitytype.cqld4.statements.core; + +import com.datastax.oss.driver.api.core.config.DriverOption; +import com.datastax.oss.driver.api.core.config.OptionsMap; +import com.datastax.oss.driver.internal.core.config.map.MapBasedDriverConfigLoader; +import edu.umd.cs.findbugs.annotations.NonNull; + +import java.util.Map; + +public class NBCqlDriverConfigLoader extends MapBasedDriverConfigLoader { + + public NBCqlDriverConfigLoader( + @NonNull OptionsMap source, + @NonNull Map> rawMap) { + super(source, rawMap); + } + +} diff --git a/driver-cqld4/src/main/resources/cqld4.md b/driver-cqld4/src/main/resources/cqld4.md index 6dc73721e..52ad79b3c 100644 --- a/driver-cqld4/src/main/resources/cqld4.md +++ b/driver-cqld4/src/main/resources/cqld4.md @@ -4,55 +4,52 @@ This is the CQL version 4 driver for NoSQLBench. As it gets more use, we will ma name. For now, the 'cql' refers to the version 1.9 driver, while 'cqld4' refers to this one. The drivers will have identical features where possible, but new enhancements will be targeted at this one first. +In the alpha release of this NoSQLBench CQL driver, some of the options previously available on the CQL 1.9 driver will +not be supported. We are working to add these in an idiomatic way ASAP. + This is an driver which allows for the execution of CQL statements. This driver supports both sync and async modes, with detailed metrics provided for both. -### Example activity definitions - -Run a cql activity named 'cql1', with definitions from activities/cqldefs.yaml -~~~ -... driver=cql alias=cql1 workload=cqldefs -~~~ - -Run a cql activity defined by cqldefs.yaml, but with shortcut naming -~~~ -... driver=cql workload=cqldefs -~~~ - -Only run statement groups which match a tag regex -~~~ -... driver=cql workload=cqldefs tags=group:'ddl.*' -~~~ - -Run the matching 'dml' statements, with 100 cycles, from [1000..1100) -~~~ -... driver=cql workload=cqldefs tags=group:'dml.*' cycles=1000..1100 -~~~ -This last example shows that the cycle range is [inclusive..exclusive), -to allow for stacking test intervals. This is standard across all -activity types. +TEMPORARY EDITORS NOTE: This will use a more consistent layout as shown below. The topics are meant to be searchable in +the newer doc system scheme. ### CQL ActivityType Parameters -- **cqldriver** - default: dse - The type of driver to use, either dse, or oss. If you need DSE-specific features, use - the dse driver. If you are connecting to an OSS Apache Cassandra cluster, you must use the oss driver. The oss driver - option is only available in nosqlbench. -- **host** - The host or hosts to use for connection points to - the cluster. If you specify multiple values here, use commas - with no spaces. - Examples: - - `host=192.168.1.25` - - `host=`192.168.1.25,testhost42` -- **workload** - The workload definition which holds the schema and statement defs. - see workload yaml location for additional details - (no default, required) -- **port** - The port to connect with -- **cl** - An override to consistency levels for the activity. If - this option is used, then all consistency levels will be replaced - by this one for the current activity, and a log line explaining - the difference with respect to the yaml will be emitted. - This is not a dynamic parameter. It will only be applied at - activity start. +#### secureconnectbundle + +This parameter is used to connect to Astra Database as a Service. This option accepts a path to the secure connect +bundle that is downloaded from the Astra UI. + +- Examples: + - `secureconnectbundle=/tmp/secure-connect-my_db.zip` + - `secureconnectbundle="/home/automaton/secure-connect-my_db.zip"` + +#### hosts + +The host or hosts to use for connection points to the cluster. If you specify multiple values here, use commas with no +spaces. This option is not valid when the **secureconnectbundle** option is used. + +* Examples: + - `host=192.168.1.25` + - `host=`192.168.1.25,testhost42` + +#### port + +The port to connect with. This option is not valid when the **secureconnectbundle** option is used. + +Default +: 9042 + +---- below this line needs to be curated for the new driver ---- + + +Examples: + - `port=9042` + +- **cl** - An override to consistency levels for the activity. If this option is used, then all consistency levels will + be replaced by this one for the current activity, and a log line explaining the difference with respect to the yaml + will be emitted. This is not a dynamic parameter. It will only be applied at activity start. +- - **cbopts** - default: none - this is how you customize the cluster settings for the client, including policies, compression, etc. This is a string of *Java*-like method calls just as you would use them @@ -238,11 +235,6 @@ activity types. code base. This is for dynamic codec loading with user-provided codecs mapped via the internal UDT APIs. default: false -- **secureconnectbundle** - used to connect to CaaS, accepts a path to the secure connect bundle - that is downloaded from the CaaS UI. - Examples: - - `secureconnectbundle=/tmp/secure-connect-my_db.zip` - - `secureconnectbundle="/home/automaton/secure-connect-my_db.zip"` - **insights** - Set to false to disable the driver from sending insights monitoring information - `insights=false` - **tickduration** - sets the tickDuration (milliseconds) of HashedWheelTimer of the From 39d6c50a03b3ea011f20ec9c33aef9d8c544df5f Mon Sep 17 00:00:00 2001 From: phact Date: Mon, 18 May 2020 15:52:46 -0400 Subject: [PATCH 02/70] http plugin for scripts --- .../engine/extensions/http/HttpPlugin.java | 57 +++++++++++++++++++ .../extensions/http/HttpPluginData.java | 27 +++++++++ 2 files changed, 84 insertions(+) create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java create mode 100644 engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java new file mode 100644 index 000000000..7905988f0 --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java @@ -0,0 +1,57 @@ +package io.nosqlbench.engine.extensions.http; + +import jdk.jfr.ContentType; + +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; + +public class HttpPlugin { + private HttpClient client = HttpClient.newHttpClient(); + + public String get(String url) throws IOException, InterruptedException { + HttpRequest.Builder builder = HttpRequest.newBuilder(); + URI uri = URI.create(url); + HttpRequest request = builder + .uri(uri) + .build(); + + HttpResponse response = client.send(request, + HttpResponse.BodyHandlers.ofString()); + + return response.body(); + } + + public String post(String url, String data, String contentType) throws IOException, InterruptedException { + HttpRequest.Builder builder = HttpRequest.newBuilder(); + URI uri = URI.create(url); + + HttpRequest request; + if (data == null && contentType == null || contentType == null){ + request = builder + .uri(uri) + .POST(HttpRequest.BodyPublishers.noBody()) + .build(); + } else if (data == null) { + request = builder + .uri(uri) + .header("Content-Type", contentType) + .POST(HttpRequest.BodyPublishers.noBody()) + .build(); + } else { + request = builder + .uri(uri) + .header("Content-Type", contentType) + .POST(HttpRequest.BodyPublishers.ofString(data)) + .build(); + } + + HttpResponse response = client.send(request, + HttpResponse.BodyHandlers.ofString()); + + return response.body(); + } + +} diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java new file mode 100644 index 000000000..bfaf28171 --- /dev/null +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPluginData.java @@ -0,0 +1,27 @@ +package io.nosqlbench.engine.extensions.http; + +import com.codahale.metrics.MetricRegistry; +import io.nosqlbench.engine.api.extensions.ScriptingPluginInfo; +import io.nosqlbench.engine.extensions.optimizers.BobyqaOptimizerPlugin; +import io.nosqlbench.nb.annotations.Service; +import org.slf4j.Logger; + +import javax.script.ScriptContext; + +@Service(ScriptingPluginInfo.class) +public class HttpPluginData implements ScriptingPluginInfo { + @Override + public String getDescription() { + return "use http get and post in scripts"; + } + + @Override + public HttpPlugin getExtensionObject(Logger logger, MetricRegistry metricRegistry, ScriptContext scriptContext) { + return new HttpPlugin(); + } + + @Override + public String getBaseVariableName() { + return "http"; + } +} From 3b6b88f9a57beee860759fc681e07f2820021eea Mon Sep 17 00:00:00 2001 From: phact Date: Mon, 18 May 2020 15:59:29 -0400 Subject: [PATCH 03/70] overload post for null payload & no content type --- .../java/io/nosqlbench/engine/extensions/http/HttpPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java index 7905988f0..e4d89b972 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java @@ -24,6 +24,10 @@ public class HttpPlugin { return response.body(); } + public String post(String url) throws IOException, InterruptedException { + return post(url, null, null); + } + public String post(String url, String data, String contentType) throws IOException, InterruptedException { HttpRequest.Builder builder = HttpRequest.newBuilder(); URI uri = URI.create(url); From 2d1263e3a235ecc96f67efeba7e385402b259c11 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 May 2020 13:41:37 -0500 Subject: [PATCH 04/70] add doc link --- .../src/main/java/io/nosqlbench/engine/core/script/Scenario.java | 1 + 1 file changed, 1 insertion(+) diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java index 8dfde7b4b..95802df3f 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java @@ -154,6 +154,7 @@ public class Scenario implements Callable { scriptEngine.put("params", scenarioScriptParams); if (engine == Engine.Graalvm) { + // https://github.com/graalvm/graaljs/blob/master/docs/user/JavaInterop.md if (wantsGraaljsCompatMode) { scriptEngine.put("scenario", scenarioController); scriptEngine.put("metrics", new NashornMetricRegistryBindings(metricRegistry)); From 966b434fad24b63ed4147f00b1775ac4e5ceb58b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 May 2020 13:41:44 -0500 Subject: [PATCH 05/70] fix nesting error in combinations logic --- .../virtdata/core/bindings/VirtDataComposer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java index 6375ef850..76ad8f45b 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java @@ -215,12 +215,15 @@ public class VirtDataComposer { } Object[][] combinations = new Object[modulo][]; + for (int row = 0; row < combinations.length; row++) { Object[] combination = new Object[allargs.length]; int number = row; for (int pos = 0; pos < combination.length; pos++) { - int selector = (int) (row / modulos[pos]); - combination[pos] = allargs[pos][selector]; + int selector = (int) (number / modulos[pos]); + Object[] allargspos = allargs[pos]; + Object objectatpos = allargspos[selector]; + combination[pos] = objectatpos; number %= modulos[pos]; } combinations[row] = combination; From 63b203bc3ec9c17b02781c9b62e446fb981699d4 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 May 2020 13:41:49 -0500 Subject: [PATCH 06/70] fix stability test with correct data --- .../shared/distributions/CSVFrequencySampler.java | 10 +++------- .../java/io/virtdata/IntegratedAliasMethodTests.java | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java index 0f1b2da8a..7fcd8e31e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java @@ -49,12 +49,9 @@ import java.util.function.LongFunction; @ThreadSafeMapper public class CSVFrequencySampler implements LongFunction { - private final String filename; - private final String columnName; - private final String[] lines; private final AliasSamplerDoubleInt sampler; - private Hash hash; + private final Hash hash; /** * Create a sampler of strings from the given CSV file. The CSV file must have plain CSV headers @@ -64,8 +61,7 @@ public class CSVFrequencySampler implements LongFunction { */ @Example({"CSVFrequencySampler('values.csv','modelno')","Read values.csv, count the frequency of values in 'modelno' column, and sample from this column proportionally"}) public CSVFrequencySampler(String filename, String columnName) { - this.filename = filename; - this.columnName = columnName; + String filename1 = filename; this.hash=new Hash(); @@ -86,7 +82,7 @@ public class CSVFrequencySampler implements LongFunction { } int i = 0; for (String value : values) { - frequencies.add(new EvProbD(i++,Double.valueOf(freq.getCount(value)))); + frequencies.add(new EvProbD(i++, (double) freq.getCount(value))); } sampler = new AliasSamplerDoubleInt(frequencies); lines = values.toArray(new String[0]); diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java index 124703ddf..b785af536 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java @@ -20,7 +20,7 @@ public class IntegratedAliasMethodTests { public void testCSVFrequencySampler() { CSVFrequencySampler names= new CSVFrequencySampler("data/countries", "COUNTRY_CODE" ); String n = names.apply(23); - assertThat(n).isEqualTo("CZ"); + assertThat(n).isEqualTo("TK"); } @Test @@ -31,6 +31,6 @@ public class IntegratedAliasMethodTests { ',' ); String n = names.apply(23); - assertThat(n).isEqualTo("CZ"); + assertThat(n).isEqualTo("TK"); } } From 4539daf56f001b679b2592cc6fc51b2f182c6cb9 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 May 2020 13:41:58 -0500 Subject: [PATCH 07/70] rename clusterid to sessionid --- .../io/nosqlbench/activitytype/cql/core/CqlActivity.java | 2 +- driver-cql-shaded/src/main/resources/cql.md | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java index 3ad70e671..4099f20d4 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java @@ -136,7 +136,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef private void initSequencer() { Session session = getSession(); - Map fconfig = Map.of("cluster",session.getCluster()); + Map fconfig = Map.of("session",session); SequencerType sequencerType = SequencerType.valueOf( getParams().getOptionalString("seq").orElse("bucket") diff --git a/driver-cql-shaded/src/main/resources/cql.md b/driver-cql-shaded/src/main/resources/cql.md index 8aeaf78d0..9b0c5b4b2 100644 --- a/driver-cql-shaded/src/main/resources/cql.md +++ b/driver-cql-shaded/src/main/resources/cql.md @@ -195,10 +195,8 @@ activity types. The above traces every 1000th cycle to stdout. If the trace log is not specified, then 'tracelog' is assumed. If the filename is specified as stdout, then traces are dumped to stdout. -- **clusterid** - names the configuration to be used for this activity. Within - a given scenario, any activities that use the same name for clusterid will - share a session and cluster. - default: 'default' +- **sessionid** - names the configuration to be used for this activity. Within a given scenario, any activities that use + the same name for clusterid will share a session and cluster. default: 'default' - **drivermetrics** - enable reporting of driver metrics. default: false - **driverprefix** - set the metrics name that will prefix all CQL driver metrics. From ae7e5a376fd9f74de55886c44e414c86b6c9ed5a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 May 2020 13:42:07 -0500 Subject: [PATCH 08/70] partial work on cqld4 --- .../cqld4/codecsupport/UDTCodecInjector.java | 3 +- .../cqld4/core/CQLBindHelper.java | 2 +- .../activitytype/cqld4/core/CqlActivity.java | 237 +++++++++--------- .../cqld4/core/CqlActivityType.java | 9 +- .../cqld4/core/CqlAsyncAction.java | 11 +- .../activitytype/cqld4/core/CqlOpData.java | 32 ++- .../cqld4/errorhandling/ExceptionMap.java | 34 +-- .../errorhandling/NBCycleErrorHandler.java | 1 - .../exceptions/CQLExceptionDetailer.java | 25 -- .../exceptions/CQLResultSetException.java | 4 +- .../statements/binders/CqlBinderTypes.java | 26 +- .../binders/DiagnosticPreparedBinder.java | 4 +- .../binders/DirectArrayValuesBinder.java | 2 +- .../binders/UnsettableValuesBinder.java | 2 +- .../statements/core/CQLSessionCache.java | 60 ++++- .../core/NBCqlDriverConfigLoader.java | 18 -- 16 files changed, 233 insertions(+), 237 deletions(-) delete mode 100644 driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLExceptionDetailer.java delete mode 100644 driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java index b25aeeb1a..d5acdc7fa 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/codecsupport/UDTCodecInjector.java @@ -13,11 +13,10 @@ public class UDTCodecInjector { private final static Logger logger = LoggerFactory.getLogger(UDTCodecInjector.class); private List codecProviders = new ArrayList<>(); - private List userTypes = new ArrayList<>(); public void injectUserProvidedCodecs(Session session, boolean allowAcrossKeyspaces) { - CodecRegistry registry = session.getCluster().getConfiguration().getCodecRegistry(); + CodecRegistry registry = session.getContext().getCodecRegistry(); ServiceLoader codecLoader = ServiceLoader.load(UserCodecProvider.class); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLBindHelper.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLBindHelper.java index d77adc148..3b81b8f07 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLBindHelper.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CQLBindHelper.java @@ -45,7 +45,7 @@ public class CQLBindHelper { for (ColumnDefinition def : defs) { ByteBuffer byteBuffer = row.getByteBuffer(def.getName()); - bound.setBytesUnsafe(def.getName(), byteBuffer); + bound=bound.setBytesUnsafe(def.getName(), byteBuffer); } return bound; } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java index 85cf28994..8be641e5d 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivity.java @@ -4,7 +4,10 @@ import com.codahale.metrics.Histogram; import com.codahale.metrics.Meter; import com.codahale.metrics.Timer; import com.datastax.driver.core.*; +import com.datastax.oss.driver.api.core.ConsistencyLevel; import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.DefaultConsistencyLevel; +import com.datastax.oss.driver.api.core.cql.*; import com.datastax.oss.driver.api.core.session.Session; import io.nosqlbench.activitytype.cqld4.codecsupport.UDTCodecInjector; import com.datastax.driver.core.TokenRangeStmtFilter; @@ -86,6 +89,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef private long maxRetryDelay; private boolean retryReplace; private String pooling; + private String profileName; public CqlActivity(ActivityDef activityDef) { @@ -104,7 +108,8 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef @Override public synchronized void initActivity() { logger.debug("initializing activity: " + this.activityDef.getAlias()); - session = getSession(); + profileName = getParams().getOptionalString("profile").orElse("default"); + session = getSession(profileName); if (getParams().getOptionalBoolean("usercodecs").orElse(false)) { registerCodecs(session); @@ -126,9 +131,9 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef logger.debug("activity fully initialized: " + this.activityDef.getAlias()); } - public synchronized CqlSession getSession() { + public synchronized CqlSession getSession(String profileName) { if (session == null) { - session = CQLSessionCache.get().getSession(this.getActivityDef()); + session = CQLSessionCache.get().getSession(this.getActivityDef(), profileName); } return session; } @@ -136,10 +141,10 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef private void initSequencer() { Session session = getSession(); - Map fconfig = Map.of("cluster",session.getCluster()); + Map fconfig = Map.of("session", session); SequencerType sequencerType = SequencerType.valueOf( - getParams().getOptionalString("seq").orElse("bucket") + getParams().getOptionalString("seq").orElse("bucket") ); SequencePlanner planner = new SequencePlanner<>(sequencerType); @@ -163,97 +168,100 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef boolean parametrized = Boolean.valueOf(stmtDef.getParams().getOrDefault("parametrized", "false")); long ratio = Long.valueOf(stmtDef.getParams().getOrDefault("ratio", "1")); - Optional cl = Optional.ofNullable( - stmtDef.getParams().getOrDefault("cl", null)).map(ConsistencyLevel::valueOf); - - Optional serial_cl = Optional.ofNullable( - stmtDef.getParams().getOrDefault("serial_cl", null)).map(ConsistencyLevel::valueOf); - - Optional idempotent = Optional.ofNullable(stmtDef.getParams().getOrDefault("idempotent", null)) - .map(Boolean::valueOf); - StringBuilder psummary = new StringBuilder(); boolean instrument = Optional.ofNullable(stmtDef.getParams() - .get("instrument")).map(Boolean::valueOf) - .orElse(getParams().getOptionalBoolean("instrument").orElse(false)); + .get("instrument")).map(Boolean::valueOf) + .orElse(getParams().getOptionalBoolean("instrument").orElse(false)); - String logresultcsv = stmtDef.getParams().getOrDefault("logresultcsv",""); + String logresultcsv = stmtDef.getParams().getOrDefault("logresultcsv", ""); String logresultcsv_act = getParams().getOptionalString("logresultcsv").orElse(""); if (!logresultcsv_act.isEmpty() && !logresultcsv_act.toLowerCase().equals("true")) { throw new RuntimeException("At the activity level, only logresultcsv=true is allowed, no other values."); } logresultcsv = !logresultcsv.isEmpty() ? logresultcsv : logresultcsv_act; - logresultcsv = !logresultcsv.toLowerCase().equals("true") ? logresultcsv : stmtDef.getName()+"--results.csv"; + logresultcsv = !logresultcsv.toLowerCase().equals("true") ? logresultcsv : stmtDef.getName() + "--results.csv"; logger.debug("readying statement[" + (prepared ? "" : "un") + "prepared]:" + parsed.getStmt()); ReadyCQLStatementTemplate template; String stmtForDriver = parsed.getPositionalStatement(s -> "?"); - if (prepared) { - psummary.append(" prepared=>").append(prepared); - PreparedStatement prepare = getSession().prepare(stmtForDriver); - cl.ifPresent((conlvl) -> { - psummary.append(" consistency_level=>").append(conlvl); - prepare.setConsistencyLevel(conlvl); - }); - serial_cl.ifPresent((scl) -> { - psummary.append(" serial_consistency_level=>").append(serial_cl); - prepare.setSerialConsistencyLevel(scl); - }); - idempotent.ifPresent((i) -> { - psummary.append(" idempotent=").append(idempotent); - prepare.setIdempotent(i); - }); - CqlBinderTypes binderType = CqlBinderTypes.valueOf(stmtDef.getParams() - .getOrDefault("binder", CqlBinderTypes.DEFAULT.toString())); - template = new ReadyCQLStatementTemplate(fconfig, binderType, getSession(), prepare, ratio, - parsed.getName()); - } else { - SimpleStatement simpleStatement = new SimpleStatement(stmtForDriver); - cl.ifPresent((conlvl) -> { + SimpleStatementBuilder stmtBuilder = SimpleStatement.builder(stmtForDriver); + psummary.append(" statement=>").append(stmtForDriver); + + Optional.ofNullable(stmtDef.getParams().getOrDefault("cl", null)) + .map(DefaultConsistencyLevel::valueOf) + .map(conlvl -> { psummary.append(" consistency_level=>").append(conlvl); - simpleStatement.setConsistencyLevel(conlvl); - }); - serial_cl.ifPresent((scl) -> { - psummary.append(" serial_consistency_level=>").append(scl); - simpleStatement.setSerialConsistencyLevel(scl); - }); - idempotent.ifPresent((i) -> { - psummary.append(" idempotent=>").append(i); - simpleStatement.setIdempotent(i); - }); + return conlvl; + }) + .ifPresent(stmtBuilder::setConsistencyLevel); + + Optional.ofNullable(stmtDef.getParams().getOrDefault("serial_cl", null)) + .map(DefaultConsistencyLevel::valueOf) + .map(sconlvel -> { + psummary.append(" serial_consistency_level=>").append(sconlvel); + return sconlvel; + }) + .ifPresent(stmtBuilder::setSerialConsistencyLevel); + + Optional.ofNullable(stmtDef.getParams().getOrDefault("idempotent", null)) + .map(Boolean::valueOf) + .map(idempotent -> { + psummary.append(" idempotent=").append(idempotent); + return idempotent; + }) + .ifPresent(stmtBuilder::setIdempotence); + + + if (prepared) { + PreparedStatement preparedStatement = getSession().prepare(stmtBuilder.build()); + + CqlBinderTypes binderType = CqlBinderTypes.valueOf(stmtDef.getParams() + .getOrDefault("binder", CqlBinderTypes.DEFAULT.toString())); + + template = new ReadyCQLStatementTemplate( + fconfig, + binderType, + getSession(), + preparedStatement, + ratio, + parsed.getName() + ); + } else { + SimpleStatement simpleStatement = SimpleStatement.newInstance(stmtForDriver); template = new ReadyCQLStatementTemplate(fconfig, getSession(), simpleStatement, ratio, parsed.getName(), parametrized); } + Optional.ofNullable(stmtDef.getParams().getOrDefault("save", null)) - .map(s -> s.split("[,; ]")) - .map(Save::new) - .ifPresent(save_op -> { - psummary.append(" save=>").append(save_op.toString()); - template.addRowCycleOperators(save_op); - }); + .map(s -> s.split("[,; ]")) + .map(Save::new) + .ifPresent(save_op -> { + psummary.append(" save=>").append(save_op.toString()); + template.addRowCycleOperators(save_op); + }); Optional.ofNullable(stmtDef.getParams().getOrDefault("rsoperators", null)) - .map(s -> s.split(",")) - .stream().flatMap(Arrays::stream) - .map(ResultSetCycleOperators::newOperator) - .forEach(rso -> { - psummary.append(" rsop=>").append(rso.toString()); - template.addResultSetOperators(rso); - }); + .map(s -> s.split(",")) + .stream().flatMap(Arrays::stream) + .map(ResultSetCycleOperators::newOperator) + .forEach(rso -> { + psummary.append(" rsop=>").append(rso.toString()); + template.addResultSetOperators(rso); + }); Optional.ofNullable(stmtDef.getParams().getOrDefault("rowoperators", null)) - .map(s -> s.split(",")) - .stream().flatMap(Arrays::stream) - .map(RowCycleOperators::newOperator) - .forEach(ro -> { - psummary.append(" rowop=>").append(ro.toString()); - template.addRowCycleOperators(ro); - }); + .map(s -> s.split(",")) + .stream().flatMap(Arrays::stream) + .map(RowCycleOperators::newOperator) + .forEach(ro -> { + psummary.append(" rowop=>").append(ro.toString()); + template.addRowCycleOperators(ro); + }); if (instrument) { logger.info("Adding per-statement success and error and resultset-size timers to statement '" + parsed.getName() + "'"); @@ -263,7 +271,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef if (!logresultcsv.isEmpty()) { logger.info("Adding per-statement result CSV logging to statement '" + parsed.getName() + "'"); - template.logResultCsv(this,logresultcsv); + template.logResultCsv(this, logresultcsv); psummary.append(" logresultcsv=>").append(logresultcsv); } @@ -298,9 +306,9 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef case "1": doclist = getVersion1StmtsDoc(interp, yaml_loc); logger.warn("DEPRECATED-FORMAT: Loaded yaml " + yaml_loc + " with compatibility mode. " + - "This will be deprecated in a future release."); + "This will be deprecated in a future release."); logger.warn("DEPRECATED-FORMAT: Please refer to " + - "http://docs.engineblock.io/user-guide/standard_yaml/ for more details."); + "http://docs.engineblock.io/user-guide/standard_yaml/ for more details."); break; case "2": doclist = StatementsLoader.load(logger, yaml_loc, interp, "activities"); @@ -308,22 +316,22 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef case "unset": try { logger.debug("You can suffix your yaml filename or url with the " + - "format version, such as :1 or :2. Assuming version 2."); + "format version, such as :1 or :2. Assuming version 2."); doclist = StatementsLoader.load(null, yaml_loc, interp, "activities"); } catch (Exception ignored) { try { doclist = getVersion1StmtsDoc(interp, yaml_loc); logger.warn("DEPRECATED-FORMAT: Loaded yaml " + yaml_loc + - " with compatibility mode. This will be deprecated in a future release."); + " with compatibility mode. This will be deprecated in a future release."); logger.warn("DEPRECATED-FORMAT: Please refer to " + - "http://docs.engineblock.io/user-guide/standard_yaml/ for more details."); + "http://docs.engineblock.io/user-guide/standard_yaml/ for more details."); } catch (Exception compatError) { logger.warn("Tried to load yaml in compatibility mode, " + - "since it failed to load with the standard format, " + - "but found an error:" + compatError); + "since it failed to load with the standard format, " + + "but found an error:" + compatError); logger.warn("The following detailed errors are provided only " + - "for the standard format. To force loading version 1 with detailed logging, add" + - " a version qualifier to your yaml filename or url like ':1'"); + "for the standard format. To force loading version 1 with detailed logging, add" + + " a version qualifier to your yaml filename or url like ':1'"); // retrigger the error again, this time with logging enabled. doclist = StatementsLoader.load(logger, yaml_loc, interp, "activities"); } @@ -331,7 +339,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef break; default: throw new RuntimeException("Unrecognized yaml format version, expected :1 or :2 " + - "at end of yaml file, but got " + yamlVersion + " instead."); + "at end of yaml file, but got " + yamlVersion + " instead."); } return doclist; @@ -394,10 +402,10 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef @Override public String toString() { return "CQLActivity {" + - "activityDef=" + activityDef + - ", session=" + session + - ", opSequence=" + this.opsequence + - '}'; + "activityDef=" + activityDef + + ", session=" + session + + ", opSequence=" + this.opsequence + + '}'; } @Override @@ -410,10 +418,10 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef ParameterMap params = activityDef.getParams(); Optional fetchSizeOption = params.getOptionalString("fetchsize"); - Cluster cluster = getSession().getCluster(); + if (fetchSizeOption.isPresent()) { int fetchSize = fetchSizeOption.flatMap(Unit::bytesFor).map(Double::intValue).orElseThrow(() -> new RuntimeException( - "Unable to parse fetch size from " + fetchSizeOption.get() + "Unable to parse fetch size from " + fetchSizeOption.get() )); if (fetchSize > 10000000 && fetchSize < 1000000000) { logger.warn("Setting the fetchsize to " + fetchSize + " is unlikely to give good performance."); @@ -421,6 +429,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef throw new RuntimeException("Setting the fetch size to " + fetchSize + " is likely to cause instability."); } logger.trace("setting fetchSize to " + fetchSize); + cluster.getConfiguration().getQueryOptions().setFetchSize(fetchSize); } @@ -432,8 +441,8 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef this.maxpages = params.getOptionalInteger("maxpages").orElse(1); this.statementFilter = params.getOptionalString("tokens") - .map(s -> new TokenRangeStmtFilter(cluster, s)) - .orElse(null); + .map(s -> new TokenRangeStmtFilter(cluster, s)) + .orElse(null); if (statementFilter != null) { logger.info("filtering statements" + statementFilter); @@ -442,13 +451,13 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef errorHandler = configureErrorHandler(); params.getOptionalString("trace") - .map(SimpleConfig::new) - .map(TraceLogger::new) - .ifPresent( - tl -> { - addResultSetCycleOperator(tl); - addStatementModifier(tl); - }); + .map(SimpleConfig::new) + .map(TraceLogger::new) + .ifPresent( + tl -> { + addResultSetCycleOperator(tl); + addStatementModifier(tl); + }); this.maxTotalOpsInFlight = params.getOptionalLong("async").orElse(1L); @@ -505,8 +514,8 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef HashedCQLErrorHandler newerrorHandler = new HashedCQLErrorHandler(exceptionCountMetrics); String errors = activityDef.getParams() - .getOptionalString("errors") - .orElse("stop,retryable->retry,unverified->stop"); + .getOptionalString("errors") + .orElse("stop,retryable->retry,unverified->stop"); String[] handlerSpecs = errors.split(","); @@ -515,32 +524,32 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef if (keyval.length == 1) { String verb = keyval[0]; newerrorHandler.setDefaultHandler( - new NBCycleErrorHandler( - ErrorResponse.valueOf(verb), - exceptionCountMetrics, - exceptionHistoMetrics, - !getParams().getOptionalLong("async").isPresent() - ) + new NBCycleErrorHandler( + ErrorResponse.valueOf(verb), + exceptionCountMetrics, + exceptionHistoMetrics, + !getParams().getOptionalLong("async").isPresent() + ) ); } else { String pattern = keyval[0]; String verb = keyval[1]; if (newerrorHandler.getGroupNames().contains(pattern)) { NBCycleErrorHandler handler = - new NBCycleErrorHandler( - ErrorResponse.valueOf(verb), - exceptionCountMetrics, - exceptionHistoMetrics, - !getParams().getOptionalLong("async").isPresent() - ); + new NBCycleErrorHandler( + ErrorResponse.valueOf(verb), + exceptionCountMetrics, + exceptionHistoMetrics, + !getParams().getOptionalLong("async").isPresent() + ); logger.info("Handling error group '" + pattern + "' with handler:" + handler); newerrorHandler.setHandlerForGroup(pattern, handler); } else { NBCycleErrorHandler handler = new NBCycleErrorHandler( - ErrorResponse.valueOf(keyval[1]), - exceptionCountMetrics, - exceptionHistoMetrics, - !getParams().getOptionalLong("async").isPresent() + ErrorResponse.valueOf(keyval[1]), + exceptionCountMetrics, + exceptionHistoMetrics, + !getParams().getOptionalLong("async").isPresent() ); logger.info("Handling error pattern '" + pattern + "' with handler:" + handler); newerrorHandler.setHandlerForPattern(keyval[0], handler); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java index f564c85f0..28d117e52 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlActivityType.java @@ -1,9 +1,9 @@ package io.nosqlbench.activitytype.cqld4.core; -import com.datastax.driver.core.LocalDate; -import com.datastax.driver.core.TupleValue; -import com.datastax.driver.core.UDTValue; +import com.datastax.oss.driver.api.core.data.TupleValue; +import com.datastax.oss.driver.api.core.type.UserDefinedType; +import io.nosqlbench.activitytype.cqld4.codecsupport.UDTJavaType; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; @@ -14,6 +14,7 @@ import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; import java.time.Instant; +import java.time.LocalDate; import java.time.LocalTime; import java.util.*; @@ -76,7 +77,7 @@ public class CqlActivityType implements ActivityType { typemap.put("timestamp", Instant.class); typemap.put("tinyint",byte.class); typemap.put("tuple", TupleValue.class); - typemap.put("", UDTValue.class); + typemap.put("", UserDefinedType.class); typemap.put("uuid",UUID.class); typemap.put("timeuuid",UUID.class); typemap.put("varchar",String.class); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java index 00681d3e7..beede72aa 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlAsyncAction.java @@ -2,7 +2,6 @@ package io.nosqlbench.activitytype.cqld4.core; import com.codahale.metrics.Timer; import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import io.nosqlbench.activitytype.cqld4.api.ErrorResponse; import io.nosqlbench.activitytype.cqld4.api.ResultSetCycleOperator; import io.nosqlbench.activitytype.cqld4.api.RowCycleOperator; @@ -13,8 +12,6 @@ import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.CQLCycleWithSta import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.ChangeUnappliedCycleException; import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.UnexpectedPagingException; import io.nosqlbench.activitytype.cqld4.statements.core.ReadyCQLStatement; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import io.nosqlbench.engine.api.activityapi.core.BaseAsyncAction; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.FailedOp; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp; @@ -115,8 +112,8 @@ public class CqlAsyncAction extends BaseAsyncAction { // The execute timer covers only the point at which EB hands the op to the driver to be executed try (Timer.Context executeTime = activity.executeTimer.time()) { - cqlop.future = activity.getSession().executeAsync(cqlop.statement); - Futures.addCallback(cqlop.future, cqlop); + cqlop.completionStage = activity.getSession().executeAsync(cqlop.statement); + Futures.addCallback(cqlop.completionStage, cqlop); } } @@ -234,8 +231,8 @@ public class CqlAsyncAction extends BaseAsyncAction { if (errorStatus.isRetryable() && cqlop.triesAttempted < maxTries) { startedOp.retry(); try (Timer.Context executeTime = activity.executeTimer.time()) { - cqlop.future = activity.getSession().executeAsync(cqlop.statement); - Futures.addCallback(cqlop.future, cqlop); + cqlop.completionStage = activity.getSession().executeAsync(cqlop.statement); + Futures.addCallback(cqlop.completionStage, cqlop); return; } } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java index bdb38788a..7c4372d01 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/core/CqlOpData.java @@ -1,12 +1,17 @@ package io.nosqlbench.activitytype.cqld4.core; -import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.AsyncResultSet; +import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.api.core.cql.Statement; import io.nosqlbench.activitytype.cqld4.statements.core.ReadyCQLStatement; import io.nosqlbench.engine.api.activityapi.core.ops.fluent.opfacets.StartedOp; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; + +public class CqlOpData extends CompletableFuture { -public class CqlOpData implements FutureCallback { final long cycle; + public CompletionStage completionStage; // op state is managed via callbacks, we keep a ref here StartedOp startedOp; @@ -17,8 +22,6 @@ public class CqlOpData implements FutureCallback { ReadyCQLStatement readyCQLStatement; Statement statement; - ResultSetFuture future; - ResultSet resultSet; long totalRowsFetchedForQuery; long totalPagesFetchedForQuery; @@ -26,6 +29,7 @@ public class CqlOpData implements FutureCallback { public Throwable throwable; public long resultAt; private long errorAt; + private Iterable page; public CqlOpData(long cycle, CqlAsyncAction action) { this.cycle = cycle; @@ -33,18 +37,20 @@ public class CqlOpData implements FutureCallback { } @Override - public void onSuccess(ResultSet result) { - this.resultSet = result; - this.resultAt = System.nanoTime(); - action.onSuccess(startedOp); - + public boolean completeExceptionally(Throwable ex) { + this.throwable=ex; + this.errorAt = System.nanoTime(); + action.onFailure(startedOp); + return true; } @Override - public void onFailure(Throwable throwable) { - this.throwable=throwable; - this.errorAt = System.nanoTime(); - action.onFailure(startedOp); + public boolean complete(AsyncResultSet value) { + this.page = value.currentPage(); + this.resultAt = System.nanoTime(); + action.onSuccess(startedOp); + return true; + // ? return !value.hasMorePages(); } } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/ExceptionMap.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/ExceptionMap.java index 437457184..edff4a117 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/ExceptionMap.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/ExceptionMap.java @@ -33,6 +33,8 @@ public class ExceptionMap { + // DriverException subtypes + put(AllNodesFailedException.class, DriverException.class); put(NoNodeAvailableException.class, AllNodesFailedException.class); put(BusyConnectionException.class, DriverException.class); @@ -53,34 +55,22 @@ public class ExceptionMap { put(UnavailableException.class, QueryExecutionException.class); put(QueryValidationException.class, CoordinatorException.class); put(AlreadyExistsException.class, QueryValidationException.class); - put(InvalidConfigurationInQueryException.class, QueryValidationException.class); put(InvalidQueryException.class, QueryValidationException.class); + put(InvalidConfigurationInQueryException.class, QueryValidationException.class); put(SyntaxError.class, QueryValidationException.class); put(UnauthorizedException.class, QueryValidationException.class); put(ServerError.class,CoordinatorException.class); - put(UnfitClientException.class, CoordinatorException.class); - put(DriverExecutionException.class, DriverException.class); - put(DriverTimeoutException.class, DriverException.class); - put(FrameTooLongException.class, DriverException.class); - put(HeartbeatException.class,DriverException.class); - put(InvalidKeyspaceException.class,DriverException.class); - put(RequestThrottlingException.class,DriverException.class); - put(UnsupportedProtocolVersionException.class, DriverException.class); + put(UnfitClientException.class, CoordinatorException.class); + put(DriverExecutionException.class, DriverException.class); + put(DriverTimeoutException.class, DriverException.class); + put(FrameTooLongException.class, DriverException.class); + put(HeartbeatException.class,DriverException.class); + put(InvalidKeyspaceException.class,DriverException.class); + put(RequestThrottlingException.class,DriverException.class); + put(UnsupportedProtocolVersionException.class, DriverException.class); - - - - - put(UnpreparedException.class, QueryValidationException.class); - put(InvalidTypeException.class, DriverException.class); - put(FunctionExecutionException.class, QueryValidationException.class); - put(DriverInternalError.class, DriverException.class); + // package org.apache.tinkerpop.gremlin.driver.exception; put(ConnectionException.class, DriverException.class); - put(TransportException.class, ConnectionException.class); - put(OperationTimedOutException.class, ConnectionException.class); - put(PagingStateException.class, DriverException.class); - put(UnresolvedUserTypeException.class, DriverException.class); - put(UnsupportedFeatureException.class, DriverException.class); put(ChangeUnappliedCycleException.class, CqlGenericCycleException.class); put(ResultSetVerificationException.class, CqlGenericCycleException.class); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java index 2dc80b533..7c605252c 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/NBCycleErrorHandler.java @@ -2,7 +2,6 @@ package io.nosqlbench.activitytype.cqld4.errorhandling; import io.nosqlbench.activitytype.cqld4.api.ErrorResponse; import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.CQLCycleWithStatementException; -import io.nosqlbench.activitytype.cqld4.errorhandling.exceptions.CQLExceptionDetailer; import io.nosqlbench.engine.api.activityapi.errorhandling.CycleErrorHandler; import io.nosqlbench.engine.api.metrics.ExceptionCountMetrics; import io.nosqlbench.engine.api.metrics.ExceptionHistoMetrics; diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLExceptionDetailer.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLExceptionDetailer.java deleted file mode 100644 index fe7d24787..000000000 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLExceptionDetailer.java +++ /dev/null @@ -1,25 +0,0 @@ -package io.nosqlbench.activitytype.cqld4.errorhandling.exceptions; - -import com.datastax.driver.core.exceptions.ReadTimeoutException; -import com.datastax.driver.core.exceptions.WriteTimeoutException; - -public class CQLExceptionDetailer { - - public static String messageFor(long cycle, Throwable e) { - - if (e instanceof ReadTimeoutException) { - ReadTimeoutException rte = (ReadTimeoutException) e; - return rte.getMessage() + - ", coordinator: " + rte.getHost() + - ", wasDataRetrieved: " + rte.wasDataRetrieved(); - } - - if (e instanceof WriteTimeoutException) { - WriteTimeoutException wte = (WriteTimeoutException) e; - return wte.getMessage() + - ", coordinator: " + wte.getHost(); - } - - return e.getMessage(); - } -} diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLResultSetException.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLResultSetException.java index e9395ae2b..82472cd30 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLResultSetException.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/errorhandling/exceptions/CQLResultSetException.java @@ -1,8 +1,8 @@ package io.nosqlbench.activitytype.cqld4.errorhandling.exceptions; -import com.datastax.driver.core.BoundStatement; +import com.datastax.oss.driver.api.core.cql.BoundStatement; import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.driver.core.SimpleStatement; +import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.Statement; public abstract class CQLResultSetException extends CqlGenericCycleException { diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/CqlBinderTypes.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/CqlBinderTypes.java index a4ddc37fe..cd3398f24 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/CqlBinderTypes.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/CqlBinderTypes.java @@ -5,23 +5,23 @@ import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.api.core.session.Session; import io.nosqlbench.virtdata.core.bindings.ValuesArrayBinder; +import java.util.function.Function; + public enum CqlBinderTypes { - direct_array, - unset_aware, - diagnostic; + direct_array(s -> new DirectArrayValuesBinder()), + unset_aware(UnsettableValuesBinder::new), + diagnostic(s -> new DiagnosticPreparedBinder()); + + private final Function>> mapper; + + CqlBinderTypes(Function>> mapper) { + this.mapper = mapper; + } public final static CqlBinderTypes DEFAULT = unset_aware; - public ValuesArrayBinder get(Session session) { - if (this==direct_array) { - return new DirectArrayValuesBinder(); - } else if (this== unset_aware) { - return new UnsettableValuesBinder(session); - } else if (this==diagnostic) { - return new DiagnosticPreparedBinder(); - } else { - throw new RuntimeException("Impossible-ish statement branch"); - } + public ValuesArrayBinder> get(Session session) { + return mapper.apply(session); } } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java index 97dd6ca2c..15357cfce 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DiagnosticPreparedBinder.java @@ -16,10 +16,10 @@ import java.util.List; * Other binders will call to this one in an exception handler when needed in * order to explain in more detail what is happening for users. */ -public class DiagnosticPreparedBinder implements ValuesArrayBinder { +public class DiagnosticPreparedBinder implements ValuesArrayBinder> { public static final Logger logger = LoggerFactory.getLogger(DiagnosticPreparedBinder.class); @Override - public Statement bindValues(PreparedStatement prepared, Object[] values) { + public Statement bindValues(PreparedStatement prepared, Object[] values) { ColumnDefinitions columnDefinitions = prepared.getVariableDefinitions(); BoundStatement bound = prepared.bind(); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java index 236e768f0..dcc5f6c90 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/DirectArrayValuesBinder.java @@ -18,7 +18,7 @@ import java.util.Arrays; * to be modeled, and at no clear benefit. Thus the {@link CqlBinderTypes#unset_aware} one * will become the default. */ -public class DirectArrayValuesBinder implements ValuesArrayBinder { +public class DirectArrayValuesBinder implements ValuesArrayBinder> { public final static Logger logger = LoggerFactory.getLogger(DirectArrayValuesBinder.class); @Override diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java index 32aaeb94f..7d6ac27f3 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/binders/UnsettableValuesBinder.java @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class UnsettableValuesBinder implements ValuesArrayBinder { +public class UnsettableValuesBinder implements ValuesArrayBinder> { private final static Logger logger = LoggerFactory.getLogger(UnsettableValuesBinder.class); private final Session session; diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java index 9c6d7903a..a8f9ffcfe 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java @@ -2,13 +2,18 @@ package io.nosqlbench.activitytype.cqld4.statements.core; import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.CqlSessionBuilder; +import com.datastax.oss.driver.api.core.config.DriverConfig; +import com.datastax.oss.driver.api.core.config.DriverConfigLoader; import com.datastax.oss.driver.api.core.config.DriverOption; +import com.datastax.oss.driver.api.core.config.OptionsMap; import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; +import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; import com.datastax.oss.driver.internal.core.retry.DefaultRetryPolicy; +import com.typesafe.config.ConfigFactory; import io.nosqlbench.activitytype.cqld4.core.CQLOptions; import io.nosqlbench.activitytype.cqld4.core.ProxyTranslator; import io.nosqlbench.engine.api.activityapi.core.Shutdownable; @@ -17,6 +22,7 @@ import io.nosqlbench.engine.api.metrics.ActivityMetrics; import io.nosqlbench.engine.api.scripting.NashornEvaluator; import io.nosqlbench.engine.api.util.SSLKsFactory; import org.apache.tinkerpop.gremlin.driver.Cluster; +import org.graalvm.options.OptionMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,14 +33,24 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; public class CQLSessionCache implements Shutdownable { private final static Logger logger = LoggerFactory.getLogger(CQLSessionCache.class); private final static String DEFAULT_SESSION_ID = "default"; private static CQLSessionCache instance = new CQLSessionCache(); - private Map sessionCache = new HashMap<>(); - private Map> rawConfigs = new HashMap<>(); + private Map sessionCache = new HashMap<>(); + + + private final static class SessionConfig extends ConcurrentHashMap { + public CqlSession session; + public Map config = new ConcurrentHashMap<>(); + + public SessionConfig(CqlSession session) { + this.session = session; + } + } private CQLSessionCache() { } @@ -44,30 +60,52 @@ public class CQLSessionCache implements Shutdownable { } public void stopSession(ActivityDef activityDef) { - String key = activityDef.getParams().getOptionalString("clusterid").orElse(DEFAULT_SESSION_ID); - Session session = sessionCache.get(key); - session.close(); + String key = activityDef.getParams().getOptionalString("sessionid").orElse(DEFAULT_SESSION_ID); + SessionConfig sessionConfig = sessionCache.get(key); + sessionConfig.session.close(); } public CqlSession getSession(ActivityDef activityDef) { - String key = activityDef.getParams().getOptionalString("clusterid").orElse(DEFAULT_SESSION_ID); - return sessionCache.computeIfAbsent(key, (cid) -> createSession(activityDef, key)); + String key = activityDef.getParams().getOptionalString("sessionid").orElse(DEFAULT_SESSION_ID); + String profileName = activityDef.getParams().getOptionalString("profile").orElse("default"); + SessionConfig sessionConfig = sessionCache.computeIfAbsent(key, (cid) -> createSession(activityDef, key, profileName)); + return sessionConfig.session; } // cbopts=\".withLoadBalancingPolicy(LatencyAwarePolicy.builder(new TokenAwarePolicy(new DCAwareRoundRobinPolicy(\"dc1-us-east\", 0, false))).build()).withRetryPolicy(new LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE))\" - private CqlSession createSession(ActivityDef activityDef, String sessid) { + private SessionConfig createSession(ActivityDef activityDef, String sessid, String profileName) { String host = activityDef.getParams().getOptionalString("host").orElse("localhost"); int port = activityDef.getParams().getOptionalInteger("port").orElse(9042); - String driverType = activityDef.getParams().getOptionalString("cqldriver").orElse("dse"); - activityDef.getParams().getOptionalString("cqldriver").ifPresent(v -> { logger.warn("The cqldriver parameter is not needed in this version of the driver."); }); - CqlSessionBuilder builder = CqlSession.builder(); + + // TODO: Figure out how to layer configs with the new TypeSafe Config layer in the Datastax Java Driver + // TODO: Or give up and bulk import options into the map, because the config API is a labyrinth +// +// CqlSessionBuilder builder = CqlSession.builder(); +// +// OptionsMap optionsMap = new OptionsMap(); +// +// OptionsMap defaults = OptionsMap.driverDefaults(); +// DriverConfigLoader cl = DriverConfigLoader.fromMap(defaults); +// DriverConfig cfg = cl.getInitialConfig(); + + + DriverConfigLoader alldefaults = DriverConfigLoader.fromMap(OptionsMap.driverDefaults()); + + ConfigFactory.defaultApplication().withFallback(alldefaults.getInitialConfig().getDefaultProfile().). + + DriverConfigLoader.fromMap() + + builder.withConfigLoader(DriverConfigLoader.fromMap().) + + + Optional scb = activityDef.getParams().getOptionalString("secureconnectbundle") .map(Path::of); diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java deleted file mode 100644 index 6a84bc79b..000000000 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/NBCqlDriverConfigLoader.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.nosqlbench.activitytype.cqld4.statements.core; - -import com.datastax.oss.driver.api.core.config.DriverOption; -import com.datastax.oss.driver.api.core.config.OptionsMap; -import com.datastax.oss.driver.internal.core.config.map.MapBasedDriverConfigLoader; -import edu.umd.cs.findbugs.annotations.NonNull; - -import java.util.Map; - -public class NBCqlDriverConfigLoader extends MapBasedDriverConfigLoader { - - public NBCqlDriverConfigLoader( - @NonNull OptionsMap source, - @NonNull Map> rawMap) { - super(source, rawMap); - } - -} From 514d9f0478754705d9194d7cab778422b2675695 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 19 May 2020 13:42:13 -0500 Subject: [PATCH 09/70] some improvements to cqld4 docs --- driver-cqld4/src/main/resources/cqld4.md | 116 ++++++++++++++++++----- 1 file changed, 92 insertions(+), 24 deletions(-) diff --git a/driver-cqld4/src/main/resources/cqld4.md b/driver-cqld4/src/main/resources/cqld4.md index 52ad79b3c..2c90ed31d 100644 --- a/driver-cqld4/src/main/resources/cqld4.md +++ b/driver-cqld4/src/main/resources/cqld4.md @@ -1,4 +1,4 @@ -# cql driver +# cql-d4 driver This is the CQL version 4 driver for NoSQLBench. As it gets more use, we will make it the primary driver under the 'cql' name. For now, the 'cql' refers to the version 1.9 driver, while 'cqld4' refers to this one. The drivers will have @@ -13,55 +13,123 @@ detailed metrics provided for both. TEMPORARY EDITORS NOTE: This will use a more consistent layout as shown below. The topics are meant to be searchable in the newer doc system scheme. -### CQL ActivityType Parameters +## Activity Params + +There are the parameters that you can provide when starting an activity with this driver. + +Any parameter that is marked as *required* must be provided or an error will be thrown at activity startup. All other +parameters are marked as *optional*. + +Any parameter that is marked as *static* may not be changed while an activity is running. All other parameters are +marked as *dynamic*, meaning that they may be changed while an activity is running via scripting. + +#### sessionid + +*optional*, *static* + +The `sessionid` parameter allows you to logically assign a named instance of a session and session configuration to each +activity that you run. This allows for different driver settings to be used within the same scenario. + +Default +: default + +Example: +: `sessionid=test43` + +#### profile + +*optional*, *static* + +Controls the configuration profile used by the driver. If you provide a value for this parameter, then a configuration +file under the name must exist, or an error will be thrown. This a driver configuration file, as documented in [DataStax +Java Driver - Configurat](https://docs.datastax.com/en/developer/java-driver/4.6/manual/core/configuration/). + +The profile is keyed to the sessionid, as each session id will be configured with the named profile just as you would +see with normal file-based driver configuration. Thus, changing the configuration within the profile will affect future +operations which share the same session. + +While the profile itself is not changeable after it has been set, the parameters that are in the profile may be +dynamically changed, depending on how they are annotated below. + +*All other driver settings are part of the named profile for an activity, and will override the values provided from the +named profile unless otherwise stated. These overrides do not affect the named file, only the runtime behavior of the +driver.* + +Default +: 'default' + +Examples +: `profile=experimental-settings` #### secureconnectbundle +*optional*, *static* + This parameter is used to connect to Astra Database as a Service. This option accepts a path to the secure connect bundle that is downloaded from the Astra UI. -- Examples: - - `secureconnectbundle=/tmp/secure-connect-my_db.zip` - - `secureconnectbundle="/home/automaton/secure-connect-my_db.zip"` +Default +: undefined + +Examples +: `secureconnectbundle=/tmp/secure-connect-my_db.zip` +: `secureconnectbundle="/home/automaton/secure-connect-my_db.zip"` + #### hosts -The host or hosts to use for connection points to the cluster. If you specify multiple values here, use commas with no -spaces. This option is not valid when the **secureconnectbundle** option is used. +*optional*, *static* -* Examples: - - `host=192.168.1.25` - - `host=`192.168.1.25,testhost42` +The host or hosts to use to connect to the cluster. If you specify multiple values here, use commas with no spaces. +*This option is not valid when the `secureconnectbundle` option is used.* + +Default +: localhost + +Examples +: `host=192.168.1.25` +: `host=192.168.1.25,testhost42` #### port -The port to connect with. This option is not valid when the **secureconnectbundle** option is used. +*optional*, *static* + +The port to connect with. *This option is not valid when the `secureconnectbundle` option is used.* Default : 9042 +Examples: +- `port=9042` + +#### cl + +*optional*, *static* + +An override to consistency levels for the activity. If this option is used, then all consistency levels will be set to +this by default for the current activity, and a log line explaining the difference with respect to the yaml will be +emitted. This is not a dynamic parameter. It will only be applied at activity start. + + +#### whitelist + + ---- below this line needs to be curated for the new driver ---- -Examples: - - `port=9042` - -- **cl** - An override to consistency levels for the activity. If this option is used, then all consistency levels will - be replaced by this one for the current activity, and a log line explaining the difference with respect to the yaml - will be emitted. This is not a dynamic parameter. It will only be applied at activity start. -- -- **cbopts** - default: none - this is how you customize the cluster - settings for the client, including policies, compression, etc. This - is a string of *Java*-like method calls just as you would use them - in the Cluster.Builder fluent API. They are evaluated inline - with the default Cluster.Builder options not covered below. - Example: cbopts=".withCompression(ProtocolOptions.Compression.NONE)" - **whitelist** default: none - Applies a whitelist policy to the load balancing policy in the driver. If used, a WhitelistPolicy(RoundRobinPolicy()) will be created and added to the cluster builder on startup. Examples: - whitelist=127.0.0.1 - whitelist=127.0.0.1:9042,127.0.0.2:1234 + +- **cbopts** - default: none - this is how you customize the cluster + settings for the client, including policies, compression, etc. This + is a string of *Java*-like method calls just as you would use them + in the Cluster.Builder fluent API. They are evaluated inline + with the default Cluster.Builder options not covered below. + Example: cbopts=".withCompression(ProtocolOptions.Compression.NONE)" - **retrypolicy** default: none - Applies a retry policy in the driver The only option supported for this version is `retrypolicy=logging`, which uses the default retry policy, but with logging added. From de6c6b368f4a9ada7f362957d7244a1d989a71d8 Mon Sep 17 00:00:00 2001 From: phact Date: Tue, 19 May 2020 17:37:56 -0400 Subject: [PATCH 10/70] return types --- .../engine/extensions/http/HttpPlugin.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java index e4d89b972..5b8b13c18 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/http/HttpPlugin.java @@ -1,7 +1,5 @@ package io.nosqlbench.engine.extensions.http; -import jdk.jfr.ContentType; - import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -11,7 +9,7 @@ import java.net.http.HttpResponse; public class HttpPlugin { private HttpClient client = HttpClient.newHttpClient(); - public String get(String url) throws IOException, InterruptedException { + public HttpResponse get(String url) throws IOException, InterruptedException { HttpRequest.Builder builder = HttpRequest.newBuilder(); URI uri = URI.create(url); HttpRequest request = builder @@ -21,14 +19,14 @@ public class HttpPlugin { HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - return response.body(); + return response; } - public String post(String url) throws IOException, InterruptedException { + public HttpResponse post(String url) throws IOException, InterruptedException { return post(url, null, null); } - public String post(String url, String data, String contentType) throws IOException, InterruptedException { + public HttpResponse post(String url, String data, String contentType) throws IOException, InterruptedException { HttpRequest.Builder builder = HttpRequest.newBuilder(); URI uri = URI.create(url); @@ -55,7 +53,7 @@ public class HttpPlugin { HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - return response.body(); + return response; } } From ecfdcdeef2c444e383e279fab8d47ab8d8b4fe02 Mon Sep 17 00:00:00 2001 From: phact Date: Tue, 19 May 2020 17:39:40 -0400 Subject: [PATCH 11/70] Release --- RELEASENOTES.md | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e4dbece1e..7634abaa2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,23 +1,5 @@ -7b61ee3a (HEAD -> master) Don't swallow exception in VirtdataComposer -2d4bf8d0 DateRangeFunc allows flexible signatures -8cad4414 improve debugger view of virtdata AST -2de8df4e incremental cql-d4 work -7fb0eb83 make cql-d4 optional via profile -be160856 organize virtdata entry points -4f2b2929 remove extraneous build file -6e74b5ab virtdata composer considers all arg type combinations -526dc5de longflow example -52501f40 (HEAD -> master) support graal-js in nashorn compat mode -9d0403a5 polyglot mode now does full type introspection -ae8506ca incremental work on cql-d4 -302c3ca4 higher order functions now consider all possible matches without explicity input and output types -5f63092e misc AST cleanups -087c0b80 (origin/master, origin/HEAD) release commit -2d4bf8d0 DateRangeFunc allows flexible signatures -8cad4414 improve debugger view of virtdata AST -2de8df4e incremental cql-d4 work -7fb0eb83 make cql-d4 optional via profile -be160856 organize virtdata entry points -4f2b2929 remove extraneous build file -6e74b5ab virtdata composer considers all arg type combinations -526dc5de longflow example +de6c6b36 (origin/http-script-plugin, http-script-plugin) return types +442b5cbb fixed a docker-metrics bug that prevents grafana started by --docker-metrics on a Linux server from accessing prometheus in another docker container +3b6b88f9 overload post for null payload & no content type +39d6c50a http plugin for scripts +c99b609a (origin/refactor-sslksfactory) Refactor SSLKsFactory From c544d142126d9ea6c3d7e5407d31bc0c6f2e3fbb Mon Sep 17 00:00:00 2001 From: phact Date: Tue, 19 May 2020 20:39:34 -0400 Subject: [PATCH 12/70] fix csv test --- .../src/test/java/io/virtdata/IntegratedAliasMethodTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java index 124703ddf..b785af536 100644 --- a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java +++ b/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java @@ -20,7 +20,7 @@ public class IntegratedAliasMethodTests { public void testCSVFrequencySampler() { CSVFrequencySampler names= new CSVFrequencySampler("data/countries", "COUNTRY_CODE" ); String n = names.apply(23); - assertThat(n).isEqualTo("CZ"); + assertThat(n).isEqualTo("TK"); } @Test @@ -31,6 +31,6 @@ public class IntegratedAliasMethodTests { ',' ); String n = names.apply(23); - assertThat(n).isEqualTo("CZ"); + assertThat(n).isEqualTo("TK"); } } From 14de0306d39e763c4ecc73cd1f0de9f9413ee553 Mon Sep 17 00:00:00 2001 From: phact Date: Tue, 19 May 2020 20:40:06 -0400 Subject: [PATCH 13/70] release --- RELEASENOTES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 7634abaa2..f21d32865 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,5 @@ +c544d142 (HEAD -> master) fix csv test +ecfdcdee (origin/master, origin/HEAD) Release de6c6b36 (origin/http-script-plugin, http-script-plugin) return types 442b5cbb fixed a docker-metrics bug that prevents grafana started by --docker-metrics on a Linux server from accessing prometheus in another docker container 3b6b88f9 overload post for null payload & no content type From 966f0b4378c7d1c4f47c10bcb15f4bc0059254e9 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 20 May 2020 00:51:25 +0000 Subject: [PATCH 14/70] [maven-release-plugin] prepare release nosqlbench-3.12.107 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index a86d01555..6818e9632 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.107-SNAPSHOT + 3.12.107 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 43b488f51..77e4ecc74 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 57aa3642c..b3bcf8240 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 332b2decf..e50812955 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index a658fceb5..d12cd0bad 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 2d95e7246..8edd6527d 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 887ff63db..7e8dc666f 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench driver-stdout - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 6c9462013..9a9f4d9b5 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 605f9bb56..6a9a1373c 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench nb-annotations - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench virtdata-userlibs - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 341d8710c..ddee76ea9 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.107-SNAPSHOT + 3.12.107 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index dd17e65f5..a220dffc8 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index c8ec031ce..b61e652a1 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 8d79bcbce..3c0bb44c0 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 99a888fd8..993d75122 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 687a9d4fc..1519bb360 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.107-SNAPSHOT + 3.12.107 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.107 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index cb273d857..bb3d1b481 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index b4b015e2f..c972d435b 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/nb/pom.xml b/nb/pom.xml index 916535ae3..380be300f 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench engine-cli - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench engine-docs - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench engine-core - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench engine-extensions - 3.12.107-SNAPSHOT + 3.12.107 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench driver-diag - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench driver-tcp - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench driver-http - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench driver-cql-shaded - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench driver-cqlverify - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/pom.xml b/pom.xml index 9b39aab75..10f5c6730 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.107 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 7f9872a6c..3a71298d3 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 nb-api io.nosqlbench virtdata-lang - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index aab957b0d..90ccb3256 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 4b5aa0fef..d5f6027a1 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index bd1018bb3..bb1aba330 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench virtdata-lib-basics - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 39a993654..d75d76138 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench virtdata-lib-basics - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index a54c45690..076dd3ad6 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 2e9dff3eb..527957e7e 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.107-SNAPSHOT + 3.12.107 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 6d14a38fd..74fe6078c 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench virtdata-lib-realer - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench virtdata-api - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench virtdata-lib-random - 3.12.107-SNAPSHOT + 3.12.107 io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 virtdata-lib-basics io.nosqlbench - 3.12.107-SNAPSHOT + 3.12.107 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.107-SNAPSHOT + 3.12.107 From e5403f727f967d9c4176d94b4d1d52189e435956 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 20 May 2020 00:51:31 +0000 Subject: [PATCH 15/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 6818e9632..df645a85f 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.107 + 3.12.108-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 77e4ecc74..abbf57dd2 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index b3bcf8240..9893d764f 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index e50812955..0085ab6c7 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index d12cd0bad..91fd2005c 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8edd6527d..6e6e7ad3c 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 7e8dc666f..1783d75b0 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench driver-stdout - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 9a9f4d9b5..7d45759e3 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 6a9a1373c..b60b40aa2 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench nb-annotations - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index ddee76ea9..9e968291d 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.107 + 3.12.108-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index a220dffc8..681ff40cd 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index b61e652a1..e55c1c90d 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 3c0bb44c0..aec02f6cc 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 993d75122..265d49d31 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 1519bb360..d45dd32dd 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.107 + 3.12.108-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.107 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index bb3d1b481..0cb455422 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index c972d435b..454776ff3 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 380be300f..015fc3b3d 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench engine-cli - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench engine-docs - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench engine-core - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench engine-extensions - 3.12.107 + 3.12.108-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench driver-diag - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench driver-tcp - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench driver-http - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/pom.xml b/pom.xml index 10f5c6730..fa51dbb8a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.107 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 3a71298d3..54c424d1b 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 90ccb3256..3e4972cae 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index d5f6027a1..238b25273 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index bb1aba330..c6e847b73 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d75d76138..d16337c86 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 076dd3ad6..db6bf3ad0 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 527957e7e..53989538b 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.107 + 3.12.108-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 74fe6078c..6e5c5196e 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench virtdata-api - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.107 + 3.12.108-SNAPSHOT io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.107 + 3.12.108-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.107 + 3.12.108-SNAPSHOT From 548b3a4e83fe8b3a8efa2813d749293878c37eb3 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 May 2020 11:18:30 -0500 Subject: [PATCH 16/70] make --hdr_digits configurable --- .../engine/api/metrics/ActivityMetrics.java | 15 +++++++++++++-- .../main/java/io/nosqlbench/engine/cli/NBCLI.java | 2 ++ .../io/nosqlbench/engine/cli/NBCLIOptions.java | 11 ++++++++++- .../docs-for-nb/reference/command_line.md | 10 ++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java index 90df7ce82..f21e00fe0 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java @@ -18,6 +18,7 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.*; +import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.util.Unit; @@ -43,6 +44,16 @@ public class ActivityMetrics { }; private static List metricsCloseables = new ArrayList<>(); + private static int significantDigits = 4; + + public static int getSignificantDigits() { + return significantDigits; + } + + public static void setHdrDigits(int hdrDigits) { + ActivityMetrics.significantDigits = hdrDigits; + } + private ActivityMetrics() { } @@ -98,7 +109,7 @@ public class ActivityMetrics { public static Timer timer(ActivityDef activityDef, String name) { String fullMetricName = activityDef.getAlias() + "." + name; Timer registeredTimer = (Timer) register(activityDef, name, () -> - new NicerTimer(fullMetricName, new DeltaHdrHistogramReservoir(fullMetricName, 4))); + new NicerTimer(fullMetricName, new DeltaHdrHistogramReservoir(fullMetricName, significantDigits))); return registeredTimer; } @@ -114,7 +125,7 @@ public class ActivityMetrics { public static Histogram histogram(ActivityDef activityDef, String name) { String fullMetricName = activityDef.getAlias() + "." + name; return (Histogram) register(activityDef, name, () -> - new NicerHistogram(fullMetricName, new DeltaHdrHistogramReservoir(fullMetricName, 4))); + new NicerHistogram(fullMetricName, new DeltaHdrHistogramReservoir(fullMetricName, significantDigits))); } /** diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java index c839cc819..eb13436d9 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java @@ -81,6 +81,8 @@ public class NBCLI { ConsoleLogging.enableConsoleLogging(options.wantsConsoleLogLevel(), options.getConsoleLoggingPattern()); + ActivityMetrics.setHdrDigits(options.getHdrDigits()); + if (options.wantsBasicHelp()) { System.out.println(loadHelpFile("basic.md")); System.exit(0); diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java index 4975bb95d..d99080f81 100644 --- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java +++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java @@ -53,6 +53,7 @@ public class NBCLIOptions { private static final String WAIT_MILLIS = "waitmillis"; private static final String EXPORT_CYCLE_LOG = "--export-cycle-log"; private static final String IMPORT_CYCLE_LOG = "--import-cycle-log"; + private static final String HDR_DIGITS = "--hdr-digits"; // Execution Options @@ -127,7 +128,7 @@ public class NBCLIOptions { private final List wantsToIncludePaths = new ArrayList<>(); private Scenario.Engine engine = Scenario.Engine.Graalvm; private boolean graaljs_compat = false; - + private int hdr_digits = 4; public NBCLIOptions(String[] args) { parse(args); @@ -213,6 +214,10 @@ public class NBCLIOptions { arglist.removeFirst(); logsDirectory = readWordOrThrow(arglist, "a log directory"); break; + case HDR_DIGITS: + arglist.removeFirst(); + hdr_digits = Integer.parseInt(readWordOrThrow(arglist, "significant digits")); + break; case LOGS_MAX: arglist.removeFirst(); logsMax = Integer.parseInt(readWordOrThrow(arglist, "max logfiles to keep")); @@ -531,6 +536,10 @@ public class NBCLIOptions { // } + public int getHdrDigits() { + return hdr_digits; + } + public String getProgressSpec() { ProgressSpec spec = parseProgressSpec(this.progressSpec);// sanity check if (spec.indicatorMode == IndicatorMode.console diff --git a/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md b/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md index 14c612463..1d19dd04b 100644 --- a/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md +++ b/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md @@ -153,6 +153,16 @@ created for this name. --session-name +If you want to control the number of significant digits in all of the HDR metrics, including histograms and timers, then +you can do so this way: + + --hdr-digits 4 + +The default is 4 digits, which creates 10000 equisized histogram buckets for every named metric in every reporting +interval. For longer running test or for test which do not require this level of precision in metrics, you can set this +down to 3 or 2. + + Enlist engineblock to stand up your metrics infrastructure using a local docker runtime: --docker-metrics From 9bbd99fa21fa4202096aa46bca0397eac2583671 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 May 2020 11:19:30 -0500 Subject: [PATCH 17/70] update release notes, trigger release --- RELEASENOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index f21d32865..ae8c9090a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -5,3 +5,4 @@ de6c6b36 (origin/http-script-plugin, http-script-plugin) return types 3b6b88f9 overload post for null payload & no content type 39d6c50a http plugin for scripts c99b609a (origin/refactor-sslksfactory) Refactor SSLKsFactory +548b3a4e (HEAD -> master) make --hdr_digits configurable From 1e94869fecba83dd526dc39a26c0fac94a994c43 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 20 May 2020 16:29:56 +0000 Subject: [PATCH 18/70] [maven-release-plugin] prepare release nosqlbench-3.12.108 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index df645a85f..f7548ce53 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.108-SNAPSHOT + 3.12.108 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index abbf57dd2..bd936250e 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 9893d764f..65c5ab841 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 0085ab6c7..1efc3b4a4 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 91fd2005c..5bb2a7d41 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 6e6e7ad3c..22dc0ad0d 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 1783d75b0..f8c298b13 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench driver-stdout - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 7d45759e3..3c5a070c3 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index b60b40aa2..f0169567b 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench nb-annotations - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench virtdata-userlibs - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 9e968291d..75483d10a 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.108-SNAPSHOT + 3.12.108 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 681ff40cd..5afc3abe1 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e55c1c90d..4aada0b94 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index aec02f6cc..1c53c8ead 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 265d49d31..5b088287a 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index d45dd32dd..9c0cb0b54 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.108-SNAPSHOT + 3.12.108 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.108 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 0cb455422..bfbadc6db 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 454776ff3..34e871e23 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/nb/pom.xml b/nb/pom.xml index 015fc3b3d..d0514064c 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench engine-cli - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench engine-docs - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench engine-core - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench engine-extensions - 3.12.108-SNAPSHOT + 3.12.108 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench driver-diag - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench driver-tcp - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench driver-http - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench driver-cql-shaded - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench driver-cqlverify - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/pom.xml b/pom.xml index fa51dbb8a..e0816a246 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.108 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 54c424d1b..af40728a0 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 nb-api io.nosqlbench virtdata-lang - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 3e4972cae..f062e3393 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 238b25273..9675530a6 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index c6e847b73..146771852 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench virtdata-lib-basics - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d16337c86..e65063f37 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench virtdata-lib-basics - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index db6bf3ad0..3f9833b47 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 53989538b..bf6507548 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.108-SNAPSHOT + 3.12.108 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 6e5c5196e..a1c93ffc7 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench virtdata-lib-realer - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench virtdata-api - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench virtdata-lib-random - 3.12.108-SNAPSHOT + 3.12.108 io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 virtdata-lib-basics io.nosqlbench - 3.12.108-SNAPSHOT + 3.12.108 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.108-SNAPSHOT + 3.12.108 From fa846a3c9401e76e06003e8e02188b4c14e23108 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 20 May 2020 16:30:02 +0000 Subject: [PATCH 19/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index f7548ce53..a14353842 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.108 + 3.12.109-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index bd936250e..94cedc357 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 65c5ab841..3d776d217 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 1efc3b4a4..98edba036 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 5bb2a7d41..af4ef5038 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 22dc0ad0d..5eae38c96 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index f8c298b13..7911178ec 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench driver-stdout - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 3c5a070c3..8be2c0460 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index f0169567b..473c9f14a 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench nb-annotations - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 75483d10a..ad3bcc65c 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.108 + 3.12.109-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 5afc3abe1..357658220 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 4aada0b94..993c24d20 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 1c53c8ead..6d2ff528a 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 5b088287a..1839b5900 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 9c0cb0b54..117019f20 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.108 + 3.12.109-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.108 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index bfbadc6db..20c1b455e 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 34e871e23..eaf3de1b0 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index d0514064c..ab52253a5 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench engine-cli - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench engine-docs - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench engine-core - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench engine-extensions - 3.12.108 + 3.12.109-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench driver-diag - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench driver-tcp - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench driver-http - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/pom.xml b/pom.xml index e0816a246..34883c97e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.108 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index af40728a0..a5bcd7ec8 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index f062e3393..e7ffc8c44 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 9675530a6..27a2c77a3 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 146771852..82aad0bb4 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index e65063f37..916e13e8b 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 3f9833b47..05761cbd3 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index bf6507548..4f0354266 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.108 + 3.12.109-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index a1c93ffc7..c31941dfe 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench virtdata-api - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.108 + 3.12.109-SNAPSHOT io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.108 + 3.12.109-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.108 + 3.12.109-SNAPSHOT From d43941d10d4fc066e82dadf8615714625e587782 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 08:46:19 -0500 Subject: [PATCH 20/70] allow activities to set hdr-digits --- .../api/activityimpl/SimpleActivity.java | 2 +- .../engine/api/metrics/ActivityMetrics.java | 39 +++++++++++++++---- .../reference/activity_parameters.md | 20 ++++++++-- .../docs-for-nb/reference/command_line.md | 2 +- 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java index 73d1e57c0..19a267c96 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java @@ -244,7 +244,7 @@ public class SimpleActivity implements Activity { * by the provided ratios. Also, modify the ActivityDef with reasonable defaults when requested. * @param seq - The {@link OpSequence} to derive the defaults from */ - public void setDefaultsFromOpSequence(OpSequence seq) { + public void setDefaultsFromOpSequence(OpSequence seq) { Optional strideOpt = getParams().getOptionalString("stride"); if (strideOpt.isEmpty()) { String stride = String.valueOf(seq.getSequence().length); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java index f21e00fe0..e6a2db9c1 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java @@ -18,7 +18,6 @@ package io.nosqlbench.engine.api.metrics; import com.codahale.metrics.*; -import io.nosqlbench.engine.api.activityapi.core.Activity; import io.nosqlbench.engine.api.activityapi.core.MetricRegistryService; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.engine.api.util.Unit; @@ -37,6 +36,11 @@ import java.util.regex.Pattern; public class ActivityMetrics { private final static Logger logger = LoggerFactory.getLogger(ActivityMetrics.class); + + public static final String HDRDIGITS_PARAM = "hdr-digits"; + public static final int DEFAULT_HDRDIGITS= 4; + private static int _HDRDIGITS = DEFAULT_HDRDIGITS; + private static MetricRegistry registry; public static MetricFilter METRIC_FILTER = (name, metric) -> { @@ -44,14 +48,13 @@ public class ActivityMetrics { }; private static List metricsCloseables = new ArrayList<>(); - private static int significantDigits = 4; - public static int getSignificantDigits() { - return significantDigits; + public static int getHdrDigits() { + return _HDRDIGITS; } public static void setHdrDigits(int hdrDigits) { - ActivityMetrics.significantDigits = hdrDigits; + ActivityMetrics._HDRDIGITS = hdrDigits; } private ActivityMetrics() { @@ -99,6 +102,10 @@ public class ActivityMetrics { } /** *

Create a timer associated with an activity.

+ * + *

If the provide ActivityDef contains a parameter "hdr-digits", then it will be used to set the number of + * significant digits on the histogram's precision.

+ * *

This method ensures that if multiple threads attempt to create the same-named metric on a given activity, * that only one of them succeeds.

* @@ -109,15 +116,25 @@ public class ActivityMetrics { public static Timer timer(ActivityDef activityDef, String name) { String fullMetricName = activityDef.getAlias() + "." + name; Timer registeredTimer = (Timer) register(activityDef, name, () -> - new NicerTimer(fullMetricName, new DeltaHdrHistogramReservoir(fullMetricName, significantDigits))); + new NicerTimer(fullMetricName, + new DeltaHdrHistogramReservoir( + fullMetricName, + activityDef.getParams().getOptionalInteger(HDRDIGITS_PARAM).orElse(_HDRDIGITS) + ) + )); return registeredTimer; } /** - *

Create a histogram associated with an activity.

+ *

Create an HDR histogram associated with an activity.

+ * + *

If the provide ActivityDef contains a parameter "hdr-digits", then it will be used to set the number of + * significant digits on the histogram's precision.

+ * *

This method ensures that if multiple threads attempt to create the same-named metric on a given activity, * that only one of them succeeds.

* + * * @param activityDef an associated activity def * @param name a simple, descriptive name for the histogram * @return the histogram, perhaps a different one if it has already been registered @@ -125,7 +142,13 @@ public class ActivityMetrics { public static Histogram histogram(ActivityDef activityDef, String name) { String fullMetricName = activityDef.getAlias() + "." + name; return (Histogram) register(activityDef, name, () -> - new NicerHistogram(fullMetricName, new DeltaHdrHistogramReservoir(fullMetricName, significantDigits))); + new NicerHistogram( + fullMetricName, + new DeltaHdrHistogramReservoir( + fullMetricName, + activityDef.getParams().getOptionalInteger(HDRDIGITS_PARAM).orElse(_HDRDIGITS) + ) + )); } /** diff --git a/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md b/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md index 473ec5002..a6f90f9de 100644 --- a/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md +++ b/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md @@ -360,9 +360,21 @@ In detail, the rendering appears as `0.0(A), 0.0(B), 0.0(C), 0.25(A), 0.5(A), 0.5(B), 0.75(A)`, which yields `A B C A A B A` as the op sequence. -This sequencer is most useful when you want a stable ordering of -operation from a rich mix of statement types, where each operations is -spaced as evenly as possible over time, and where it is not important to -control the cycle-by-cycle sequencing of statements. +This sequencer is most useful when you want a stable ordering of operation from a rich mix of statement types, where +each operations is spaced as evenly as possible over time, and where it is not important to control the cycle-by-cycle +sequencing of statements. +## hdr-digits +- `hdr-digits=3` +- _default_: `4` +- _required_: no +- _dynamic_: no + +This parameter determines the number of significant digits used in all HDR histograms for metrics collected from this +activity. The default of 4 allows 4 significant digits, which means *up to* 10000 distinct histogram buckets per named +metric, per histogram interval. This does not mean that there _will be_ 10000 distinct buckets, but it means there could +be if there is significant volume and variety in the measurements. + +If you are running a scenario that creates many activities, then you can set `hdr-digits=1` on some of them to save +client resources. diff --git a/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md b/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md index 1d19dd04b..1e82e542a 100644 --- a/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md +++ b/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md @@ -160,7 +160,7 @@ you can do so this way: The default is 4 digits, which creates 10000 equisized histogram buckets for every named metric in every reporting interval. For longer running test or for test which do not require this level of precision in metrics, you can set this -down to 3 or 2. +down to 3 or 2. Note that this only sets the global default. Each activity can also override this value. Enlist engineblock to stand up your metrics infrastructure using a local docker runtime: From 9c8c053e8b5c1e28cb2bd6b0038938b7e717d096 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 08:47:43 -0500 Subject: [PATCH 21/70] updated release notes --- RELEASENOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ae8c9090a..3848afd66 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -6,3 +6,4 @@ de6c6b36 (origin/http-script-plugin, http-script-plugin) return types 39d6c50a http plugin for scripts c99b609a (origin/refactor-sslksfactory) Refactor SSLKsFactory 548b3a4e (HEAD -> master) make --hdr_digits configurable +d43941d1 (HEAD -> master) allow activities to set hdr-digits From c76837536e2cf8bcd59920bfc492111b5d6b1a7b Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 13:59:35 +0000 Subject: [PATCH 22/70] [maven-release-plugin] prepare release nosqlbench-3.12.109 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index a14353842..de839fde8 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.109-SNAPSHOT + 3.12.109 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 94cedc357..889b0c3f8 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 3d776d217..7c1eef517 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 98edba036..da7567d46 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index af4ef5038..9faa4bb3b 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 5eae38c96..8a9546d0d 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 7911178ec..a81106bf3 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench driver-stdout - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 8be2c0460..70dbfd336 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 473c9f14a..18a6738aa 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench nb-annotations - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench virtdata-userlibs - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index ad3bcc65c..8ed98dad9 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.109-SNAPSHOT + 3.12.109 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 357658220..ccfbf2ba1 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 993c24d20..19612ade2 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 6d2ff528a..e0e5896ad 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 1839b5900..eead8c652 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 117019f20..970d4f317 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.109-SNAPSHOT + 3.12.109 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.109 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 20c1b455e..42bff2780 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index eaf3de1b0..ca0688456 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/nb/pom.xml b/nb/pom.xml index ab52253a5..981ae7f07 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench engine-cli - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench engine-docs - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench engine-core - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench engine-extensions - 3.12.109-SNAPSHOT + 3.12.109 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench driver-diag - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench driver-tcp - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench driver-http - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench driver-cql-shaded - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench driver-cqlverify - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/pom.xml b/pom.xml index 34883c97e..001836213 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.109 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index a5bcd7ec8..713e6e59a 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 nb-api io.nosqlbench virtdata-lang - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index e7ffc8c44..22599dd1d 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 27a2c77a3..9b2ca16b1 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 82aad0bb4..2eab77ab9 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench virtdata-lib-basics - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 916e13e8b..74b8d3724 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench virtdata-lib-basics - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 05761cbd3..51684b477 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 4f0354266..839dae663 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.109-SNAPSHOT + 3.12.109 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index c31941dfe..28983c09e 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench virtdata-lib-realer - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench virtdata-api - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench virtdata-lib-random - 3.12.109-SNAPSHOT + 3.12.109 io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 virtdata-lib-basics io.nosqlbench - 3.12.109-SNAPSHOT + 3.12.109 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.109-SNAPSHOT + 3.12.109 From 9a2c045f5003e4dc899fda9f95e109ce9a972222 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 13:59:42 +0000 Subject: [PATCH 23/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index de839fde8..f87693466 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.109 + 3.12.110-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 889b0c3f8..9079adc70 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 7c1eef517..7f77a6b5c 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index da7567d46..6a0342085 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 9faa4bb3b..0215e0717 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8a9546d0d..9fd2c08f8 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index a81106bf3..8fdef8a90 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench driver-stdout - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 70dbfd336..5ff2880db 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 18a6738aa..7061af1ed 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench nb-annotations - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 8ed98dad9..1a1c8503a 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.109 + 3.12.110-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index ccfbf2ba1..4bb3d7aa0 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 19612ade2..0fad983e2 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index e0e5896ad..3eac466b0 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index eead8c652..f6c115955 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 970d4f317..74d569464 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.109 + 3.12.110-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.109 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 42bff2780..f6d1b5f40 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index ca0688456..9b56c5062 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 981ae7f07..109cdaff5 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench engine-cli - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench engine-docs - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench engine-core - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench engine-extensions - 3.12.109 + 3.12.110-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench driver-diag - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench driver-tcp - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench driver-http - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/pom.xml b/pom.xml index 001836213..0ff11a0f0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.109 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 713e6e59a..30132e574 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 22599dd1d..ffb78314d 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 9b2ca16b1..bbc5da9a1 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 2eab77ab9..e60b3ddec 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 74b8d3724..9a2266e31 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 51684b477..43194105d 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 839dae663..24fc7e45b 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.109 + 3.12.110-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 28983c09e..4c17261f4 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench virtdata-api - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.109 + 3.12.110-SNAPSHOT io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.109 + 3.12.110-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.109 + 3.12.110-SNAPSHOT From c66e511da4abbccdd850c32de0624708387f0f34 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 11:09:19 -0500 Subject: [PATCH 24/70] support hdr_digits instead of hdr-digits in activity params --- .../io/nosqlbench/engine/api/metrics/ActivityMetrics.java | 6 +++--- .../resources/docs-for-nb/reference/activity_parameters.md | 6 +++--- .../main/resources/docs-for-nb/reference/command_line.md | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java index e6a2db9c1..a6d3f55f8 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/metrics/ActivityMetrics.java @@ -37,7 +37,7 @@ public class ActivityMetrics { private final static Logger logger = LoggerFactory.getLogger(ActivityMetrics.class); - public static final String HDRDIGITS_PARAM = "hdr-digits"; + public static final String HDRDIGITS_PARAM = "hdr_digits"; public static final int DEFAULT_HDRDIGITS= 4; private static int _HDRDIGITS = DEFAULT_HDRDIGITS; @@ -103,7 +103,7 @@ public class ActivityMetrics { /** *

Create a timer associated with an activity.

* - *

If the provide ActivityDef contains a parameter "hdr-digits", then it will be used to set the number of + *

If the provide ActivityDef contains a parameter "hdr_digits", then it will be used to set the number of * significant digits on the histogram's precision.

* *

This method ensures that if multiple threads attempt to create the same-named metric on a given activity, @@ -128,7 +128,7 @@ public class ActivityMetrics { /** *

Create an HDR histogram associated with an activity.

* - *

If the provide ActivityDef contains a parameter "hdr-digits", then it will be used to set the number of + *

If the provide ActivityDef contains a parameter "hdr_digits", then it will be used to set the number of * significant digits on the histogram's precision.

* *

This method ensures that if multiple threads attempt to create the same-named metric on a given activity, diff --git a/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md b/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md index a6f90f9de..d51de83d7 100644 --- a/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md +++ b/engine-docs/src/main/resources/docs-for-nb/reference/activity_parameters.md @@ -364,9 +364,9 @@ This sequencer is most useful when you want a stable ordering of operation from each operations is spaced as evenly as possible over time, and where it is not important to control the cycle-by-cycle sequencing of statements. -## hdr-digits +## hdr_digits -- `hdr-digits=3` +- `hdr_digits=3` - _default_: `4` - _required_: no - _dynamic_: no @@ -376,5 +376,5 @@ activity. The default of 4 allows 4 significant digits, which means *up to* 1000 metric, per histogram interval. This does not mean that there _will be_ 10000 distinct buckets, but it means there could be if there is significant volume and variety in the measurements. -If you are running a scenario that creates many activities, then you can set `hdr-digits=1` on some of them to save +If you are running a scenario that creates many activities, then you can set `hdr_digits=1` on some of them to save client resources. diff --git a/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md b/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md index 1e82e542a..8da6d8904 100644 --- a/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md +++ b/engine-docs/src/main/resources/docs-for-nb/reference/command_line.md @@ -160,7 +160,8 @@ you can do so this way: The default is 4 digits, which creates 10000 equisized histogram buckets for every named metric in every reporting interval. For longer running test or for test which do not require this level of precision in metrics, you can set this -down to 3 or 2. Note that this only sets the global default. Each activity can also override this value. +down to 3 or 2. Note that this only sets the global default. Each activity can also override this value with the +hdr_digits parameter. Enlist engineblock to stand up your metrics infrastructure using a local docker runtime: From 1309766b661d6181f120a26164e7d65cdc933a0b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 11:21:06 -0500 Subject: [PATCH 25/70] updated release notes --- RELEASENOTES.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3848afd66..f92f85205 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,9 +1 @@ -c544d142 (HEAD -> master) fix csv test -ecfdcdee (origin/master, origin/HEAD) Release -de6c6b36 (origin/http-script-plugin, http-script-plugin) return types -442b5cbb fixed a docker-metrics bug that prevents grafana started by --docker-metrics on a Linux server from accessing prometheus in another docker container -3b6b88f9 overload post for null payload & no content type -39d6c50a http plugin for scripts -c99b609a (origin/refactor-sslksfactory) Refactor SSLKsFactory -548b3a4e (HEAD -> master) make --hdr_digits configurable -d43941d1 (HEAD -> master) allow activities to set hdr-digits +c66e511d (HEAD -> master) support hdr_digits instead of hdr-digits in activity params From b9acd7f485b2c0026cc48183ab1eecd63a696223 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 16:32:34 +0000 Subject: [PATCH 26/70] [maven-release-plugin] prepare release nosqlbench-3.12.110 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index f87693466..56d5f78d3 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.110-SNAPSHOT + 3.12.110 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 9079adc70..f511f0cfc 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 7f77a6b5c..de309b96d 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 6a0342085..816bad7b3 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 0215e0717..8691df01a 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 9fd2c08f8..d86af8523 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 8fdef8a90..c90cacebd 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench driver-stdout - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 5ff2880db..d93729618 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 7061af1ed..588ff5e61 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench nb-annotations - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench virtdata-userlibs - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 1a1c8503a..946b8f212 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.110-SNAPSHOT + 3.12.110 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 4bb3d7aa0..3a092b0de 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 0fad983e2..af1f63d73 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 3eac466b0..64226660b 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index f6c115955..5e9529dfc 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 74d569464..e81ec3f23 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.110-SNAPSHOT + 3.12.110 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.110 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index f6d1b5f40..bf1bb2811 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 9b56c5062..70cfb75ba 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/nb/pom.xml b/nb/pom.xml index 109cdaff5..796fedf18 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench engine-cli - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench engine-docs - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench engine-core - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench engine-extensions - 3.12.110-SNAPSHOT + 3.12.110 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench driver-diag - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench driver-tcp - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench driver-http - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench driver-cql-shaded - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench driver-cqlverify - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/pom.xml b/pom.xml index 0ff11a0f0..3502562af 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.110 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 30132e574..3a8538b84 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 nb-api io.nosqlbench virtdata-lang - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index ffb78314d..29d57b475 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index bbc5da9a1..2ee957946 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index e60b3ddec..7ba744b4a 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench virtdata-lib-basics - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 9a2266e31..3cafae1ad 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench virtdata-lib-basics - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 43194105d..81e617334 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 24fc7e45b..a6ee76dba 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.110-SNAPSHOT + 3.12.110 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 4c17261f4..d615da887 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench virtdata-lib-realer - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench virtdata-api - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench virtdata-lib-random - 3.12.110-SNAPSHOT + 3.12.110 io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 virtdata-lib-basics io.nosqlbench - 3.12.110-SNAPSHOT + 3.12.110 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.110-SNAPSHOT + 3.12.110 From 1de85d2a4b49d04c05b23060952e7da86432e7a9 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 16:32:41 +0000 Subject: [PATCH 27/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 56d5f78d3..67e79a9d0 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.110 + 3.12.111-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index f511f0cfc..6be7817c4 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index de309b96d..79b99e23e 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 816bad7b3..fe51b497e 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 8691df01a..14d9a3996 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index d86af8523..ae18912e3 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index c90cacebd..24bc37eac 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench driver-stdout - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index d93729618..0e92c0e1d 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 588ff5e61..875875506 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench nb-annotations - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 946b8f212..c22107f96 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.110 + 3.12.111-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 3a092b0de..409b38838 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index af1f63d73..0da4a7c47 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 64226660b..0c00cf41d 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 5e9529dfc..0258f0634 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index e81ec3f23..f2301407c 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.110 + 3.12.111-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.110 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index bf1bb2811..24bc1efff 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 70cfb75ba..ba71d05ea 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 796fedf18..4cc64765e 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench engine-cli - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench engine-docs - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench engine-core - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench engine-extensions - 3.12.110 + 3.12.111-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench driver-diag - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench driver-tcp - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench driver-http - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3502562af..49d17ea3d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.110 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 3a8538b84..e669b179c 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 29d57b475..0aa33f069 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 2ee957946..4364d9c19 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 7ba744b4a..4334800b3 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 3cafae1ad..05a1a3f48 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 81e617334..1abbe1edc 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index a6ee76dba..2174dae70 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.110 + 3.12.111-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index d615da887..595c051de 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench virtdata-api - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.110 + 3.12.111-SNAPSHOT io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.110 + 3.12.111-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.110 + 3.12.111-SNAPSHOT From 2e12eb193b2562987d302a47e2431079f5fc8d5e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 11:44:29 -0500 Subject: [PATCH 28/70] cleanup docker CI --- .github/workflows/docker.yml | 23 ----------------------- .github/workflows/dockerhub.yml | 27 ++++++++++++++++++--------- 2 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index bc63bdc68..000000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Docker Release - -on: - push: - tags: - - 'nosqlbench-*' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: Build nosqlbench docker - run: cd nb && docker build -t nosqlbench -f ./Dockerfile-build ./ - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: nosqlbench/nosqlbench - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - tag_names: true - dockerfile: Dockerfile - workdir: nb diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 281ca0576..9105ef7b2 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -1,23 +1,15 @@ -# This is a basic workflow to help you get started with Actions - name: dockerhub on: push: - # Sequence of patterns matched against refs/tags tags: - - 'nosqlbench-*' # Push events to matching nosqlbench-[version] + - nosqlbench-** -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" build: - # The type of runner that the job will run on runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - name: Login to DockerHub Registry run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin @@ -32,3 +24,20 @@ jobs: run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:latest - name: Push the latest Docker image run: docker push nosqlbench/nosqlbench:latest + +#jobs: (copied from docker.yml, this snippet references non-extant Dockerfile-build +# build: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@master +# - name: Build nosqlbench docker +# run: cd nb && docker build -t nosqlbench -f ./Dockerfile-build ./ +# - name: Publish to Registry +# uses: elgohr/Publish-Docker-Github-Action@master +# with: +# name: nosqlbench/nosqlbench +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# tag_names: true +# dockerfile: Dockerfile +# workdir: nb From 0918ee0b45c118470f9146d8b4f592d46db4248a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 11:44:55 -0500 Subject: [PATCH 29/70] updated release notes --- RELEASENOTES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index f92f85205..0cfb4e2ec 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1 +1,3 @@ -c66e511d (HEAD -> master) support hdr_digits instead of hdr-digits in activity params +2e12eb19 (HEAD -> master) cleanup docker CI +1309766b (origin/master, origin/HEAD) updated release notes +c66e511d support hdr_digits instead of hdr-digits in activity params From 8fb864ff6356a02408aa2cd17e089d4e52b0b38c Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 16:54:58 +0000 Subject: [PATCH 30/70] [maven-release-plugin] prepare release nosqlbench-3.12.111 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 67e79a9d0..69804db64 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.111-SNAPSHOT + 3.12.111 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 6be7817c4..cc72a92ae 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 79b99e23e..522d368ab 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index fe51b497e..17a3720f3 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 14d9a3996..cb77e0085 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index ae18912e3..e3e1e8210 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 24bc37eac..370579c87 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench driver-stdout - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 0e92c0e1d..5a60aba8d 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 875875506..37124be96 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench nb-annotations - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench virtdata-userlibs - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index c22107f96..a65a90abe 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.111-SNAPSHOT + 3.12.111 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 409b38838..1d9fdd217 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 0da4a7c47..381a2e3e0 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 0c00cf41d..91fa6a693 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 0258f0634..ec519bcd1 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index f2301407c..ac39ea625 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.111-SNAPSHOT + 3.12.111 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.111 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 24bc1efff..a2f5fa2af 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index ba71d05ea..f4d7726bf 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/nb/pom.xml b/nb/pom.xml index 4cc64765e..d8f709962 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench engine-cli - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench engine-docs - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench engine-core - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench engine-extensions - 3.12.111-SNAPSHOT + 3.12.111 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench driver-diag - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench driver-tcp - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench driver-http - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench driver-cql-shaded - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench driver-cqlverify - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/pom.xml b/pom.xml index 49d17ea3d..401ee989f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.111 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index e669b179c..efd360df5 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 nb-api io.nosqlbench virtdata-lang - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 0aa33f069..bd271fb56 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 4364d9c19..d489bc7dc 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 4334800b3..332526fdf 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench virtdata-lib-basics - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 05a1a3f48..fe3ea0204 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench virtdata-lib-basics - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 1abbe1edc..0946c2ee2 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 2174dae70..8a0e245e3 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.111-SNAPSHOT + 3.12.111 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 595c051de..f48e18f6d 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench virtdata-lib-realer - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench virtdata-api - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench virtdata-lib-random - 3.12.111-SNAPSHOT + 3.12.111 io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 virtdata-lib-basics io.nosqlbench - 3.12.111-SNAPSHOT + 3.12.111 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.111-SNAPSHOT + 3.12.111 From 7020bcf20d21a95ff5a7131b0542c15ffc014374 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 16:55:05 +0000 Subject: [PATCH 31/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 69804db64..02669990a 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.111 + 3.12.112-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index cc72a92ae..8607fc46b 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 522d368ab..d051d4a9d 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 17a3720f3..aa8501e93 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index cb77e0085..9ea7c758b 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index e3e1e8210..398f29954 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 370579c87..058184a8b 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench driver-stdout - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 5a60aba8d..198f1df6a 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 37124be96..3ebe626da 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench nb-annotations - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index a65a90abe..e7252fe31 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.111 + 3.12.112-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 1d9fdd217..ad9f7b53c 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 381a2e3e0..a9836101d 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 91fa6a693..7ed82539c 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index ec519bcd1..3e9b599ac 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index ac39ea625..87331b12d 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.111 + 3.12.112-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.111 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index a2f5fa2af..6bd147a0e 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index f4d7726bf..f6dec489f 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index d8f709962..ba2f79e94 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench engine-cli - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench engine-docs - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench engine-core - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench engine-extensions - 3.12.111 + 3.12.112-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench driver-diag - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench driver-tcp - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench driver-http - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/pom.xml b/pom.xml index 401ee989f..524ea65b1 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.111 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index efd360df5..596830ee7 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index bd271fb56..3762dbb90 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index d489bc7dc..703760965 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 332526fdf..8a91dc1a1 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index fe3ea0204..de9b08325 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 0946c2ee2..3e0a5788f 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 8a0e245e3..75544291f 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.111 + 3.12.112-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index f48e18f6d..55b8733d9 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench virtdata-api - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.111 + 3.12.112-SNAPSHOT io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.111 + 3.12.112-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.111 + 3.12.112-SNAPSHOT From 0877afc86b97340c72f4819712fc7caa89468fc1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 12:00:09 -0500 Subject: [PATCH 32/70] testing dockerhub --- .github/workflows/dockerpub.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/dockerpub.yml diff --git a/.github/workflows/dockerpub.yml b/.github/workflows/dockerpub.yml new file mode 100644 index 000000000..1dd3eb9a1 --- /dev/null +++ b/.github/workflows/dockerpub.yml @@ -0,0 +1,26 @@ +name: dockerpub + +on: + push: + tags: nosqlbench-** + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Login to DockerHub Registry + run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + - name: Get the version + id: vars + run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10}) + - name: Build the tagged Docker image + run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:${{steps.vars.outputs.tag}} + - name: Push the tagged Docker image + run: docker push nosqlbench/nosqlbench:${{steps.vars.outputs.tag}} + - name: Build the latest Docker image + run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:latest + - name: Push the latest Docker image + run: docker push nosqlbench/nosqlbench:latest + From 08489c55ea6337b7ff3e245b2e9f873a66dfcc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Est=C3=A9vez?= Date: Thu, 21 May 2020 14:34:50 -0400 Subject: [PATCH 33/70] Update docker ci on trigger --- .github/workflows/dockerpub.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockerpub.yml b/.github/workflows/dockerpub.yml index 1dd3eb9a1..337f7a81d 100644 --- a/.github/workflows/dockerpub.yml +++ b/.github/workflows/dockerpub.yml @@ -2,7 +2,9 @@ name: dockerpub on: push: - tags: nosqlbench-** + branches: master + paths: + - '!RELEASENOTES.**' jobs: build: From 3c29a80d353050d6d404cb75d3055f2698cf01df Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 14:12:55 -0500 Subject: [PATCH 34/70] updated release notes --- RELEASENOTES.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0cfb4e2ec..6fa22774d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,2 @@ -2e12eb19 (HEAD -> master) cleanup docker CI -1309766b (origin/master, origin/HEAD) updated release notes -c66e511d support hdr_digits instead of hdr-digits in activity params +08489c55 (HEAD -> master, origin/master, origin/HEAD) Update docker ci on trigger +0877afc8 testing dockerhub From 9be84d3f6a6cd39cfb0cf1e173f714189e1c7ca5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 14:23:07 -0500 Subject: [PATCH 35/70] enabled RELEASENOTES detection --- .github/workflows/dockerpub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerpub.yml b/.github/workflows/dockerpub.yml index 337f7a81d..d4466c90c 100644 --- a/.github/workflows/dockerpub.yml +++ b/.github/workflows/dockerpub.yml @@ -4,7 +4,7 @@ on: push: branches: master paths: - - '!RELEASENOTES.**' + - 'RELEASENOTES.**' jobs: build: From d0ae1dd286fcfc8ab912d887b43c0b0589403b6a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 14:28:43 -0500 Subject: [PATCH 36/70] updated release notes --- RELEASENOTES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6fa22774d..3d0be4a4a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,2 +1,4 @@ -08489c55 (HEAD -> master, origin/master, origin/HEAD) Update docker ci on trigger +9be84d3f (HEAD -> master, origin/master, origin/HEAD) enabled RELEASENOTES detection +3c29a80d updated release notes +08489c55 Update docker ci on trigger 0877afc8 testing dockerhub From 8e648eabf5260627547327b371248ae2e3ad3886 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 19:41:12 +0000 Subject: [PATCH 37/70] [maven-release-plugin] prepare release nosqlbench-3.12.112 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 02669990a..0b37a774e 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.112-SNAPSHOT + 3.12.112 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 8607fc46b..696ad1f3e 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index d051d4a9d..aabf96b98 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index aa8501e93..1122f3920 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 9ea7c758b..4d7b48149 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 398f29954..a2d9cf9f9 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 058184a8b..9674efbb5 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench driver-stdout - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 198f1df6a..e5997d5ad 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 3ebe626da..5f94e7f6b 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench nb-annotations - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench virtdata-userlibs - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index e7252fe31..887486059 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.112-SNAPSHOT + 3.12.112 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index ad9f7b53c..b5cd1bba1 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index a9836101d..abe46cbc8 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 7ed82539c..5231495c5 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 3e9b599ac..01858558a 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 87331b12d..d4181fcae 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.112-SNAPSHOT + 3.12.112 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.112 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 6bd147a0e..3041d60c7 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index f6dec489f..6959dbe30 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/nb/pom.xml b/nb/pom.xml index ba2f79e94..20ea34e37 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench engine-cli - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench engine-docs - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench engine-core - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench engine-extensions - 3.12.112-SNAPSHOT + 3.12.112 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench driver-diag - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench driver-tcp - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench driver-http - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench driver-cql-shaded - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench driver-cqlverify - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/pom.xml b/pom.xml index 524ea65b1..5f47471f4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.112 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 596830ee7..57e085051 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 nb-api io.nosqlbench virtdata-lang - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 3762dbb90..f019ee576 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 703760965..7a70065af 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 8a91dc1a1..914a8000c 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench virtdata-lib-basics - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index de9b08325..62ff64a06 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench virtdata-lib-basics - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 3e0a5788f..e99398351 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 75544291f..869bf29e3 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.112-SNAPSHOT + 3.12.112 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 55b8733d9..ed43ffd5d 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench virtdata-lib-realer - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench virtdata-api - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench virtdata-lib-random - 3.12.112-SNAPSHOT + 3.12.112 io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 virtdata-lib-basics io.nosqlbench - 3.12.112-SNAPSHOT + 3.12.112 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.112-SNAPSHOT + 3.12.112 From 62cc42da37aeb7609dadd31fe30288328ad31abc Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 19:41:20 +0000 Subject: [PATCH 38/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 0b37a774e..5ce695c20 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.112 + 3.12.113-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 696ad1f3e..c55f6cf14 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index aabf96b98..daac92eaf 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 1122f3920..abbba1510 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 4d7b48149..9ffed37c6 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index a2d9cf9f9..c06922063 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 9674efbb5..0feafaaa8 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench driver-stdout - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index e5997d5ad..9fdc40bbf 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 5f94e7f6b..476008d41 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench nb-annotations - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 887486059..2cc99ac96 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.112 + 3.12.113-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index b5cd1bba1..3cf2bb5b0 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index abe46cbc8..2c50b77db 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 5231495c5..0c292b436 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 01858558a..8873730fe 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index d4181fcae..a35257fef 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.112 + 3.12.113-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.112 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 3041d60c7..196872b52 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 6959dbe30..ca81bc597 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 20ea34e37..fe5780e4b 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench engine-cli - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench engine-docs - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench engine-core - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench engine-extensions - 3.12.112 + 3.12.113-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench driver-diag - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench driver-tcp - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench driver-http - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5f47471f4..5e19dd6d0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.112 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 57e085051..987368e1b 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index f019ee576..18e8f20bb 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 7a70065af..e09aba8b4 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 914a8000c..5cdb5b637 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 62ff64a06..f3a4898f2 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index e99398351..70e6f2670 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 869bf29e3..0ec836686 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.112 + 3.12.113-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index ed43ffd5d..fcb9f601e 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench virtdata-api - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.112 + 3.12.113-SNAPSHOT io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.112 + 3.12.113-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.112 + 3.12.113-SNAPSHOT From 55b21edc13b635caf601d1dd29f8ed8589074ad6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 15:18:10 -0500 Subject: [PATCH 39/70] streamline docker publish --- .github/workflows/dockerhub.yml | 68 ++++++++++++++++----------------- Dockerfile | 3 ++ nb/Dockerfile | 3 -- 3 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 Dockerfile delete mode 100644 nb/Dockerfile diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 9105ef7b2..fcaa5c2a6 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -1,43 +1,39 @@ name: dockerhub - on: - push: - tags: - - nosqlbench-** + release: + types: [published] jobs: - build: + + docker_push: + + name: docker_push runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Login to DockerHub Registry - run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - - name: Get the version - id: vars - run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10}) - - name: Build the tagged Docker image - run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:${{steps.vars.outputs.tag}} - - name: Push the tagged Docker image - run: docker push nosqlbench/nosqlbench:${{steps.vars.outputs.tag}} - - name: Build the latest Docker image - run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:latest - - name: Push the latest Docker image - run: docker push nosqlbench/nosqlbench:latest -#jobs: (copied from docker.yml, this snippet references non-extant Dockerfile-build -# build: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@master -# - name: Build nosqlbench docker -# run: cd nb && docker build -t nosqlbench -f ./Dockerfile-build ./ -# - name: Publish to Registry -# uses: elgohr/Publish-Docker-Github-Action@master -# with: -# name: nosqlbench/nosqlbench -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# tag_names: true -# dockerfile: Dockerfile -# workdir: nb + - uses: actions/checkout@v2 + name: checkout nosqlbench + - uses: actions/setup-java@v1 + name: setup java + with: + java-version: '14' + java-package: jdk + architecture: x64 + + - name: Cache Maven packages + uses: actions/cache@v1 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: mvn package + run: mvn package -DskipTests + + - name: Push to Docker Hub + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + repository: nosqlbench/nosqlbench + tag_with_ref: true diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..10b1df2c4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM openjdk:14-alpine +COPY nb/target/nb.jar nb.jar +ENTRYPOINT ["java","-jar", "nb.jar"] diff --git a/nb/Dockerfile b/nb/Dockerfile deleted file mode 100644 index 4c0c07e8d..000000000 --- a/nb/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM openjdk:13-alpine -COPY target/ target -ENTRYPOINT ["java","-jar", "/target/nb.jar"] From 14f6f9b46f9a2540573b337c0f0a004186c262d1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 15:18:26 -0500 Subject: [PATCH 40/70] update release notes --- RELEASENOTES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3d0be4a4a..4834454b7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -2,3 +2,9 @@ 3c29a80d updated release notes 08489c55 Update docker ci on trigger 0877afc8 testing dockerhub +55b21edc (HEAD -> master) streamline docker publish +d0ae1dd2 (origin/master, origin/HEAD) updated release notes +9be84d3f enabled RELEASENOTES detection +3c29a80d updated release notes +08489c55 Update docker ci on trigger +0877afc8 testing dockerhub From 95c4ccb9aec4b6aa6669761f3a8bad210e39b805 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 20:42:16 +0000 Subject: [PATCH 41/70] [maven-release-plugin] prepare release nosqlbench-3.12.113 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 5ce695c20..0d8141a38 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.113-SNAPSHOT + 3.12.113 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index c55f6cf14..427005230 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index daac92eaf..0ab0e4d04 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index abbba1510..431ef6617 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 9ffed37c6..6415eb94c 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index c06922063..8514f1e5e 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 0feafaaa8..166d2f1d0 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench driver-stdout - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 9fdc40bbf..4e01143fa 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 476008d41..f7cd98583 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench nb-annotations - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench virtdata-userlibs - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 2cc99ac96..adf7d8758 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.113-SNAPSHOT + 3.12.113 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 3cf2bb5b0..11c790b9f 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 2c50b77db..d092a5fca 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 0c292b436..495a29eba 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 8873730fe..a065bd8bd 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index a35257fef..657d0f677 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.113-SNAPSHOT + 3.12.113 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.113 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 196872b52..f04cf6dec 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index ca81bc597..4a25ec867 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/nb/pom.xml b/nb/pom.xml index fe5780e4b..8f1a3beb4 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench engine-cli - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench engine-docs - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench engine-core - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench engine-extensions - 3.12.113-SNAPSHOT + 3.12.113 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench driver-diag - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench driver-tcp - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench driver-http - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench driver-cql-shaded - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench driver-cqlverify - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/pom.xml b/pom.xml index 5e19dd6d0..05a70d4ff 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.113 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 987368e1b..9ed8c4ea5 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 nb-api io.nosqlbench virtdata-lang - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 18e8f20bb..cdeed47b3 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index e09aba8b4..da05d58d5 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 5cdb5b637..822ce34aa 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench virtdata-lib-basics - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index f3a4898f2..a8e53498c 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench virtdata-lib-basics - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 70e6f2670..b0f2d6a77 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 0ec836686..599d6cdc7 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.113-SNAPSHOT + 3.12.113 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index fcb9f601e..ad54d4939 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench virtdata-lib-realer - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench virtdata-api - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench virtdata-lib-random - 3.12.113-SNAPSHOT + 3.12.113 io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 virtdata-lib-basics io.nosqlbench - 3.12.113-SNAPSHOT + 3.12.113 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.113-SNAPSHOT + 3.12.113 From 9549df3aab027fc48e93dd7ee475f7f17aac1653 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 20:42:23 +0000 Subject: [PATCH 42/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 0d8141a38..b29a3aa29 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.113 + 3.12.114-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 427005230..5a6210ea5 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 0ab0e4d04..75e709ee8 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 431ef6617..16185a3ee 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 6415eb94c..23a078f87 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8514f1e5e..a77a15ca3 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 166d2f1d0..ba45447fe 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench driver-stdout - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 4e01143fa..055620cf2 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index f7cd98583..5f21ed4c3 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench nb-annotations - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index adf7d8758..a72c130d5 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.113 + 3.12.114-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 11c790b9f..09d5833a9 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index d092a5fca..3734ac588 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 495a29eba..c52a02cdf 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index a065bd8bd..1e8d926c8 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 657d0f677..1d9d0611d 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.113 + 3.12.114-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.113 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index f04cf6dec..ab0419b10 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 4a25ec867..af7204f96 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 8f1a3beb4..113055f15 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench engine-cli - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench engine-docs - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench engine-core - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench engine-extensions - 3.12.113 + 3.12.114-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench driver-diag - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench driver-tcp - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench driver-http - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/pom.xml b/pom.xml index 05a70d4ff..0bf2cabc5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.113 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 9ed8c4ea5..6c6cd08b6 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index cdeed47b3..6cf9713ed 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index da05d58d5..018192c2e 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 822ce34aa..a593013b0 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index a8e53498c..d09b9d4ea 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index b0f2d6a77..b98e99047 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 599d6cdc7..38548185c 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.113 + 3.12.114-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index ad54d4939..3271df1c6 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench virtdata-api - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.113 + 3.12.114-SNAPSHOT io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.113 + 3.12.114-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.113 + 3.12.114-SNAPSHOT From f649cc68cbeed1f5786070a716e42615720d3acf Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 21 May 2020 16:37:00 -0500 Subject: [PATCH 43/70] inline docker push --- .github/workflows/dockerhub.yml | 39 ------------------ .github/workflows/dockerpub.yml | 28 ------------- .github/workflows/release.yml | 73 +++++++++++++++++---------------- RELEASENOTES.md | 2 + 4 files changed, 39 insertions(+), 103 deletions(-) delete mode 100644 .github/workflows/dockerhub.yml delete mode 100644 .github/workflows/dockerpub.yml diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml deleted file mode 100644 index fcaa5c2a6..000000000 --- a/.github/workflows/dockerhub.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: dockerhub -on: - release: - types: [published] - -jobs: - - docker_push: - - name: docker_push - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v2 - name: checkout nosqlbench - - uses: actions/setup-java@v1 - name: setup java - with: - java-version: '14' - java-package: jdk - architecture: x64 - - - name: Cache Maven packages - uses: actions/cache@v1 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: mvn package - run: mvn package -DskipTests - - - name: Push to Docker Hub - uses: docker/build-push-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - repository: nosqlbench/nosqlbench - tag_with_ref: true diff --git a/.github/workflows/dockerpub.yml b/.github/workflows/dockerpub.yml deleted file mode 100644 index d4466c90c..000000000 --- a/.github/workflows/dockerpub.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: dockerpub - -on: - push: - branches: master - paths: - - 'RELEASENOTES.**' - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Login to DockerHub Registry - run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - - name: Get the version - id: vars - run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10}) - - name: Build the tagged Docker image - run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:${{steps.vars.outputs.tag}} - - name: Push the tagged Docker image - run: docker push nosqlbench/nosqlbench:${{steps.vars.outputs.tag}} - - name: Build the latest Docker image - run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:latest - - name: Push the latest Docker image - run: docker push nosqlbench/nosqlbench:latest - diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2da42c5a4..7b0934d3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,8 +9,12 @@ jobs: release: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + + - name: checkout repo + uses: actions/checkout@v2 + + - name: setup java + uses: actions/setup-java@v1 with: java-version: '14' java-package: jdk @@ -21,7 +25,7 @@ jobs: env: GIT_RELEASE_BOT_NAME: "nb-droid" - - name: capture tty + - name: capture tty for gpg run: | echo "::set-env name=TTY::"$(tty) echo "::set-env name=GPG_TTY::"$(tty) @@ -37,6 +41,7 @@ jobs: - name: set git username run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}" + - name: set git email run: git config --global user.name "${{ secrets.NBDROID_NAME }}" @@ -69,7 +74,7 @@ jobs: echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}" echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}" - - name: Prepare Summary + - name: prepare release summary id: prepare_summary run: | summary=$(scripts/release-notes.sh) @@ -111,25 +116,37 @@ jobs: MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }} MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }} - - - name: upload artifacts + - name: bundle artifacts run: | pwd ls -l mkdir staging && cp nb/target/nb.jar nb/target/nb staging - - uses: actions/upload-artifact@v1 + + - name: upload artifacts + uses: actions/upload-artifact@v1 with: name: binaries path: staging - - name: upload guidebook + - name: docker push + uses: docker/build-push-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + repository: nosqlbench/nosqlbench + tags: latest, ${{ env.RELEASE_VERSION }} + tag_with_ref: false + + - name: bundle guidebook run: mkdir guidebook && cp -R nb/target/guidebook guidebook - - uses: actions/upload-artifact@v1 + + - name: upload guidebook + uses: actions/upload-artifact@v1 with: name: guidebook path: guidebook - - name: Create Release + - name: create release id: create_release uses: actions/create-release@v1 env: @@ -140,7 +157,8 @@ jobs: draft: false prerelease: false body: ${{ steps.prepare_summary.outputs.release_summary }} - - name: Upload nb.jar + + - name: upload nb.jar id: upload-nb-jar uses: actions/upload-release-asset@v1 env: @@ -150,7 +168,8 @@ jobs: asset_path: nb/target/nb.jar asset_name: nb.jar asset_content_type: application/octet-stream - - name: Upload nb + + - name: upload nb binary id: upload-nb-binary uses: actions/upload-release-asset@v1 env: @@ -161,43 +180,25 @@ jobs: asset_name: nb asset_content_type: application/octet-stream -# - name: find latest release -# run: | -# LATEST_GH_RELEASE_ID=$(curl --silent "https://api.github.com/repos/nosqlbench/nosqlbench/releases/latest" | jq -r .id) -# echo "::set-env name=LATEST_GH_RELEASE_ID::${LATEST_GH_RELEASE_ID}" -# - name: upload jar -# uses: actions/upload-release-asset@v1 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# asset_path: nb/target/nb.jar -# asset_name: nb.jar -# asset_content_type: application/octet-stream -# upload_url: https://uploads.github.com/repos/nosqlbench/nosqlbench/releases/${{ env.LATEST_GH_RELEASE_ID }}/assets{?name,label} -# - name: upload binary -# uses: actions/upload-release-asset@v1 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# asset_path: nb/target/nb -# asset_name: nb -# asset_content_type: application/octet-stream -# upload_url: https://uploads.github.com/repos/nosqlbench/nosqlbench/releases/${{ env.LATEST_GH_RELEASE_ID }}/assets{?name,label} - docs: needs: release runs-on: ubuntu-18.04 steps: + - name: set git username run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}" + - name: set git email run: git config --global user.name "${{ secrets.NBDROID_NAME }}" + - name: download guidebook uses: actions/download-artifact@v1 with: name: guidebook path: guidebook + - run: ls -la + - name: clone nosqlbench-docs env: NBDROID_NAME: ${{ secrets.NBDROID_NAME }} @@ -209,6 +210,7 @@ jobs: find . git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git git remote -v + - name: push changes env: NBDROID_NAME: ${{ secrets.NBDROID_NAME }} @@ -229,4 +231,3 @@ jobs: - diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4834454b7..6fcaebb00 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -8,3 +8,5 @@ d0ae1dd2 (origin/master, origin/HEAD) updated release notes 3c29a80d updated release notes 08489c55 Update docker ci on trigger 0877afc8 testing dockerhub +14f6f9b4 update release notes +55b21edc streamline docker publish From ccd0e22a7179f4cc9bd13f2617e43214fd8258da Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 21:48:21 +0000 Subject: [PATCH 44/70] [maven-release-plugin] prepare release nosqlbench-3.12.114 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index b29a3aa29..8eefaa29a 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.114-SNAPSHOT + 3.12.114 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 5a6210ea5..c5a662c89 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 75e709ee8..1f7d29050 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 16185a3ee..3e0f44c6e 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 23a078f87..774bfbc23 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index a77a15ca3..dd3df3f50 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index ba45447fe..68d6df40f 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench driver-stdout - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 055620cf2..fae0c1956 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 5f21ed4c3..4784114ab 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench nb-annotations - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench virtdata-userlibs - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index a72c130d5..de49df8dc 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.114-SNAPSHOT + 3.12.114 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 09d5833a9..abf44301c 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 3734ac588..b9d5c37d9 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index c52a02cdf..fe6eaad9b 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 1e8d926c8..bb34a8363 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 1d9d0611d..0a9419762 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.114-SNAPSHOT + 3.12.114 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.114 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index ab0419b10..62dcbc2d5 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index af7204f96..2717dff53 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/nb/pom.xml b/nb/pom.xml index 113055f15..f6c707b4c 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench engine-cli - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench engine-docs - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench engine-core - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench engine-extensions - 3.12.114-SNAPSHOT + 3.12.114 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench driver-diag - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench driver-tcp - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench driver-http - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench driver-cql-shaded - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench driver-cqlverify - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/pom.xml b/pom.xml index 0bf2cabc5..9c436a7d1 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.114 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 6c6cd08b6..fde1547aa 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 nb-api io.nosqlbench virtdata-lang - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 6cf9713ed..ec99777bf 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 018192c2e..be3eae855 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index a593013b0..5741cc85d 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench virtdata-lib-basics - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index d09b9d4ea..770ade4e0 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench virtdata-lib-basics - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index b98e99047..b0bd4f308 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 38548185c..0f0b2642e 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.114-SNAPSHOT + 3.12.114 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 3271df1c6..6b863add0 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench virtdata-lib-realer - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench virtdata-api - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench virtdata-lib-random - 3.12.114-SNAPSHOT + 3.12.114 io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 virtdata-lib-basics io.nosqlbench - 3.12.114-SNAPSHOT + 3.12.114 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.114-SNAPSHOT + 3.12.114 From a5f6f9152f342ebcef94315fb862c84e92641793 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 21 May 2020 21:48:27 +0000 Subject: [PATCH 45/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 8eefaa29a..4d8dd5a3f 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.114 + 3.12.115-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index c5a662c89..e8847cbbd 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 1f7d29050..7c83faf6f 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 3e0f44c6e..95624d558 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 774bfbc23..06179d80a 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index dd3df3f50..8dabed058 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 68d6df40f..3e188f765 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench driver-stdout - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index fae0c1956..3e22283bd 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 4784114ab..063096d39 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench nb-annotations - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index de49df8dc..530fe79c2 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.114 + 3.12.115-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index abf44301c..5970ff941 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index b9d5c37d9..51f1ad422 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index fe6eaad9b..117d19674 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index bb34a8363..760bf8ec6 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 0a9419762..a6f139044 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.114 + 3.12.115-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.114 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 62dcbc2d5..d02ddfecd 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 2717dff53..a7067a0e8 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index f6c707b4c..4b752ae8e 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench engine-cli - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench engine-docs - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench engine-core - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench engine-extensions - 3.12.114 + 3.12.115-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench driver-diag - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench driver-tcp - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench driver-http - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9c436a7d1..6f1964998 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.114 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index fde1547aa..38ace6300 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index ec99777bf..be6c6c4e5 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index be3eae855..64bd68555 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 5741cc85d..35f4c24e0 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 770ade4e0..8745a5913 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index b0bd4f308..26e79c42c 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 0f0b2642e..01cded4e3 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.114 + 3.12.115-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 6b863add0..678a709a2 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench virtdata-api - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.114 + 3.12.115-SNAPSHOT io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.114 + 3.12.115-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.114 + 3.12.115-SNAPSHOT From 65d307b83b77f21ae17b8cf25d38b16820f1f963 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 26 May 2020 13:59:03 -0500 Subject: [PATCH 46/70] flatten this in --- .../cqld4/config/CQLD4OptionsMapper.java | 16 ++++++++++++++++ .../cqld4/statements/core/CQLSessionCache.java | 14 +++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java new file mode 100644 index 000000000..bf8d06aad --- /dev/null +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java @@ -0,0 +1,16 @@ +package io.nosqlbench.activitytype.cqld4.config; + +import com.datastax.oss.driver.api.core.config.TypedDriverOption; + +import java.lang.reflect.Field; +import java.util.List; +import java.util.stream.StreamSupport; + +public class CQLD4OptionsMapper { + + public List> findOptions() { + Field[] fields = TypedDriverOption.class.getFields(); + ... + + } +} diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java index a8f9ffcfe..2fe58c66d 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java @@ -2,10 +2,7 @@ package io.nosqlbench.activitytype.cqld4.statements.core; import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.CqlSessionBuilder; -import com.datastax.oss.driver.api.core.config.DriverConfig; -import com.datastax.oss.driver.api.core.config.DriverConfigLoader; -import com.datastax.oss.driver.api.core.config.DriverOption; -import com.datastax.oss.driver.api.core.config.OptionsMap; +import com.datastax.oss.driver.api.core.config.*; import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.retry.RetryPolicy; @@ -95,11 +92,14 @@ public class CQLSessionCache implements Shutdownable { // DriverConfigLoader cl = DriverConfigLoader.fromMap(defaults); // DriverConfig cfg = cl.getInitialConfig(); + OptionsMap optionsMap = new OptionsMap(); + optionsMap.put(TypedDriverOption.CONTINUOUS_PAGING_TIMEOUT_OTHER_PAGES,) + OptionsMap source = OptionsMap.driverDefaults(); + optionsMap.put() - DriverConfigLoader alldefaults = DriverConfigLoader.fromMap(OptionsMap.driverDefaults()); - - ConfigFactory.defaultApplication().withFallback(alldefaults.getInitialConfig().getDefaultProfile().). + DriverConfigLoader alldefaults = DriverConfigLoader.fromMap(source); + alldefaults. DriverConfigLoader.fromMap() builder.withConfigLoader(DriverConfigLoader.fromMap().) From 89c0638b5e40aa5399ec6ef133cbfff1a94551d0 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 12:35:00 -0500 Subject: [PATCH 47/70] relax format for bindings-probcurves example --- nb/src/main/resources/examples/bindings-probcurves.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/src/main/resources/examples/bindings-probcurves.yaml b/nb/src/main/resources/examples/bindings-probcurves.yaml index 62f48c3ee..b9d6d1694 100644 --- a/nb/src/main/resources/examples/bindings-probcurves.yaml +++ b/nb/src/main/resources/examples/bindings-probcurves.yaml @@ -4,7 +4,7 @@ description: | scenarios: default: - readout1: run driver===stdout format===readout cycles=1 + readout1: run driver===stdout format=readout cycles=1 bindings: cycle: Identity() From c91042fc016ba4312dd8fae444feccd2cfebb9c5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 12:36:38 -0500 Subject: [PATCH 48/70] reorg docs sketches --- devdocs/{ => docstructure}/bundled_docs.md | 0 devdocs/docstructure/docsketch.md | 36 ++++++++++++++++++++++ devdocs/{ => docstructure}/docsys.md | 0 3 files changed, 36 insertions(+) rename devdocs/{ => docstructure}/bundled_docs.md (100%) create mode 100644 devdocs/docstructure/docsketch.md rename devdocs/{ => docstructure}/docsys.md (100%) diff --git a/devdocs/bundled_docs.md b/devdocs/docstructure/bundled_docs.md similarity index 100% rename from devdocs/bundled_docs.md rename to devdocs/docstructure/bundled_docs.md diff --git a/devdocs/docstructure/docsketch.md b/devdocs/docstructure/docsketch.md new file mode 100644 index 000000000..24af27e0b --- /dev/null +++ b/devdocs/docstructure/docsketch.md @@ -0,0 +1,36 @@ +# Doc System + +This is a consolidation of all the doc system work thus far. This draft is meant to outline the basic features of the +doc system at a high level, but with suitable detail for an initial refactoring. In general this builds on existing work +in the doc system but with some adaptations for current needs, across CLI, apps, and reference material. + +## Content Organization + +All content loaded from any source is organized internally into a tree of sections by: + +* Front Matter Topics +* Header Level + +The source path of content does not matter. However, each unit of source material is considered its own section, with +zero or more additional subsections. + +A root section is the container of all sections which are not homed under another section. + +## Headings + +In some cases, it is appropriate to consolidate individual docs into larger views. In order to facilitate this, all +sections within markdown structure are enumerated according to + +- The front matter in the content source, specifically the topics assigned +- The heading structure within the doc + +Thus, when the doc content is processed into the cohesive view needed by a user, all sections of all provided content +are cross-referenced and organized into sections. + +The location of a document within the source filesystem or archive is not important. Topics + +## Content Naming + + + +## Content Searching diff --git a/devdocs/docsys.md b/devdocs/docstructure/docsys.md similarity index 100% rename from devdocs/docsys.md rename to devdocs/docstructure/docsys.md From 9a6f797364b0c2f743d9f5dc1ed8015fe1f609a2 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 12:36:46 -0500 Subject: [PATCH 49/70] WIP on cqld4 --- .../cqld4/config/CQLD4OptionsMapper.java | 88 +++++++++++++++++-- .../statements/core/CQLSessionCache.java | 20 ++--- 2 files changed, 88 insertions(+), 20 deletions(-) diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java index bf8d06aad..8756050ff 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/config/CQLD4OptionsMapper.java @@ -1,16 +1,92 @@ package io.nosqlbench.activitytype.cqld4.config; +import com.datastax.oss.driver.api.core.config.DriverOption; +import com.datastax.oss.driver.api.core.config.OptionsMap; import com.datastax.oss.driver.api.core.config.TypedDriverOption; +import com.datastax.oss.driver.api.core.data.CqlDuration; -import java.lang.reflect.Field; -import java.util.List; -import java.util.stream.StreamSupport; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.time.*; +import java.util.UUID; public class CQLD4OptionsMapper { - public List> findOptions() { - Field[] fields = TypedDriverOption.class.getFields(); - ... + public static void apply(OptionsMap optionsMap, String name, String value) { + for (TypedDriverOption builtin : TypedDriverOption.builtInValues()) { + DriverOption rawOption = builtin.getRawOption(); + String path = rawOption.getPath(); + if (name.equals(path)) { + Class rawType = builtin.getExpectedType().getRawType(); + Object convertedValue = adaptTypeValue(value, rawType, name); + TypedDriverOption option = (TypedDriverOption) builtin; + optionsMap.put(option, convertedValue); + return; + } + } + + throw new RuntimeException("Driver option " + name + " was not found in the available options."); } + + private static Object adaptTypeValue(String value, Class rawOption, String optionName) { + switch (rawOption.getCanonicalName()) { + case "java.lang.Boolean": + return Boolean.parseBoolean(value); + case "java.lang.Byte": + return Byte.parseByte(value); + case "java.lang.Double": + return Double.parseDouble(value); + case "java.lang.Float": + return Float.parseFloat(value); + case "java.lang.Integer": + return Integer.parseInt(value); + case "java.lang.Long": + return Long.parseLong(value); + case "java.lang.Short": + return Short.parseShort(value); + case "java.time.Instant": + return Instant.parse(value); + case "java.time.ZonedDateTime": + return ZonedDateTime.parse(value); + case "java.time.LocalDate": + return LocalDate.parse(value); + case "java.time.LocalTime": + return LocalTime.parse(value); + case "java.nio.ByteBuffer": + return ByteBuffer.wrap(value.getBytes(StandardCharsets.UTF_8)); // What else to do here? + case "java.lang.String": + return value; + case "java.math.BigInteger": + return new BigInteger(value); + case "java.math.BigDecimal": + return new BigDecimal(value); + case "java.util.UUID": + return UUID.fromString(value); + case "java.net.InetAddress": + try { + return InetAddress.getByName(value); + } catch (UnknownHostException e) { + throw new RuntimeException(e); + } + case "com.datastax.oss.driver.api.core.data.CqlDuration": + return CqlDuration.from(value); + case "java.time.Duration:": + return Duration.parse(value); + default: +// These appear to be valid types, but there is no record of them used in driver configuration, +// nor a convenient way to convert them directly from known type and string value without invoking +// connected metadata machinery from an active session. +// case "com.datastax.oss.driver.api.core.data.TupleValue": +// case "com.datastax.oss.driver.api.core.data.UdtValue": + + throw new RuntimeException("The type converter for driver option named " + optionName + " was not " + + "found, or is unimplemented. Please file an issue at nosqlbench.io"); + } + } + } diff --git a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java index 2fe58c66d..bd985958f 100644 --- a/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java +++ b/driver-cqld4/src/main/java/io/nosqlbench/activitytype/cqld4/statements/core/CQLSessionCache.java @@ -8,6 +8,7 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; +import com.datastax.oss.driver.internal.core.config.map.MapBasedDriverConfigLoader; import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; import com.datastax.oss.driver.internal.core.retry.DefaultRetryPolicy; import com.typesafe.config.ConfigFactory; @@ -83,8 +84,8 @@ public class CQLSessionCache implements Shutdownable { // TODO: Figure out how to layer configs with the new TypeSafe Config layer in the Datastax Java Driver // TODO: Or give up and bulk import options into the map, because the config API is a labyrinth -// -// CqlSessionBuilder builder = CqlSession.builder(); + + CqlSessionBuilder builder = CqlSession.builder(); // // OptionsMap optionsMap = new OptionsMap(); // @@ -92,19 +93,10 @@ public class CQLSessionCache implements Shutdownable { // DriverConfigLoader cl = DriverConfigLoader.fromMap(defaults); // DriverConfig cfg = cl.getInitialConfig(); - OptionsMap optionsMap = new OptionsMap(); - optionsMap.put(TypedDriverOption.CONTINUOUS_PAGING_TIMEOUT_OTHER_PAGES,) - OptionsMap source = OptionsMap.driverDefaults(); - optionsMap.put() - - DriverConfigLoader alldefaults = DriverConfigLoader.fromMap(source); - - alldefaults. - DriverConfigLoader.fromMap() - - builder.withConfigLoader(DriverConfigLoader.fromMap().) - + OptionsMap optionsMap = OptionsMap.driverDefaults(); + builder.withConfigLoader(new MapBasedDriverConfigLoader()) + builder.withConfigLoader(optionsMap); Optional scb = activityDef.getParams().getOptionalString("secureconnectbundle") From 9291ec4e089e39ba9a68dd4acb33d183a7e5ac36 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 12:37:11 -0500 Subject: [PATCH 50/70] fix for bug #148 --- .../userlibs/apps/docsapp/VirtDataGenDocsApp.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java index 1d71a1a61..3658c8f36 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java @@ -116,7 +116,8 @@ public class VirtDataGenDocsApp implements Runnable { Gson gson = new GsonBuilder().setPrettyPrinting().create(); writer.append(gson.toJson(docsForFuncName)); } else if (format.equals(FORMAT_MARKDOWN)) { - writer.append(docsForFuncName.asMarkdown()); + String markdown = docsForFuncName.asMarkdown(); + writer.append(markdown); } } } @@ -165,10 +166,12 @@ public class VirtDataGenDocsApp implements Runnable { FDoc docsinfo = new FDoc(); List allDocs = VirtDataDocs.getAllDocs(); for (DocFuncData docFuncData : allDocs) { - FDocFunc FDocFunc = new FDocFunc(docFuncData); - for (Category categoryName : FDocFunc.getCategories()) { + FDocFunc fDocFunc = new FDocFunc(docFuncData); + Set categories = + fDocFunc.getCategories().size()==0 ? Set.of(Category.general) : fDocFunc.getCategories(); + for (Category categoryName : categories) { FDocCat fDocCat = docsinfo.addCategory(categoryName.toString()); - fDocCat.addFunctionDoc(FDocFunc); + fDocCat.addFunctionDoc(fDocFunc); } } return docsinfo; From 4b84a31520886e2ec132248ea5891ded04f03114 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 12:41:55 -0500 Subject: [PATCH 51/70] updated release notes --- RELEASENOTES.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6fcaebb00..e9438f2d7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,12 +1,5 @@ -9be84d3f (HEAD -> master, origin/master, origin/HEAD) enabled RELEASENOTES detection -3c29a80d updated release notes -08489c55 Update docker ci on trigger -0877afc8 testing dockerhub -55b21edc (HEAD -> master) streamline docker publish -d0ae1dd2 (origin/master, origin/HEAD) updated release notes -9be84d3f enabled RELEASENOTES detection -3c29a80d updated release notes -08489c55 Update docker ci on trigger -0877afc8 testing dockerhub -14f6f9b4 update release notes -55b21edc streamline docker publish +9291ec4e fix for bug #148 +9a6f7973 WIP on cqld4 +c91042fc reorg docs sketches +89c0638b relax format for bindings-probcurves example +65d307b8 flatten this in From ae62127e405ecf874eb81facfef4e0c75cdbe624 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 27 May 2020 17:58:27 +0000 Subject: [PATCH 52/70] [maven-release-plugin] prepare release nosqlbench-3.12.115 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 4d8dd5a3f..b270507d8 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.115-SNAPSHOT + 3.12.115 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index e8847cbbd..abde6ded2 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 7c83faf6f..1c57d575a 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 95624d558..631709c17 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 06179d80a..fc1a602f8 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8dabed058..62ff0eb94 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 3e188f765..e2a7c154d 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench driver-stdout - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 3e22283bd..d4a3e2d35 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 063096d39..11b53fbd4 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench nb-annotations - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench virtdata-userlibs - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 530fe79c2..01a7ae35a 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.115-SNAPSHOT + 3.12.115 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 5970ff941..1d4bb1dcb 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 51f1ad422..660354158 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 117d19674..6e15d54e5 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 760bf8ec6..8f9e61076 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index a6f139044..011d50323 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.115-SNAPSHOT + 3.12.115 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.115 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index d02ddfecd..f5ceb6fe4 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index a7067a0e8..2b0aff572 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/nb/pom.xml b/nb/pom.xml index 4b752ae8e..6d6f05cc2 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench engine-cli - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench engine-docs - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench engine-core - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench engine-extensions - 3.12.115-SNAPSHOT + 3.12.115 @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench driver-diag - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench driver-tcp - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench driver-http - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench driver-cql-shaded - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench driver-cqlverify - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/pom.xml b/pom.xml index 6f1964998..7c8ba4461 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.115 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 38ace6300..a1724d9e3 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 nb-api io.nosqlbench virtdata-lang - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index be6c6c4e5..509a05ab9 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 64bd68555..ba39af725 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 35f4c24e0..3fb1a856b 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench virtdata-lib-basics - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 8745a5913..532b9ef17 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench virtdata-lib-basics - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 26e79c42c..e2f888513 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 01cded4e3..b53308881 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.115-SNAPSHOT + 3.12.115 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 678a709a2..e512445b2 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench virtdata-lib-realer - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench virtdata-api - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench virtdata-lib-random - 3.12.115-SNAPSHOT + 3.12.115 io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 virtdata-lib-basics io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.115 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.115-SNAPSHOT + 3.12.115 From 51bd321c10e6d3397c72b905c3457461393e5a3d Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 27 May 2020 17:58:34 +0000 Subject: [PATCH 53/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 24 ++++++++++++------------ 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 ++++++++-------- 27 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index b270507d8..d6174e625 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.115 + 3.12.116-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index abde6ded2..247820048 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 1c57d575a..621d0eb8b 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 631709c17..b80a59571 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index fc1a602f8..c80839436 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 62ff0eb94..a53bdbd8a 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index e2a7c154d..802e3e62f 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench driver-stdout - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index d4a3e2d35..2c755e27f 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 11b53fbd4..6811a3812 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench nb-annotations - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 01a7ae35a..40eb974d3 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.115 + 3.12.116-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 1d4bb1dcb..b405321b0 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 660354158..e155b3f21 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 6e15d54e5..40c8c89d0 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 8f9e61076..2a30932af 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 011d50323..8c64948c4 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.115 + 3.12.116-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.115 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index f5ceb6fe4..1d79784d5 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 2b0aff572..f6e15c93a 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 6d6f05cc2..4cb181d48 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -24,31 +24,31 @@ io.nosqlbench driver-web - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench engine-cli - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench engine-docs - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench engine-core - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench engine-extensions - 3.12.115 + 3.12.116-SNAPSHOT @@ -60,37 +60,37 @@ io.nosqlbench driver-stdout - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench driver-diag - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench driver-tcp - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench driver-http - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7c8ba4461..b5846a97f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT mvn-defaults @@ -113,7 +113,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.115 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index a1724d9e3..8c28438ff 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 509a05ab9..1932cc156 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index ba39af725..bbfbbd3e3 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 3fb1a856b..00ca4959d 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 532b9ef17..b7b128220 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index e2f888513..6d730f737 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index b53308881..af00c75e8 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.115 + 3.12.116-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index e512445b2..2878ea89b 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench virtdata-api - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.115 + 3.12.116-SNAPSHOT io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.115 + 3.12.116-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.115 + 3.12.116-SNAPSHOT From f22407460d26364c763280afc05217f82f0cb75e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 13:30:49 -0500 Subject: [PATCH 54/70] minor refinements to kafka producer --- driver-http/pom.xml | 1 + driver-kafka/pom.xml | 85 +++++++++++++++++++ .../kafkaproducer/KafkaProducerActivity.java | 68 +++++++++++++++ .../KafkaProducerActivityType.java | 40 +++++++++ .../src/main/resources/kafkaproducer.md | 32 +++++++ .../designing_workloads/10_named_scenarios.md | 2 +- nb/pom.xml | 5 ++ pom.xml | 1 + 8 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 driver-kafka/pom.xml create mode 100644 driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java create mode 100644 driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivityType.java create mode 100644 driver-kafka/src/main/resources/kafkaproducer.md diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 06179d80a..5d3bd4491 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -18,6 +18,7 @@ + io.nosqlbench engine-api diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml new file mode 100644 index 000000000..9be94973b --- /dev/null +++ b/driver-kafka/pom.xml @@ -0,0 +1,85 @@ + + 4.0.0 + + + mvn-defaults + io.nosqlbench + 3.12.115-SNAPSHOT + ../mvn-defaults + + + driver-kafka + jar + ${project.artifactId} + + + A Kafka driver for nosqlbench. This provides the ability to inject synthetic data + into a kafka topic. + + + + + + + + org.apache.kafka + kafka-clients + 2.0.0 + + + + io.nosqlbench + engine-api + 3.12.115-SNAPSHOT + + + + io.nosqlbench + driver-stdout + 3.12.115-SNAPSHOT + + + + org.slf4j + slf4j-api + 1.7.25 + + + + + + org.testng + testng + 6.13.1 + test + + + + org.assertj + assertj-core-java8 + 1.0.0m1 + test + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java new file mode 100644 index 000000000..907fa786a --- /dev/null +++ b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivity.java @@ -0,0 +1,68 @@ +package com.datastax.ebdrivers.kafkaproducer; + +import io.nosqlbench.activitytype.stdout.StdoutActivity; +import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import org.apache.kafka.clients.producer.*; +import org.apache.kafka.common.serialization.LongSerializer; +import org.apache.kafka.common.serialization.StringSerializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.Properties; +import java.util.concurrent.Future; +import java.util.stream.Collectors; + +public class KafkaProducerActivity extends StdoutActivity { + private final static Logger logger = LoggerFactory.getLogger(KafkaProducerActivity.class); + private Producer producer = null; + private String topic; + + public KafkaProducerActivity(ActivityDef activityDef) { + super(activityDef); + } + + public synchronized Producer getKafkaProducer() { + if (producer!=null) { + return producer; + } + Properties props = new Properties(); + String servers = Arrays.stream(activityDef.getParams().getOptionalString("host","hosts") + .orElse("localhost" + ":9092") + .split(",")) + .map(x -> x.indexOf(':') == -1 ? x + ":9092" : x) + .collect(Collectors.joining(",")); + String clientId = activityDef.getParams().getOptionalString("clientid","client.id","client_id") + .orElse("TestProducerClientId"); + String key_serializer = + activityDef.getParams().getOptionalString("key_serializer").orElse(LongSerializer.class.getName()); + String value_serializer = + activityDef.getParams().getOptionalString("value_serializer").orElse(StringSerializer.class.getName()); + + props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, servers); + props.put(ProducerConfig.CLIENT_ID_CONFIG, clientId); + props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, key_serializer); + props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, value_serializer); + + producer = new KafkaProducer<>(props); + return producer; + } + + @Override + public synchronized void write(String statement) { + Producer kafkaProducer = getKafkaProducer(); + ProducerRecord record = new ProducerRecord<>(topic, statement); + Future send = kafkaProducer.send(record); + try { + RecordMetadata result = send.get(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public void onActivityDefUpdate(ActivityDef activityDef) { + this.topic = activityDef.getParams().getOptionalString("topic").orElse("default-topic"); + super.onActivityDefUpdate(activityDef); + } +} diff --git a/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivityType.java b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivityType.java new file mode 100644 index 000000000..ad62a29a4 --- /dev/null +++ b/driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaProducerActivityType.java @@ -0,0 +1,40 @@ +package com.datastax.ebdrivers.kafkaproducer; + +import io.nosqlbench.activitytype.stdout.StdoutAction; +import io.nosqlbench.activitytype.stdout.StdoutActivity; +import io.nosqlbench.engine.api.activityapi.core.Action; +import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; +import io.nosqlbench.engine.api.activityapi.core.ActivityType; +import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import io.nosqlbench.nb.annotations.Service; + +@Service(ActivityType.class) +public class KafkaProducerActivityType implements ActivityType { + @Override + public String getName() { + return "kafkaproducer"; + } + + @Override + public KafkaProducerActivity getActivity(ActivityDef activityDef) { + return new KafkaProducerActivity(activityDef); + } + + private static class Dispenser implements ActionDispenser { + private StdoutActivity activity; + + private Dispenser(StdoutActivity activity) { + this.activity = activity; + } + + @Override + public Action getAction(int slot) { + return new StdoutAction(slot,this.activity); + } + } + + @Override + public ActionDispenser getActionDispenser(KafkaProducerActivity activity) { + return new Dispenser(activity); + } +} diff --git a/driver-kafka/src/main/resources/kafkaproducer.md b/driver-kafka/src/main/resources/kafkaproducer.md new file mode 100644 index 000000000..158da885e --- /dev/null +++ b/driver-kafka/src/main/resources/kafkaproducer.md @@ -0,0 +1,32 @@ +# kafkaproducer + +This is an activity type which allows for a stream of data to be sent to a kafka topic. It is based on the stdout +activity statement format. + +## Parameters + +- **topic** - The topic to write to for this activity. + +### Examples + +Refer to the online standard YAML documentation for a detailed walk-through. +An example yaml is below for sending structured JSON to a kafka topic: + + bindings: + price: Normal(10.0D,2.0D) -> double; Save('price') -> double; + quantity: Normal(10000.0D,100.0D); Add(-10000.0D); Save('quantity') -> double; + total: Identity(); Expr('price * quantity') -> double; + client: WeightedStrings('ABC_TEST:3;DFG_TEST:3;STG_TEST:14'); + clientid: HashRange(0,1000000000) -> long; + + statements: + - | + \{ + "trade": \{ + "price": {price}, + "quantity": {quantity}, + "total": {total}, + "client": "{client}", + "clientid":"{clientid}" + \} + \} diff --git a/engine-docs/src/main/resources/docs-for-nb/designing_workloads/10_named_scenarios.md b/engine-docs/src/main/resources/docs-for-nb/designing_workloads/10_named_scenarios.md index bf54490d7..302029b13 100644 --- a/engine-docs/src/main/resources/docs-for-nb/designing_workloads/10_named_scenarios.md +++ b/engine-docs/src/main/resources/docs-for-nb/designing_workloads/10_named_scenarios.md @@ -224,7 +224,7 @@ as any other parameter depending on the assignment operators as explained above. ### alias The `alias` parameter is, by default, set to the expanded name of WORKLOAD_SCENARIO_STEP, which means that each activity -within the scenario has a distinct and symoblic name. This is important for distinguishing metrics from one another +within the scenario has a distinct and symbolic name. This is important for distinguishing metrics from one another across workloads, named scenarios, and steps within a named scenario. The above words are interpolated into the alias as follows: diff --git a/nb/pom.xml b/nb/pom.xml index 4b752ae8e..4c61977f9 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -27,6 +27,11 @@ 3.12.115-SNAPSHOT + + io.nosqlbench + driver-kafka + 3.12.115-SNAPSHOT + io.nosqlbench engine-cli diff --git a/pom.xml b/pom.xml index 6f1964998..f420a4531 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ driver-cql-shaded driver-cqlverify driver-web + driver-kafka From a8bee9c787cf5b0cd49bcbc55a35fabbe3213d8a Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 13:32:05 -0500 Subject: [PATCH 55/70] update kafka module versions --- driver-kafka/pom.xml | 6 +++--- nb/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 9be94973b..7ed3a199d 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.115-SNAPSHOT + 3.12.116-SNAPSHOT ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.115-SNAPSHOT + 3.12.116-SNAPSHOT io.nosqlbench driver-stdout - 3.12.115-SNAPSHOT + 3.12.116-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index ffb5208db..35326d81d 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -30,7 +30,7 @@ io.nosqlbench driver-kafka - 3.12.115-SNAPSHOT + 3.12.116-SNAPSHOT io.nosqlbench From bf7240d7e8841eff3f5df69a800e82bc6268a5ec Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 13:32:26 -0500 Subject: [PATCH 56/70] added kafka producer --- RELEASENOTES.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e9438f2d7..03715ed22 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,5 +1,2 @@ -9291ec4e fix for bug #148 -9a6f7973 WIP on cqld4 -c91042fc reorg docs sketches -89c0638b relax format for bindings-probcurves example -65d307b8 flatten this in +a8bee9c7 (HEAD -> master) update kafka module versions +f2240746 minor refinements to kafka producer From 3d3f916f1666de19d67348ad8596242da1140701 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 27 May 2020 18:42:36 +0000 Subject: [PATCH 57/70] [maven-release-plugin] prepare release nosqlbench-3.12.116 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-kafka/pom.xml | 6 +++--- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 26 +++++++++++++------------- 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 ++++++++-------- 28 files changed, 80 insertions(+), 80 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index d6174e625..22fb82830 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.116-SNAPSHOT + 3.12.116 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 247820048..e96c08763 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 621d0eb8b..308eb6991 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index b80a59571..d7f5f4308 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 0490ac4cc..480126d2e 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 7ed3a199d..4bedaae60 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-stdout - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index a53bdbd8a..8e4c6f6b1 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 802e3e62f..4132d095e 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-stdout - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 2c755e27f..ce0bd3d01 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 6811a3812..26d16ec42 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench nb-annotations - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench virtdata-userlibs - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 40eb974d3..fbe776e76 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.116-SNAPSHOT + 3.12.116 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index b405321b0..b456eaba5 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e155b3f21..e4d55eec5 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 40c8c89d0..f6e09d849 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 2a30932af..a7df0d487 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 8c64948c4..0a5164cc1 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.116-SNAPSHOT + 3.12.116 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.116 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 1d79784d5..1ac1fb192 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index f6e15c93a..7aeef7ba5 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/nb/pom.xml b/nb/pom.xml index 35326d81d..e51ea85db 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -24,36 +24,36 @@ io.nosqlbench driver-web - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-kafka - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench engine-cli - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench engine-docs - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench engine-core - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench engine-extensions - 3.12.116-SNAPSHOT + 3.12.116 @@ -65,37 +65,37 @@ io.nosqlbench driver-stdout - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-diag - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-tcp - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-http - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-cql-shaded - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench driver-cqlverify - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/pom.xml b/pom.xml index 05db4552d..86741bd0f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 mvn-defaults @@ -114,7 +114,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.116 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 8c28438ff..ba00445e2 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 nb-api io.nosqlbench virtdata-lang - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 1932cc156..e3eba0144 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index bbfbbd3e3..290860dac 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 00ca4959d..435f44f6b 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench virtdata-lib-basics - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index b7b128220..0dd797ad3 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench virtdata-lib-basics - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 6d730f737..36cbb26f3 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index af00c75e8..dbbb8cc7b 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.116-SNAPSHOT + 3.12.116 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 2878ea89b..5f029a32e 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench virtdata-lib-realer - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench virtdata-api - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench virtdata-lib-random - 3.12.116-SNAPSHOT + 3.12.116 io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 virtdata-lib-basics io.nosqlbench - 3.12.116-SNAPSHOT + 3.12.116 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.116-SNAPSHOT + 3.12.116 From 3490578b2046a5b6e05f4206687709bf03e79fb0 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Wed, 27 May 2020 18:42:44 +0000 Subject: [PATCH 58/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-kafka/pom.xml | 6 +++--- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 26 +++++++++++++------------- 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 ++++++++-------- 28 files changed, 80 insertions(+), 80 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 22fb82830..eec5fab09 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.116 + 3.12.117-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index e96c08763..494b5b027 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 308eb6991..355c17c31 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index d7f5f4308..eacfe3b63 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 480126d2e..0822bb380 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 4bedaae60..df564d56c 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-stdout - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 8e4c6f6b1..666c67727 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 4132d095e..ddf55b072 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-stdout - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index ce0bd3d01..51f6b04b3 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 26d16ec42..047dc937e 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench nb-annotations - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index fbe776e76..bc2ed01c5 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.116 + 3.12.117-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index b456eaba5..c6adfeeae 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e4d55eec5..f1ad533a9 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index f6e09d849..528552919 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index a7df0d487..0860fe7f5 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 0a5164cc1..cb8ded1c8 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.116 + 3.12.117-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.116 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 1ac1fb192..6481a34da 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 7aeef7ba5..62df9e756 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index e51ea85db..e275e78b1 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -24,36 +24,36 @@ io.nosqlbench driver-web - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-kafka - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench engine-cli - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench engine-docs - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench engine-core - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench engine-extensions - 3.12.116 + 3.12.117-SNAPSHOT @@ -65,37 +65,37 @@ io.nosqlbench driver-stdout - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-diag - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-tcp - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-http - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/pom.xml b/pom.xml index 86741bd0f..9331801ad 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT mvn-defaults @@ -114,7 +114,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.116 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index ba00445e2..35d746c67 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index e3eba0144..fe5807f7f 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 290860dac..4324d5743 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 435f44f6b..b4ca83442 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 0dd797ad3..0bcfd3a5b 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 36cbb26f3..d8330d641 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index dbbb8cc7b..276a83ff1 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.116 + 3.12.117-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 5f029a32e..befee30b9 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench virtdata-api - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.116 + 3.12.117-SNAPSHOT io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.116 + 3.12.117-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.116 + 3.12.117-SNAPSHOT From 9cf6cd9953b045e0a33422e9c2107d7aa3c308f0 Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Mon, 18 May 2020 12:33:08 -0400 Subject: [PATCH 59/70] Add MongoDB support The Basics - insert - find --- driver-mongodb/pom.xml | 49 +++++++ .../driver/mongodb/MongoAction.java | 64 ++++++++ .../driver/mongodb/MongoActivity.java | 137 ++++++++++++++++++ .../driver/mongodb/MongoActivityType.java | 41 ++++++ .../driver/mongodb/ReadyMongoStatement.java | 34 +++++ .../resources/activities/mongodb-basic.yaml | 57 ++++++++ driver-mongodb/src/main/resources/mongodb.md | 3 + .../driver/mongodb/MongoActivityTest.java | 26 ++++ .../mongodb/ReadyMongoStatementTest.java | 107 ++++++++++++++ nb/pom.xml | 18 +++ pom.xml | 1 + 11 files changed, 537 insertions(+) create mode 100644 driver-mongodb/pom.xml create mode 100644 driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java create mode 100644 driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java create mode 100644 driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivityType.java create mode 100644 driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java create mode 100644 driver-mongodb/src/main/resources/activities/mongodb-basic.yaml create mode 100644 driver-mongodb/src/main/resources/mongodb.md create mode 100644 driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java create mode 100644 driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml new file mode 100644 index 000000000..634c21e29 --- /dev/null +++ b/driver-mongodb/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + driver-mongodb + jar + + + mvn-defaults + io.nosqlbench + 3.12.117-SNAPSHOT + ../mvn-defaults + + + ${project.artifactId} + + An nosqlbench ActivityType (AT) driver module; + MongoDB + + + + + io.nosqlbench + engine-api + 3.12.117-SNAPSHOT + + + + org.mongodb + mongo-java-driver + 3.12.4 + + + + + + org.assertj + assertj-core + test + + + + junit + junit + test + + + + + diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java new file mode 100644 index 000000000..d6242889b --- /dev/null +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java @@ -0,0 +1,64 @@ +package io.nosqlbench.driver.mongodb; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.codahale.metrics.Timer; +import com.mongodb.ReadPreference; +import com.mongodb.client.MongoDatabase; +import io.nosqlbench.engine.api.activityapi.core.SyncAction; +import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import org.bson.Document; +import org.bson.conversions.Bson; + +public class MongoAction implements SyncAction { + + private final static Logger logger = LoggerFactory.getLogger(MongoAction.class); + + private final MongoActivity activity; + private final int slot; + + private OpSequence sequencer; + + public MongoAction(MongoActivity activity, int slot) { + this.activity = activity; + this.slot = slot; + } + + @Override + public void init() { + this.sequencer = activity.getOpSequencer(); + } + + @Override + public int runCycle(long cycleValue) { + ReadyMongoStatement rms; + Bson queryBson; + try (Timer.Context bindTime = activity.bindTimer.time()) { + rms = sequencer.get(cycleValue); + queryBson = rms.bind(cycleValue); + + if (activity.isShowQuery()) { + logger.info("Query(cycle={}):\n{}", cycleValue, queryBson); + } + } + + for (int i = 0; i < activity.getMaxTries(); i++) { + activity.triesHisto.update(i); + try (Timer.Context executeTime = activity.executeTimer.time()) { + MongoDatabase database = activity.getDatabase(); + ReadPreference readPreference = rms.getReadPreference(); + Document resultDoc = database.runCommand(queryBson, readPreference); + + double ok = resultDoc.getDouble("ok"); + activity.resultSetSizeHisto.update(resultDoc.getInteger("n", 0)); + return ok == 1.0d ? 0 : 1; + } catch (Exception e) { + logger.error("Failed to runCommand {} on cycle {}, tries {}", queryBson, cycleValue, i, e); + } + } + + throw new RuntimeException(String.format("Exhausted max tries (%s) on cycle %s", + cycleValue, activity.getMaxTries())); + } +} diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java new file mode 100644 index 000000000..c65cd14dc --- /dev/null +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java @@ -0,0 +1,137 @@ +package io.nosqlbench.driver.mongodb; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.codahale.metrics.Histogram; +import com.codahale.metrics.Timer; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import com.mongodb.client.MongoDatabase; +import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; +import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner; +import io.nosqlbench.engine.api.activityapi.planning.SequencerType; +import io.nosqlbench.engine.api.activityconfig.ParsedStmt; +import io.nosqlbench.engine.api.activityconfig.StatementsLoader; +import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef; +import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; +import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import io.nosqlbench.engine.api.activityimpl.SimpleActivity; +import io.nosqlbench.engine.api.metrics.ActivityMetrics; +import io.nosqlbench.engine.api.templating.StrInterpolator; +import io.nosqlbench.engine.api.util.TagFilter; + +public class MongoActivity extends SimpleActivity implements ActivityDefObserver { + + private final static Logger logger = LoggerFactory.getLogger(MongoActivity.class); + + private String yamlLoc; + private String connectionString; + private String databaseName; + + private MongoClient client; + private MongoDatabase mongoDatabase; + private boolean showQuery; + private int maxTries; + + private OpSequence opSequence; + + protected Timer bindTimer; + protected Timer executeTimer; + protected Histogram resultSetSizeHisto; + protected Histogram triesHisto; + + public MongoActivity(ActivityDef activityDef) { + super(activityDef); + } + + @Override + public synchronized void onActivityDefUpdate(ActivityDef activityDef) { + super.onActivityDefUpdate(activityDef); + + // sanity check + yamlLoc = activityDef.getParams().getOptionalString("yaml", "workload") + .orElseThrow(() -> new IllegalArgumentException("yaml is not defined")); + connectionString = activityDef.getParams().getOptionalString("connection") + .orElseThrow(() -> new IllegalArgumentException("connection is not defined")); + // TODO: support multiple databases + databaseName = activityDef.getParams().getOptionalString("database") + .orElseThrow(() -> new IllegalArgumentException("database is not defined")); + } + + @Override + public void initActivity() { + logger.debug("initializing activity: " + this.activityDef.getAlias()); + onActivityDefUpdate(activityDef); + + opSequence = initOpSequencer(); + setDefaultsFromOpSequence(opSequence); + + client = MongoClients.create(connectionString); + mongoDatabase = client.getDatabase(databaseName); + showQuery = activityDef.getParams().getOptionalBoolean("showquery") + .orElse(false); + maxTries = activityDef.getParams().getOptionalInteger("maxtries") + .orElse(10); + + bindTimer = ActivityMetrics.timer(activityDef, "bind"); + executeTimer = ActivityMetrics.timer(activityDef, "execute"); + resultSetSizeHisto = ActivityMetrics.histogram(activityDef, "resultset-size"); + triesHisto = ActivityMetrics.histogram(activityDef, "tries"); + } + + @Override + public void shutdownActivity() { + logger.debug("shutting down activity: " + this.activityDef.getAlias()); + if (client != null) { + client.close(); + } + } + + OpSequence initOpSequencer() { + SequencerType sequencerType = SequencerType.valueOf( + activityDef.getParams().getOptionalString("seq").orElse("bucket") + ); + SequencePlanner sequencer = new SequencePlanner<>(sequencerType); + + StmtsDocList stmtsDocList = StatementsLoader.load(logger, yamlLoc, new StrInterpolator(activityDef), "activities"); + + String tagfilter = activityDef.getParams().getOptionalString("tags").orElse(""); + + TagFilter tagFilter = new TagFilter(tagfilter); + stmtsDocList.getStmts().stream().map(tagFilter::matchesTaggedResult).forEach(r -> logger.info(r.getLog())); + + List stmts = stmtsDocList.getStmts(tagfilter); + for (StmtDef stmt : stmts) { + ParsedStmt parsed = stmt.getParsed().orError(); + String statement = parsed.getPositionalStatement(Function.identity()); + Objects.requireNonNull(statement); + + sequencer.addOp(new ReadyMongoStatement(stmt), + Long.parseLong(stmt.getParams().getOrDefault("ratio","1"))); + } + + return sequencer.resolve(); + } + + protected MongoDatabase getDatabase() { + return mongoDatabase; + } + + protected OpSequence getOpSequencer() { + return opSequence; + } + + protected boolean isShowQuery() { + return showQuery; + } + + protected int getMaxTries() { + return maxTries; + } +} diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivityType.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivityType.java new file mode 100644 index 000000000..b37f60c02 --- /dev/null +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivityType.java @@ -0,0 +1,41 @@ +package io.nosqlbench.driver.mongodb; + +import io.nosqlbench.engine.api.activityapi.core.Action; +import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; +import io.nosqlbench.engine.api.activityapi.core.ActivityType; +import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import io.nosqlbench.nb.annotations.Service; + +@Service(ActivityType.class) +public class MongoActivityType implements ActivityType { + + @Override + public String getName() { + return "mongodb"; + } + + @Override + public MongoActivity getActivity(ActivityDef activityDef) { + return new MongoActivity(activityDef); + } + + @Override + public ActionDispenser getActionDispenser(MongoActivity activity) { + return new MongoActionDispenser(activity); + } + + private static class MongoActionDispenser implements ActionDispenser { + + private final MongoActivity activity; + + public MongoActionDispenser(MongoActivity activity) + { + this.activity = activity; + } + + @Override + public Action getAction(int slot) { + return new MongoAction(activity, slot); + } + } +} diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java new file mode 100644 index 000000000..9c974d51e --- /dev/null +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/ReadyMongoStatement.java @@ -0,0 +1,34 @@ +package io.nosqlbench.driver.mongodb; + +import com.mongodb.ReadPreference; +import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef; +import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; +import io.nosqlbench.virtdata.core.templates.ParsedTemplate; +import io.nosqlbench.virtdata.core.templates.StringBindings; +import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate; +import org.bson.Document; +import org.bson.conversions.Bson; + +public class ReadyMongoStatement { + + private StringBindings bindings; + private ReadPreference readPreference; + + public ReadyMongoStatement(StmtDef stmtDef) { + ParsedTemplate paramTemplate = new ParsedTemplate(stmtDef.getStmt(), stmtDef.getBindings()); + BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints()); + StringBindingsTemplate template = new StringBindingsTemplate(stmtDef.getStmt(), paramBindings); + + this.bindings = template.resolve(); + this.readPreference = ReadPreference.valueOf(stmtDef.getParams() + .getOrDefault("readPreference","primary")); + } + + public ReadPreference getReadPreference() { + return readPreference; + } + + public Bson bind(long value) { + return Document.parse(bindings.bind(value)); + } +} diff --git a/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml b/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml new file mode 100644 index 000000000..4ba58dbd2 --- /dev/null +++ b/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml @@ -0,0 +1,57 @@ +# nb -v run driver=mongodb yaml=mongodb-basic connection=mongodb://127.0.0.1 database=testdb tags=phase:rampup +scenarios: + default: + - run driver=mongodb tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto + - run driver=mongodb tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto +bindings: + seq_key: Mod(<>); ToString() -> String + seq_value: Hash(); Mod(<>); ToString() -> String + rw_key: <int>>; ToString() -> String + rw_value: Hash(); <int>>; ToString() -> String + +blocks: + - name: rampup + tags: + phase: rampup + statements: + - rampup-insert: | + { + insert: "<>", + documents: [ { key: {seq_key}, + value: {seq_value} } ] + } + params: + readPreference: primary + tags: + name: rampup-insert + - name: main-read + tags: + phase: main + type: read + params: + ratio: <> + statements: + - main-find: | + { + find: "<>", + filter: { key: {rw_key} } + } + params: + readPreference: primary + tags: + name: main-find + - name: main-write + tags: + phase: main + type: write + params: + ratio: <> + statements: + - main-insert: | + { + insert: "<>", + documents: [ { key: {rw_key}, + value: {rw_value} } ] + } + tags: + name: main-insert diff --git a/driver-mongodb/src/main/resources/mongodb.md b/driver-mongodb/src/main/resources/mongodb.md new file mode 100644 index 000000000..b5f48dfdd --- /dev/null +++ b/driver-mongodb/src/main/resources/mongodb.md @@ -0,0 +1,3 @@ +# MongoDB Driver + +This is a driver for MongoDB. \ No newline at end of file diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java new file mode 100644 index 000000000..1c37057e5 --- /dev/null +++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java @@ -0,0 +1,26 @@ +package io.nosqlbench.driver.mongodb; + +import org.junit.Test; + +import io.nosqlbench.engine.api.activityapi.planning.OpSequence; +import io.nosqlbench.engine.api.activityimpl.ActivityDef; + +import static org.assertj.core.api.Assertions.assertThat; + +public class MongoActivityTest { + + @Test + public void testInitOpSequencer() { + String[] params = { + "yaml=activities/mongodb-basic.yaml", + "connection=mongodb://127.0.0.1", + "database=nosqlbench_testdb" + }; + ActivityDef activityDef = ActivityDef.parseActivityDef(String.join(";", params)); + MongoActivity mongoActivity = new MongoActivity(activityDef); + mongoActivity.initActivity(); + + OpSequence sequence = mongoActivity.initOpSequencer(); + assertThat(sequence.getOps()).hasSize(3); + } +} diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java new file mode 100644 index 000000000..7c1acde25 --- /dev/null +++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java @@ -0,0 +1,107 @@ +package io.nosqlbench.driver.mongodb; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; + +import org.junit.Before; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.nosqlbench.engine.api.activityconfig.ParsedStmt; +import io.nosqlbench.engine.api.activityconfig.StatementsLoader; +import io.nosqlbench.engine.api.activityconfig.yaml.StmtDef; +import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList; +import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import io.nosqlbench.engine.api.templating.StrInterpolator; +import io.nosqlbench.virtdata.core.templates.BindPoint; +import org.bson.conversions.Bson; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ReadyMongoStatementTest { + private final static Logger logger = LoggerFactory.getLogger(ReadyMongoStatementTest.class); + + private ActivityDef activityDef; + private StmtsDocList stmtsDocList; + + @Before + public void setup() { + String[] params = { + "yaml=activities/mongodb-basic.yaml", + "database=nosqlbench_testdb", + }; + activityDef = ActivityDef.parseActivityDef(String.join(";", params)); + String yaml_loc = activityDef.getParams().getOptionalString("yaml", "workload").orElse("default"); + stmtsDocList = StatementsLoader.load(logger, yaml_loc, new StrInterpolator(activityDef), "activities"); + } + + @Test + public void testResolvePhaseRampup() { + String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:rampup"); + + List stmts = stmtsDocList.getStmts(tagfilter); + assertThat(stmts).hasSize(1); + for (StmtDef stmt : stmts) { + ParsedStmt parsed = stmt.getParsed().orError(); + assertThat(parsed.getBindPoints()).hasSize(2); + + BindPoint seqKey = new BindPoint("seq_key", "Mod(1000000000); ToString() -> String"); + BindPoint seqValue = new BindPoint("seq_value", "Hash(); Mod(1000000000); ToString() -> String"); + assertThat(parsed.getBindPoints()).containsExactly(seqKey, seqValue); + + String statement = parsed.getPositionalStatement(Function.identity()); + Objects.requireNonNull(statement); + + ReadyMongoStatement readyMongoStatement = new ReadyMongoStatement(stmt); + Bson bsonDoc = readyMongoStatement.bind(1L); + assertThat(bsonDoc).isNotNull(); + } + } + + @Test + public void testResolvePhaseMainRead() { + String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:main-find"); + + List stmts = stmtsDocList.getStmts(tagfilter); + assertThat(stmts).hasSize(1); + for (StmtDef stmt : stmts) { + ParsedStmt parsed = stmt.getParsed().orError(); + assertThat(parsed.getBindPoints()).hasSize(1); + + BindPoint rwKey = new BindPoint("rw_key", "Uniform(0,1000000000)->int; ToString() -> String"); + assertThat(parsed.getBindPoints()).containsExactly(rwKey); + + String statement = parsed.getPositionalStatement(Function.identity()); + Objects.requireNonNull(statement); + + ReadyMongoStatement readyMongoStatement = new ReadyMongoStatement(stmt); + Bson bsonDoc = readyMongoStatement.bind(1L); + assertThat(bsonDoc).isNotNull(); + } + } + + @Test + public void testResolvePhaseMainWrite() { + String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:main-insert"); + + List stmts = stmtsDocList.getStmts(tagfilter); + assertThat(stmts).hasSize(1); + for (StmtDef stmt : stmts) { + ParsedStmt parsed = stmt.getParsed().orError(); + assertThat(parsed.getBindPoints()).hasSize(2); + + BindPoint rwKey = new BindPoint("rw_key", "Uniform(0,1000000000)->int; ToString() -> String"); + BindPoint rwValue = new BindPoint("rw_value", "Hash(); Uniform(0,1000000000)->int; ToString() -> String"); + assertThat(parsed.getBindPoints()).containsExactly(rwKey, rwValue); + + String statement = parsed.getPositionalStatement(Function.identity()); + Objects.requireNonNull(statement); + + ReadyMongoStatement readyMongoStatement = new ReadyMongoStatement(stmt); + Bson bsonDoc = readyMongoStatement.bind(1L); + assertThat(bsonDoc).isNotNull(); + } + } +} diff --git a/nb/pom.xml b/nb/pom.xml index e275e78b1..95de0d48f 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -98,6 +98,11 @@ 3.12.117-SNAPSHOT + + io.nosqlbench + driver-mongodb + 3.12.117-SNAPSHOT + @@ -245,6 +250,19 @@ + + with-mongodb + + false + + + + io.nosqlbench + driver-mongodb + 3.12.117-SNAPSHOT + + + build-nb-appimage diff --git a/pom.xml b/pom.xml index 9331801ad..887885208 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ driver-cqlverify driver-web driver-kafka + driver-mongodb From 103e35936e08a7482cc28edf4a59a374b3154ca7 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 May 2020 09:09:40 -0500 Subject: [PATCH 60/70] add profile for mongodb --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 887885208..e1ef097ff 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,16 @@ driver-cqld4 + + with-mongodb + + false + + + driver-mongodb + + + From 370de82a533f5aed1dd3bb171aabd96b58082a57 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 22:21:30 -0500 Subject: [PATCH 61/70] fix docs sorting bug --- .../virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java | 2 +- .../virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java index 0f8e151a5..57430afb3 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java @@ -30,6 +30,6 @@ public class FDocCat implements Iterable { public Iterator iterator() { ArrayList fdocs = new ArrayList<>(docsByFuncName.values()); fdocs.sort(Comparator.comparing(FDocFuncs::getFunctionName)); - return docsByFuncName.values().iterator(); + return fdocs.iterator(); } } diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java index dc12eafc0..4a3474a99 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java @@ -71,4 +71,12 @@ public class FDocFuncs implements Iterable { .replaceAll("java.net.","") .replaceAll("java.io.",""); } + + @Override + public String toString() { + return "FDocFuncs{" + + "functionsByPackage=" + functionsByPackage + + ", functionName='" + functionName + '\'' + + '}'; + } } From 13e6d74e0afaa505ca6b02fc3d029dd21d1a19fa Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 22:21:37 -0500 Subject: [PATCH 62/70] move tests to correct package --- .../io/nosqlbench/{ => engine}/core/ActivityExecutorTest.java | 3 +-- .../java/io/nosqlbench/{ => engine}/core/CoreMotorTest.java | 2 +- .../java/io/nosqlbench/{ => engine}/core/ScenarioTest.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename engine-core/src/test/java/io/nosqlbench/{ => engine}/core/ActivityExecutorTest.java (98%) rename engine-core/src/test/java/io/nosqlbench/{ => engine}/core/CoreMotorTest.java (99%) rename engine-core/src/test/java/io/nosqlbench/{ => engine}/core/ScenarioTest.java (97%) diff --git a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java similarity index 98% rename from engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java rename to engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java index 79641fb66..daa6bed16 100644 --- a/engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java @@ -1,4 +1,4 @@ -package io.nosqlbench.core; +package io.nosqlbench.engine.core; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.api.activityapi.output.OutputDispenser; @@ -12,7 +12,6 @@ import io.nosqlbench.engine.api.activityimpl.input.CoreInputDispenser; import io.nosqlbench.engine.api.activityimpl.input.AtomicInput; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotor; import io.nosqlbench.engine.api.activityimpl.motor.CoreMotorDispenser; -import io.nosqlbench.engine.core.ActivityExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.junit.Test; diff --git a/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java similarity index 99% rename from engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java rename to engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java index 7c88006b1..451af81e2 100644 --- a/engine-core/src/test/java/io/nosqlbench/core/CoreMotorTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java @@ -1,4 +1,4 @@ -package io.nosqlbench.core; +package io.nosqlbench.engine.core; import io.nosqlbench.engine.api.activityapi.core.*; import io.nosqlbench.engine.core.fortesting.BlockingSegmentInput; diff --git a/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java b/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java similarity index 97% rename from engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java rename to engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java index 8fd07277c..7e3bb2484 100644 --- a/engine-core/src/test/java/io/nosqlbench/core/ScenarioTest.java +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/ScenarioTest.java @@ -1,4 +1,4 @@ -package io.nosqlbench.core; +package io.nosqlbench.engine.core; import io.nosqlbench.engine.api.scripting.ScriptEnvBuffer; import io.nosqlbench.engine.core.script.Scenario; From eeba6fdf05e67f5aa8e205ee64de923b801ee4b8 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 27 May 2020 22:22:36 -0500 Subject: [PATCH 63/70] updated release notes --- RELEASENOTES.md | 5 +++++ .../core/experimental/CompletableTests.java | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 03715ed22..a3814ba62 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,2 +1,7 @@ a8bee9c7 (HEAD -> master) update kafka module versions f2240746 minor refinements to kafka producer +13e6d74e (HEAD -> master) move tests to correct package +370de82a fix docs sorting bug +bf7240d7 added kafka producer +a8bee9c7 update kafka module versions +f2240746 minor refinements to kafka producer diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java b/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java new file mode 100644 index 000000000..b187d63ff --- /dev/null +++ b/engine-core/src/test/java/io/nosqlbench/engine/core/experimental/CompletableTests.java @@ -0,0 +1,20 @@ +package io.nosqlbench.engine.core.experimental; + +import org.junit.Test; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +public class CompletableTests { + + @Test + public void testCompletionStages() { + CompletableFuture f = new CompletableFuture<>(); + ExecutorService executorService = Executors.newCachedThreadPool(); + CompletableFuture objectCompletableFuture = f.completeAsync(() -> "foo", executorService); + boolean bar = objectCompletableFuture.complete("bar"); + + } +} From 058c4707602d634b758beafbfec715901c3a28ce Mon Sep 17 00:00:00 2001 From: Justin Chu Date: Wed, 27 May 2020 22:32:19 -0400 Subject: [PATCH 64/70] [squash] address feedback --- driver-mongodb/pom.xml | 4 +-- .../driver/mongodb/MongoAction.java | 25 ++++++++++++++++--- .../driver/mongodb/MongoActivity.java | 12 +++++---- .../resources/activities/mongodb-basic.yaml | 4 +++ driver-mongodb/src/main/resources/mongodb.md | 19 +++++++++++++- .../driver/mongodb/MongoActivityTest.java | 13 +++++++--- pom.xml | 2 +- 7 files changed, 63 insertions(+), 16 deletions(-) diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 634c21e29..ff72f8fbe 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -26,8 +26,8 @@ org.mongodb - mongo-java-driver - 3.12.4 + mongodb-driver-sync + 4.0.3 diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java index d6242889b..64c51813c 100644 --- a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java @@ -1,5 +1,7 @@ package io.nosqlbench.driver.mongodb; +import java.util.concurrent.TimeUnit; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,21 +40,36 @@ public class MongoAction implements SyncAction { rms = sequencer.get(cycleValue); queryBson = rms.bind(cycleValue); + // Maybe show the query in log/console - only for diagnostic use if (activity.isShowQuery()) { logger.info("Query(cycle={}):\n{}", cycleValue, queryBson); } } - for (int i = 0; i < activity.getMaxTries(); i++) { + long nanoStartTime = System.nanoTime(); + for (int i = 1; i <= activity.getMaxTries(); i++) { activity.triesHisto.update(i); - try (Timer.Context executeTime = activity.executeTimer.time()) { + + try (Timer.Context resultTime = activity.resultTimer.time()) { MongoDatabase database = activity.getDatabase(); ReadPreference readPreference = rms.getReadPreference(); + + // assuming the commands are one of these in the doc: + // https://docs.mongodb.com/manual/reference/command/nav-crud/ Document resultDoc = database.runCommand(queryBson, readPreference); - double ok = resultDoc.getDouble("ok"); + long resultNanos = System.nanoTime() - nanoStartTime; + + // TODO: perhaps collect the operationTime from the resultDoc if any + // https://docs.mongodb.com/manual/reference/method/db.runCommand/#command-response + int ok = Double.valueOf((double) resultDoc.getOrDefault("ok", 0.0d)).intValue(); + if (ok == 1) { + // success + activity.resultSuccessTimer.update(resultNanos, TimeUnit.NANOSECONDS); + } activity.resultSetSizeHisto.update(resultDoc.getInteger("n", 0)); - return ok == 1.0d ? 0 : 1; + + return ok == 1 ? 0 : 1; } catch (Exception e) { logger.error("Failed to runCommand {} on cycle {}, tries {}", queryBson, cycleValue, i, e); } diff --git a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java index c65cd14dc..ad553cf79 100644 --- a/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java +++ b/driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java @@ -41,10 +41,11 @@ public class MongoActivity extends SimpleActivity implements ActivityDefObserver private OpSequence opSequence; - protected Timer bindTimer; - protected Timer executeTimer; - protected Histogram resultSetSizeHisto; - protected Histogram triesHisto; + Timer bindTimer; + Timer resultTimer; + Timer resultSuccessTimer; + Histogram resultSetSizeHisto; + Histogram triesHisto; public MongoActivity(ActivityDef activityDef) { super(activityDef); @@ -80,7 +81,8 @@ public class MongoActivity extends SimpleActivity implements ActivityDefObserver .orElse(10); bindTimer = ActivityMetrics.timer(activityDef, "bind"); - executeTimer = ActivityMetrics.timer(activityDef, "execute"); + resultTimer = ActivityMetrics.timer(activityDef, "result"); + resultSuccessTimer = ActivityMetrics.timer(activityDef, "result-success"); resultSetSizeHisto = ActivityMetrics.histogram(activityDef, "resultset-size"); triesHisto = ActivityMetrics.histogram(activityDef, "tries"); } diff --git a/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml b/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml index 4ba58dbd2..f62872474 100644 --- a/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml +++ b/driver-mongodb/src/main/resources/activities/mongodb-basic.yaml @@ -1,4 +1,6 @@ # nb -v run driver=mongodb yaml=mongodb-basic connection=mongodb://127.0.0.1 database=testdb tags=phase:rampup +description: An exmaple of a basic mongo insert and find. + scenarios: default: - run driver=mongodb tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto @@ -53,5 +55,7 @@ blocks: documents: [ { key: {rw_key}, value: {rw_value} } ] } + params: + readPreference: primary tags: name: main-insert diff --git a/driver-mongodb/src/main/resources/mongodb.md b/driver-mongodb/src/main/resources/mongodb.md index b5f48dfdd..ff31d49dc 100644 --- a/driver-mongodb/src/main/resources/mongodb.md +++ b/driver-mongodb/src/main/resources/mongodb.md @@ -1,3 +1,20 @@ # MongoDB Driver -This is a driver for MongoDB. \ No newline at end of file +This is a driver for MongoDB. It supports the `db.runCommand` API described in [here](https://docs.mongodb.com/manual/reference/command/). + +### Example activity definitions + +Run a mongodb activity with definitions from activities/mongodb-basic.yaml +``` +... driver=mongodb yaml=activities/mongo-basic.yaml +``` + +### MongoDB ActivityType Parameters + +- **connection** (Mandatory) - connection string of the target MongoDB. + + Example: `mongodb://127.0.0.1` + +- **database** (Mandatory) - target database + + Example: `testdb` diff --git a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java index 1c37057e5..47a15adfd 100644 --- a/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java +++ b/driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/MongoActivityTest.java @@ -1,5 +1,6 @@ package io.nosqlbench.driver.mongodb; +import org.junit.Before; import org.junit.Test; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; @@ -9,14 +10,20 @@ import static org.assertj.core.api.Assertions.assertThat; public class MongoActivityTest { - @Test - public void testInitOpSequencer() { + private ActivityDef activityDef; + + @Before + public void setup() { String[] params = { "yaml=activities/mongodb-basic.yaml", "connection=mongodb://127.0.0.1", "database=nosqlbench_testdb" }; - ActivityDef activityDef = ActivityDef.parseActivityDef(String.join(";", params)); + activityDef = ActivityDef.parseActivityDef(String.join(";", params)); + } + + @Test + public void testInitOpSequencer() { MongoActivity mongoActivity = new MongoActivity(activityDef); mongoActivity.initActivity(); diff --git a/pom.xml b/pom.xml index e1ef097ff..5c25e0e90 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ with-mongodb - false + true driver-mongodb From 033d1607414ac17dc724ff5b00e95986bf798cc4 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 28 May 2020 03:32:00 +0000 Subject: [PATCH 65/70] [maven-release-plugin] prepare release nosqlbench-3.12.117 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-kafka/pom.xml | 6 +++--- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 26 +++++++++++++------------- 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 ++++++++-------- 28 files changed, 80 insertions(+), 80 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index eec5fab09..3b7a9f8ef 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.117-SNAPSHOT + 3.12.117 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 494b5b027..192672975 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 355c17c31..d878ee89f 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index eacfe3b63..47880ac3b 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 0822bb380..923fb8aff 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index df564d56c..92b53f060 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-stdout - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 666c67727..86b969951 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index ddf55b072..03c64b916 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-stdout - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 51f6b04b3..82f60fe26 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 047dc937e..1205aef94 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench nb-annotations - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench virtdata-userlibs - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index bc2ed01c5..378e0dfe9 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.117-SNAPSHOT + 3.12.117 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index c6adfeeae..ed3ccde2c 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index f1ad533a9..845dd762f 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 528552919..0f7e2f8f7 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 0860fe7f5..102c346de 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index cb8ded1c8..f995305eb 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.117-SNAPSHOT + 3.12.117 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.117 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 6481a34da..7d4c72e4b 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 62df9e756..73cb1b658 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/nb/pom.xml b/nb/pom.xml index e275e78b1..267f19411 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -24,36 +24,36 @@ io.nosqlbench driver-web - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-kafka - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench engine-cli - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench engine-docs - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench engine-core - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench engine-extensions - 3.12.117-SNAPSHOT + 3.12.117 @@ -65,37 +65,37 @@ io.nosqlbench driver-stdout - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-diag - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-tcp - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-http - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-cql-shaded - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench driver-cqlverify - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/pom.xml b/pom.xml index 9331801ad..2f04ef98b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 mvn-defaults @@ -114,7 +114,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.117 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 35d746c67..657394165 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 nb-api io.nosqlbench virtdata-lang - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index fe5807f7f..dff6cb131 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 4324d5743..2ed9b1ac3 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index b4ca83442..7b5d51f44 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench virtdata-lib-basics - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index 0bcfd3a5b..e4e826f34 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench virtdata-lib-basics - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index d8330d641..c6fae886b 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index 276a83ff1..b3820d958 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.117-SNAPSHOT + 3.12.117 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index befee30b9..a856a9379 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench virtdata-lib-realer - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench virtdata-api - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench virtdata-lib-random - 3.12.117-SNAPSHOT + 3.12.117 io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 virtdata-lib-basics io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.117 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.117-SNAPSHOT + 3.12.117 From 400bf6641b13aab7129508748f63e23a7910ca73 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 28 May 2020 03:32:07 +0000 Subject: [PATCH 66/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-kafka/pom.xml | 6 +++--- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 26 +++++++++++++------------- 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 ++++++++-------- 28 files changed, 80 insertions(+), 80 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 3b7a9f8ef..e427bc0aa 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.117 + 3.12.118-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 192672975..42c8bfac9 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index d878ee89f..633fd3135 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index 47880ac3b..cca7b3c9c 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 923fb8aff..84a370d6f 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 92b53f060..dd3ad0e1d 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-stdout - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 86b969951..d4c9c30d6 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 03c64b916..2ee98de80 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-stdout - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 82f60fe26..814b4af75 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 1205aef94..03e60ce29 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench nb-annotations - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 378e0dfe9..3c5bd6316 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.117 + 3.12.118-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index ed3ccde2c..249e0b6b2 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 845dd762f..97a5e2574 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 0f7e2f8f7..2e07f9c3e 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index 102c346de..b5e12442f 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index f995305eb..6c571b32d 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.117 + 3.12.118-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.117 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 7d4c72e4b..f7a5f2ab5 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 73cb1b658..66dab46f0 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 267f19411..eadd86386 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -24,36 +24,36 @@ io.nosqlbench driver-web - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-kafka - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench engine-cli - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench engine-docs - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench engine-core - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench engine-extensions - 3.12.117 + 3.12.118-SNAPSHOT @@ -65,37 +65,37 @@ io.nosqlbench driver-stdout - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-diag - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-tcp - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-http - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2f04ef98b..5b165eda2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT mvn-defaults @@ -114,7 +114,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.117 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 657394165..68c2b5509 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index dff6cb131..5a93dbf3c 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 2ed9b1ac3..b95a2b65f 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 7b5d51f44..d03622fd8 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index e4e826f34..ae184bee3 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index c6fae886b..bf0867d32 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index b3820d958..e6dd8607a 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.117 + 3.12.118-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index a856a9379..1069b08e4 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench virtdata-api - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.117 + 3.12.118-SNAPSHOT io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.117 + 3.12.118-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.117 + 3.12.118-SNAPSHOT From 2a1284c368b2f820d1687c2d49ae9f7ff878e123 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 28 May 2020 12:08:00 -0500 Subject: [PATCH 67/70] sync up mongo version and enable --- driver-mongodb/pom.xml | 4 ++-- nb/pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index ff72f8fbe..5a783a247 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.117-SNAPSHOT + 3.12.118-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.117-SNAPSHOT + 3.12.118-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 54cf438f3..2d5990f62 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -101,7 +101,7 @@ io.nosqlbench driver-mongodb - 3.12.117-SNAPSHOT + 3.12.118-SNAPSHOT @@ -253,13 +253,13 @@ with-mongodb - false + true io.nosqlbench driver-mongodb - 3.12.117-SNAPSHOT + 3.12.118-SNAPSHOT From fd25ea23912328b0a0db0b51f934005f094b009c Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 28 May 2020 12:08:32 -0500 Subject: [PATCH 68/70] updated release notes --- RELEASENOTES.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a3814ba62..21e1b409c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,7 +1 @@ -a8bee9c7 (HEAD -> master) update kafka module versions -f2240746 minor refinements to kafka producer -13e6d74e (HEAD -> master) move tests to correct package -370de82a fix docs sorting bug -bf7240d7 added kafka producer -a8bee9c7 update kafka module versions -f2240746 minor refinements to kafka producer +2a1284c3 (HEAD -> master) sync up mongo version and enable From 0de10d67fb9b568f4dce22bc141434d8129f10a0 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 28 May 2020 17:18:35 +0000 Subject: [PATCH 69/70] [maven-release-plugin] prepare release nosqlbench-3.12.118 --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-kafka/pom.xml | 6 +++--- driver-mongodb/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 30 +++++++++++++++--------------- 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 ++++++++-------- 29 files changed, 84 insertions(+), 84 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index e427bc0aa..74b3be56d 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.118-SNAPSHOT + 3.12.118 @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 42c8bfac9..09e144940 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index 633fd3135..b293f4003 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index cca7b3c9c..fd1a909ff 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 84a370d6f..7730d6b5e 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index dd3ad0e1d..4a3e1d95b 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-stdout - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index 5a783a247..b02220454 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index d4c9c30d6..040f7e31e 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index 2ee98de80..c1f464fb0 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-stdout - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/driver-web/pom.xml b/driver-web/pom.xml index 814b4af75..b9d88c3c6 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 03e60ce29..8050ad83e 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench nb-annotations - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench virtdata-userlibs - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 3c5bd6316..6375fc668 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.118-SNAPSHOT + 3.12.118 @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 249e0b6b2..7f1c3dd84 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 97a5e2574..05b547576 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 2e07f9c3e..0c8142774 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index b5e12442f..e19bb853a 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 6c571b32d..9718d5db0 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.118-SNAPSHOT + 3.12.118 pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.118 diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index f7a5f2ab5..8a60b0250 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 66dab46f0..036aa05ef 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/nb/pom.xml b/nb/pom.xml index 2d5990f62..7dc5e1cd9 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -24,36 +24,36 @@ io.nosqlbench driver-web - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-kafka - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench engine-cli - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench engine-docs - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench engine-core - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench engine-extensions - 3.12.118-SNAPSHOT + 3.12.118 @@ -65,43 +65,43 @@ io.nosqlbench driver-stdout - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-diag - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-tcp - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-http - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-cql-shaded - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-cqlverify - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench driver-mongodb - 3.12.118-SNAPSHOT + 3.12.118 @@ -259,7 +259,7 @@ io.nosqlbench driver-mongodb - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/pom.xml b/pom.xml index 9b2107ea6..98130c84e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 mvn-defaults @@ -125,7 +125,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - HEAD + nosqlbench-3.12.118 diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 68c2b5509..9c819f4bd 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 nb-api io.nosqlbench virtdata-lang - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 5a93dbf3c..5f65bf773 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index b95a2b65f..23d590191 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index d03622fd8..9919ff077 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench virtdata-lib-basics - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index ae184bee3..e69d5cd3d 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench virtdata-lib-basics - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index bf0867d32..5f2cba51f 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index e6dd8607a..dbf0d6a1c 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.118-SNAPSHOT + 3.12.118 diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 1069b08e4..05794e429 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench virtdata-lib-realer - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench virtdata-api - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench virtdata-lib-random - 3.12.118-SNAPSHOT + 3.12.118 io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 virtdata-lib-basics io.nosqlbench - 3.12.118-SNAPSHOT + 3.12.118 virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.118-SNAPSHOT + 3.12.118 From 73f173919f6569130d474a99fabc7282dd1f3ce6 Mon Sep 17 00:00:00 2001 From: nb-droid Date: Thu, 28 May 2020 17:18:43 +0000 Subject: [PATCH 70/70] [maven-release-plugin] prepare for next development iteration --- docsys/pom.xml | 6 +++--- driver-cql-shaded/pom.xml | 4 ++-- driver-cqlverify/pom.xml | 4 ++-- driver-diag/pom.xml | 4 ++-- driver-http/pom.xml | 4 ++-- driver-kafka/pom.xml | 6 +++--- driver-mongodb/pom.xml | 4 ++-- driver-stdout/pom.xml | 4 ++-- driver-tcp/pom.xml | 6 +++--- driver-web/pom.xml | 4 ++-- engine-api/pom.xml | 8 ++++---- engine-cli/pom.xml | 6 +++--- engine-core/pom.xml | 4 ++-- engine-docker/pom.xml | 4 ++-- engine-docs/pom.xml | 4 ++-- engine-extensions/pom.xml | 4 ++-- mvn-defaults/pom.xml | 4 ++-- nb-annotations/pom.xml | 2 +- nb-api/pom.xml | 4 ++-- nb/pom.xml | 30 +++++++++++++++--------------- 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 ++++++++-------- 29 files changed, 84 insertions(+), 84 deletions(-) diff --git a/docsys/pom.xml b/docsys/pom.xml index 74b3be56d..7f9fb389f 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -9,7 +9,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench nb-api - 3.12.118 + 3.12.119-SNAPSHOT @@ -112,7 +112,7 @@ io.nosqlbench virtdata-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-cql-shaded/pom.xml b/driver-cql-shaded/pom.xml index 09e144940..f56c4e59e 100644 --- a/driver-cql-shaded/pom.xml +++ b/driver-cql-shaded/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-cqlverify/pom.xml b/driver-cqlverify/pom.xml index b293f4003..e904a3c30 100644 --- a/driver-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -4,7 +4,7 @@ io.nosqlbench mvn-defaults - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench driver-cql-shaded - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-diag/pom.xml b/driver-diag/pom.xml index fd1a909ff..099a39716 100644 --- a/driver-diag/pom.xml +++ b/driver-diag/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-http/pom.xml b/driver-http/pom.xml index 7730d6b5e..8410c120a 100644 --- a/driver-http/pom.xml +++ b/driver-http/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-kafka/pom.xml b/driver-kafka/pom.xml index 4a3e1d95b..b44eabcfb 100644 --- a/driver-kafka/pom.xml +++ b/driver-kafka/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -30,13 +30,13 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-stdout - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-mongodb/pom.xml b/driver-mongodb/pom.xml index b02220454..1a60093a8 100644 --- a/driver-mongodb/pom.xml +++ b/driver-mongodb/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-stdout/pom.xml b/driver-stdout/pom.xml index 040f7e31e..c9475c1a8 100644 --- a/driver-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -21,7 +21,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-tcp/pom.xml b/driver-tcp/pom.xml index c1f464fb0..a993f589a 100644 --- a/driver-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -23,13 +23,13 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-stdout - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/driver-web/pom.xml b/driver-web/pom.xml index b9d88c3c6..5e21d4441 100644 --- a/driver-web/pom.xml +++ b/driver-web/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/engine-api/pom.xml b/engine-api/pom.xml index 8050ad83e..4180e960d 100644 --- a/engine-api/pom.xml +++ b/engine-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -22,19 +22,19 @@ io.nosqlbench nb-api - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench nb-annotations - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench virtdata-userlibs - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml index 6375fc668..4ed1e7e85 100644 --- a/engine-cli/pom.xml +++ b/engine-cli/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -23,7 +23,7 @@ io.nosqlbench engine-core - 3.12.118 + 3.12.119-SNAPSHOT @@ -47,7 +47,7 @@ io.nosqlbench engine-docker - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/engine-core/pom.xml b/engine-core/pom.xml index 7f1c3dd84..b7ca6eb6e 100644 --- a/engine-core/pom.xml +++ b/engine-core/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index 05b547576..b0282c36b 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -65,7 +65,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml index 0c8142774..4cfbae01b 100644 --- a/engine-docs/pom.xml +++ b/engine-docs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -28,7 +28,7 @@ io.nosqlbench docsys - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml index e19bb853a..61578960e 100644 --- a/engine-extensions/pom.xml +++ b/engine-extensions/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -22,7 +22,7 @@ io.nosqlbench engine-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 9718d5db0..cb530218e 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -3,7 +3,7 @@ io.nosqlbench mvn-defaults - 3.12.118 + 3.12.119-SNAPSHOT pom @@ -100,7 +100,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git - nosqlbench-3.12.118 + HEAD diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml index 8a60b0250..0a139d7ad 100644 --- a/nb-annotations/pom.xml +++ b/nb-annotations/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults diff --git a/nb-api/pom.xml b/nb-api/pom.xml index 036aa05ef..200cacfd1 100644 --- a/nb-api/pom.xml +++ b/nb-api/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -31,7 +31,7 @@ io.nosqlbench nb-annotations - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/nb/pom.xml b/nb/pom.xml index 7dc5e1cd9..82338994a 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -5,7 +5,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -24,36 +24,36 @@ io.nosqlbench driver-web - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-kafka - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench engine-cli - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench engine-docs - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench engine-core - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench engine-extensions - 3.12.118 + 3.12.119-SNAPSHOT @@ -65,43 +65,43 @@ io.nosqlbench driver-stdout - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-diag - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-tcp - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-http - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-cql-shaded - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-cqlverify - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench driver-mongodb - 3.12.118 + 3.12.119-SNAPSHOT @@ -259,7 +259,7 @@ io.nosqlbench driver-mongodb - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/pom.xml b/pom.xml index 98130c84e..8a85a109a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT mvn-defaults @@ -125,7 +125,7 @@ scm:git:https://github.com/nosqlbench/nosqlbench.git scm:git:git@github.com:nosqlbench/nosqlbench.git - nosqlbench-3.12.118 + HEAD diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml index 9c819f4bd..7c831be81 100644 --- a/virtdata-api/pom.xml +++ b/virtdata-api/pom.xml @@ -7,7 +7,7 @@ io.nosqlbench mvn-defaults - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -23,14 +23,14 @@ io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT nb-api io.nosqlbench virtdata-lang - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml index 5f65bf773..352a30d99 100644 --- a/virtdata-lang/pom.xml +++ b/virtdata-lang/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml index 23d590191..8fbe14030 100644 --- a/virtdata-lib-basics/pom.xml +++ b/virtdata-lib-basics/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -20,7 +20,7 @@ io.nosqlbench virtdata-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml index 9919ff077..710145f28 100644 --- a/virtdata-lib-curves4/pom.xml +++ b/virtdata-lib-curves4/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -22,13 +22,13 @@ io.nosqlbench virtdata-api - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml index e69d5cd3d..9c9e0d752 100644 --- a/virtdata-lib-random/pom.xml +++ b/virtdata-lib-random/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -20,13 +20,13 @@ io.nosqlbench virtdata-api - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench virtdata-lib-basics - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml index 5f2cba51f..2a781cfce 100644 --- a/virtdata-lib-realer/pom.xml +++ b/virtdata-lib-realer/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -24,7 +24,7 @@ io.nosqlbench virtdata-lib-basics - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml index dbf0d6a1c..c102dca97 100644 --- a/virtdata-realdata/pom.xml +++ b/virtdata-realdata/pom.xml @@ -7,7 +7,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -18,7 +18,7 @@ io.nosqlbench virtdata-api - 3.12.118 + 3.12.119-SNAPSHOT diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml index 05794e429..a6c5dc8e1 100644 --- a/virtdata-userlibs/pom.xml +++ b/virtdata-userlibs/pom.xml @@ -4,7 +4,7 @@ mvn-defaults io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT ../mvn-defaults @@ -17,32 +17,32 @@ io.nosqlbench virtdata-realdata - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench virtdata-lib-realer - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench virtdata-api - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench virtdata-lib-random - 3.12.118 + 3.12.119-SNAPSHOT io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT virtdata-lib-basics io.nosqlbench - 3.12.118 + 3.12.119-SNAPSHOT virtdata-lib-curves4 @@ -50,7 +50,7 @@ io.nosqlbench docsys - 3.12.118 + 3.12.119-SNAPSHOT