From 90a1ff3df68c1afded9a963ccd235d83904e7e38 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 6 Feb 2023 18:12:51 -0600 Subject: [PATCH 001/120] fix for #1007 --- .../BundledMarkdownZipExporter.java | 8 +--- .../apps/docsapp/VirtDataGenDocsApp.java | 44 +------------------ 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java b/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java index 5c2d752a2..9ab351ce3 100644 --- a/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java +++ b/nbr/src/main/java/io/nosqlbench/api/docsapi/docexporter/BundledMarkdownZipExporter.java @@ -33,9 +33,6 @@ import java.nio.file.StandardOpenOption; import java.util.Date; import java.util.Locale; import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import java.util.function.Function; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -65,10 +62,7 @@ public class BundledMarkdownZipExporter { } } - ExecutorService executorService = Executors.newSingleThreadExecutor(); - Future> future = executorService.submit(new VirtDataGenDocsApp(null)); - Map builderMap = future.get(); - executorService.shutdown(); + Map builderMap= new VirtDataGenDocsApp(null).call(); String bindingsPrefix ="bindings/"; for(Map.Entry entry : builderMap.entrySet()) { 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 dc872c7f4..2740e2410 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 @@ -29,7 +29,6 @@ import io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs.FDocFuncs; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.FileWriter; import java.io.IOException; import java.io.Writer; import java.nio.charset.StandardCharsets; @@ -73,48 +72,6 @@ public class VirtDataGenDocsApp implements Callable> public Map call() { - /*LinkedList largs = new LinkedList<>(Arrays.asList(args)); - if (args.length > 0 && args[0].contains("help")) { - System.out.println( - "usage:\n" + - "[basefile ] [basedir ] [categories combined|split] [format json|markdown] " + - "[blurbsdirs [:...]]\n\n" - ); - return result; - } - while (largs.peekFirst() != null) { - String argtype = largs.removeFirst(); - if (largs.peekFirst() == null) { - throw new RuntimeException(VirtDataGenDocsApp.class + " expects args in param value couplets."); - } - - String argval = largs.removeFirst().toLowerCase(); - switch (argtype) { - case "basefile": - this.baseFileName = argval; - break; - case "basedir": - this.basedir = argval; - break; - case BLURBS_DIRS: - this.blurbsDirs = argval; - break; - case CATEGORIES: - if (!argval.equals(CATEGORIES_SPLIT) && !argval.equals(CATEGORIES_COMBINED)) { - throw new RuntimeException("categories must either be " + CATEGORIES_SPLIT + ", or " + CATEGORIES_COMBINED + "."); - } - this.categories = argval; - break; - case FORMAT: - if (!argval.equals(FORMAT_MARKDOWN) && !argval.equals(FORMAT_JSON)) { - throw new RuntimeException("format must either be " + FORMAT_MARKDOWN + ", or " + FORMAT_JSON + "."); - } - this.format = argval; - break; - default: - } - }*/ - Optional docsinfo = loadAllDocs(); if (!docsinfo.isPresent()) { @@ -180,6 +137,7 @@ public class VirtDataGenDocsApp implements Callable> logger.debug("writing blurb to " + outputname); builder.append(blurb); + break; } } } From 4de767737471316a33115ed06960efec39d5f73e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 6 Feb 2023 18:57:32 -0600 Subject: [PATCH 002/120] Update README.md Adding allcontributors to repo --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index f3e9578b7..f1da5983a 100644 --- a/README.md +++ b/README.md @@ -104,3 +104,15 @@ available, but more work is needed to support them fully. Here is what is suppor + + +## Contributors + + + + + + + + + From d4ad0bdfc0e7336cb62da0cae4f5ab6b90753261 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Mon, 6 Feb 2023 19:48:54 -0500 Subject: [PATCH 003/120] Configuring all-contributors into the repo --- .all-contributorsrc | 100 ++++++++++++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 14 +++++++ README.md | 2 + 3 files changed, 116 insertions(+) create mode 100644 .all-contributorsrc diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 000000000..e58dcf50e --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,100 @@ +{ "projectName": "nosqlbench", + "projectOwner": "nosqlbench", + "repoType": "github", + "repoHost": "https://github.com", + "files": ["CONTRIBUTING.md"], + "imageSize": 50, + "commit": false, + "contributorsPerLine": 7, + "contributorsSortAlphabetically": false, + "badgeTemplate": "[![All Contributors](https://img.shields.io/github/all-contributors/<%= projectOwner %>/<%= projectName %>?color=ee8449&style=flat-square)](#contributors)", + "contributorTemplate": "\">\" width=\"<%= options.imageSize %>px;\" alt=\"\"/>
<%= contributor.name %>", + "types": { + "custom": { + "symbol": "🔭", + "description": "A custom contribution type.", + "link": "[<%= symbol %>](<%= url %> \"<%= description %>\")," + } + }, + "linkToUsage": false, + "skipCi": true, + "contributors": [ + { + "login": "jshook", + "name": "Jonathan Shook", + "avatar_url": "https://avatars.githubusercontent.com/u/2148847?v=4", + "profile": "https://github.com/jshook", + "contributions": [ + "question", + "doc", + "review", + "talk", + "mentoring", + "platform", + "projectManagement", + "research", + + ] + }, + { + "login": "phact", + "name": "Sebastián Estévez", + "avatar_url": "https://avatars.githubusercontent.com/u/1313220?v=4", + "profile": "https://www.sestevez.com", + "contributions": [ + "question", + "doc", + "review", + "talk" + ] + }, + { + "login": "yabinmeng", + "name": "Yabin Meng", + "avatar_url": "https://avatars.githubusercontent.com/u/16789452?v=4", + "profile": "https://github.com/yabinmeng", + "contributions": [ + "question", + "doc", + "review", + "talk" + ] + }, + { + "login": "MikeYaacoubStax", + "name": "Mike Yaacoub", + "avatar_url": "https://avatars.githubusercontent.com/u/117678633?v=4", + "profile": "https://github.com/MikeYaacoubStax", + "contributions": [ + "question", + "doc", + "review", + "talk" + ] + }, + { + "login": "jeffbanks", + "name": "Jeff Banks", + "avatar_url": "https://avatars.githubusercontent.com/u/4078933?v=4", + "profile": "https://github.com/jeffbanks", + "contributions": [ + "question", + "doc", + "review", + "talk" + ] + }, + { + "login": "msmygit", + "name": "Madhavan S.", + "avatar_url": "https://avatars.githubusercontent.com/u/19366623?v=4", + "profile": "https://github.com/msmygit", + "contributions": [ + "question", + "doc", + "review", + "talk" + ] + }, + ] +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 208e1da06..cb2c97f41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,5 @@ +[![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors) + NoSQLBench is an ambitious project. It aims to solve long-standing problems in distributed systems testing. There are *many* ways you can contribute! Please take a moment to review this document in order to make the contribution process easy and effective for everyone involved. @@ -117,5 +119,17 @@ are eager to get it into the hands of users who need it. [discord server](https://discord.gg/dBHRakusMN) and raise your hand! +## Contributors! :sparkle: +Thanks to these contributors! +For recognizing contributions, please follow [this documentation](https://allcontributors.org/docs/en/bot/usage). + + + + + + + + +--- diff --git a/README.md b/README.md index f3e9578b7..6394e7c4e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ [comment]: < ![build](https://github.com/nosqlbench/nosqlbench/workflows/build/badge.svg) > +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.nosqlbench/nosqlbench/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.nosqlbench/nosqlbench) +[![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors) # NoSQLBench v5 From 977cbc6e5c2785b2350cf465e55b7dadae2b49dc Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 6 Feb 2023 22:12:53 -0600 Subject: [PATCH 004/120] docs updates --- adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md | 2 +- adapter-cqld4/src/main/resources/{curate_docs => }/ssl.md | 0 adapter-tcp/src/main/resources/tcpclient.md | 2 +- adapter-tcp/src/main/resources/tcpserver.md | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename adapter-cqld4/src/main/resources/{curate_docs => }/ssl.md (100%) diff --git a/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md b/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md index 5f3413716..4a655b948 100644 --- a/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md +++ b/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md @@ -160,7 +160,7 @@ activity types. - **ssl** - specifies the type of the SSL implementation. Disabled by default, possible values are `jdk` and `openssl`. - [Additional parameters may need to be provided](ssl.md). + See the ssl help topic for more details with `nb5 help ssl` for more details. - **jmxreporting** - enable JMX reporting if needed. Examples: diff --git a/adapter-cqld4/src/main/resources/curate_docs/ssl.md b/adapter-cqld4/src/main/resources/ssl.md similarity index 100% rename from adapter-cqld4/src/main/resources/curate_docs/ssl.md rename to adapter-cqld4/src/main/resources/ssl.md diff --git a/adapter-tcp/src/main/resources/tcpclient.md b/adapter-tcp/src/main/resources/tcpclient.md index 641b66ca3..a2dbbbc60 100644 --- a/adapter-tcp/src/main/resources/tcpclient.md +++ b/adapter-tcp/src/main/resources/tcpclient.md @@ -33,7 +33,7 @@ Run a stdout activity named 'stdout-test', with definitions from activities/stdo To enable, specifies the type of the SSL implementation with either `jdk` or `openssl`. - [Additional parameters may need to be provided](../../../../driver-cql/src/main/resources/ssl.md). + See the ssl help topic for more details with `nb5 help ssl` for more details. - **host** - this is the name to bind to (local interface address) - default: localhost diff --git a/adapter-tcp/src/main/resources/tcpserver.md b/adapter-tcp/src/main/resources/tcpserver.md index 73a4c0222..7b77dda78 100644 --- a/adapter-tcp/src/main/resources/tcpserver.md +++ b/adapter-tcp/src/main/resources/tcpserver.md @@ -45,7 +45,7 @@ Run a stdout activity named 'stdout-test', with definitions from activities/stdo To enable, specifies the type of the SSL implementation with either `jdk` or `openssl`. - [Additional parameters may need to be provided](../../../../driver-cql/src/main/resources/ssl.md). + See the ssl help topic for more details with `nb5 help ssl` for more details. - **host** - this is the name to bind to (local interface address) - default: localhost From d6259eb635e652d9e79d0ab4c27b7452ec281b2e Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 6 Feb 2023 22:33:50 -0600 Subject: [PATCH 005/120] update all contributors config --- .all-contributorsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index e58dcf50e..cf78345fd 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2,7 +2,7 @@ "projectOwner": "nosqlbench", "repoType": "github", "repoHost": "https://github.com", - "files": ["CONTRIBUTING.md"], + "files": ["README.md"], "imageSize": 50, "commit": false, "contributorsPerLine": 7, From 3c921232b5684ab90cc633f571d586ca644215e8 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 6 Feb 2023 22:51:11 -0600 Subject: [PATCH 006/120] Update .all-contributorsrc --- .all-contributorsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index cf78345fd..7e3d0b334 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -7,7 +7,7 @@ "commit": false, "contributorsPerLine": 7, "contributorsSortAlphabetically": false, - "badgeTemplate": "[![All Contributors](https://img.shields.io/github/all-contributors/<%= projectOwner %>/<%= projectName %>?color=ee8449&style=flat-square)](#contributors)", + "badgeTemplate": "[![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors)", "contributorTemplate": "\">\" width=\"<%= options.imageSize %>px;\" alt=\"\"/>
<%= contributor.name %>", "types": { "custom": { From 9e919feb4390cb5447bf0e6b9edc28fcf244aed6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 6 Feb 2023 22:53:55 -0600 Subject: [PATCH 007/120] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 2c55a02dd..fcc4d1630 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ [comment]: < ![build](https://github.com/nosqlbench/nosqlbench/workflows/build/badge.svg) > [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.nosqlbench/nosqlbench/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.nosqlbench/nosqlbench) -[![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors) - # NoSQLBench v5 From b57da7a25c3d390e23bebb9b53b71068d18f036c Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 7 Feb 2023 07:12:43 +0200 Subject: [PATCH 008/120] Upgrade maven plugins and remove versions of plugins where version is defined in pluginManagement --- mvn-defaults/pom.xml | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 136cd7921..1043a94f9 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -501,7 +501,6 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 ISO-8859-1 @@ -535,7 +534,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 true 17 @@ -551,7 +549,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M6 -ea ${argLine} @@ -576,7 +573,6 @@ org.jacoco jacoco-maven-plugin - 0.8.8 prepare-agent @@ -627,7 +623,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M6 run-tests @@ -655,7 +650,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 17 ${javadoc.name} @@ -686,7 +680,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -702,7 +695,6 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 true ossrh @@ -714,7 +706,6 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 @@ -744,7 +735,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 enforce-java @@ -768,18 +758,18 @@ org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.4.2 org.apache.maven.plugins maven-release-plugin - 3.0.0-M6 + 3.0.0-M7 org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 org.apache.maven.plugins @@ -789,27 +779,27 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0-M8 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M4 + 3.0.0-M8 org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.4.1 org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.1 org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 org.antlr @@ -819,43 +809,43 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.1.0 org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.2.1 org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.2.0 org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.3.0 org.jacoco - org.jacoco.ant + jacoco-maven-plugin ${jacoco.version} org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.3.0 org.apache.maven.plugins maven-install-plugin - 3.0.0-M1 + 3.1.0 org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 3.0.0 From 10da1699edd0e048bfb5f2ca42ff440a6c271ecb Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 7 Feb 2023 07:35:00 +0200 Subject: [PATCH 009/120] Optimize enum mappings and cache Avro schemas in PulsarAdapterUtil --- .../pulsar/util/PulsarAdapterUtil.java | 277 +++++++----------- 1 file changed, 108 insertions(+), 169 deletions(-) diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java index e61f76eea..1429167d1 100644 --- a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java +++ b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java @@ -16,6 +16,7 @@ package io.nosqlbench.adapter.pulsar.util; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.nosqlbench.adapter.pulsar.exception.PulsarAdapterInvalidParamException; import io.nosqlbench.adapter.pulsar.exception.PulsarAdapterUnexpectedException; @@ -23,6 +24,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.api.Schema; +import org.apache.pulsar.common.schema.SchemaInfo; +import org.apache.pulsar.common.schema.SchemaType; import java.io.IOException; import java.net.URI; @@ -30,7 +33,11 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.Base64; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -60,9 +67,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isValidDocLevelParam(String param) { - return Arrays.stream(DOC_LEVEL_PARAMS.values()).anyMatch(t -> t.label.equals(param)); - } /////// // Message processing sequence error simulation types @@ -77,29 +81,21 @@ public class PulsarAdapterUtil { this.label = label; } - private static final Map MAPPING = new HashMap<>(); - - static { - for (MSG_SEQ_ERROR_SIMU_TYPE simuType : values()) { - MAPPING.put(simuType.label, simuType); - MAPPING.put(simuType.label.toLowerCase(), simuType); - MAPPING.put(simuType.label.toUpperCase(), simuType); - MAPPING.put(simuType.name(), simuType); - MAPPING.put(simuType.name().toLowerCase(), simuType); - MAPPING.put(simuType.name().toUpperCase(), simuType); - } - } + private static final Map MAPPING = Stream.of(values()) + .flatMap(simuType -> + Stream.of(simuType.label, + simuType.label.toLowerCase(), + simuType.label.toUpperCase(), + simuType.name(), + simuType.name().toLowerCase(), + simuType.name().toUpperCase()) + .distinct().map(key -> Map.entry(key, simuType))) + .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue)); public static Optional parseSimuType(String simuTypeString) { return Optional.ofNullable(MAPPING.get(simuTypeString.trim())); } } - public static boolean isValidSeqErrSimuType(String item) { - return Arrays.stream(MSG_SEQ_ERROR_SIMU_TYPE.values()).anyMatch(t -> t.label.equals(item)); - } - public static String getValidSeqErrSimuTypeList() { - return Arrays.stream(MSG_SEQ_ERROR_SIMU_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); - } /////// // Valid Pulsar API type @@ -113,12 +109,15 @@ public class PulsarAdapterUtil { PULSAR_API_TYPE(String label) { this.label = label; } + + private static final Set LABELS = Stream.of(values()).map(v -> v.label).collect(Collectors.toUnmodifiableSet()); + + public static boolean isValidLabel(String label) { + return LABELS.contains(label); + } } public static boolean isValidPulsarApiType(String param) { - return Arrays.stream(PULSAR_API_TYPE.values()).anyMatch(t -> t.label.equals(param)); - } - public static String getValidPulsarApiTypeList() { - return Arrays.stream(PULSAR_API_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); + return PULSAR_API_TYPE.isValidLabel(param); } @@ -136,14 +135,16 @@ public class PulsarAdapterUtil { CONF_GATEGORY(String label) { this.label = label; } + + private static final Set LABELS = Stream.of(values()).map(v -> v.label).collect(Collectors.toUnmodifiableSet()); + + public static boolean isValidLabel(String label) { + return LABELS.contains(label); + } } public static boolean isValidConfCategory(String item) { - return Arrays.stream(CONF_GATEGORY.values()).anyMatch(t -> t.label.equals(item)); + return CONF_GATEGORY.isValidLabel(item); } - public static String getValidConfCategoryList() { - return Arrays.stream(CONF_GATEGORY.values()).map(t -> t.label).collect(Collectors.joining(", ")); - } - /////// // Valid persistence type public enum PERSISTENT_TYPES { @@ -156,9 +157,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isValidPersistenceType(String type) { - return Arrays.stream(PERSISTENT_TYPES.values()).anyMatch(t -> t.label.equals(type)); - } /////// // Valid Pulsar client configuration (activity-level settings) @@ -194,9 +192,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isValidClientConfItem(String item) { - return Arrays.stream(CLNT_CONF_KEY.values()).anyMatch(t -> t.label.equals(item)); - } /////// // Standard producer configuration (activity-level settings) @@ -222,9 +217,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isStandardProducerConfItem(String item) { - return Arrays.stream(PRODUCER_CONF_STD_KEY.values()).anyMatch(t -> t.label.equals(item)); - } // compressionType public enum COMPRESSION_TYPE { @@ -239,12 +231,12 @@ public class PulsarAdapterUtil { COMPRESSION_TYPE(String label) { this.label = label; } + + private final static String TYPE_LIST = Stream.of(COMPRESSION_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); } - public static boolean isValidCompressionType(String item) { - return Arrays.stream(COMPRESSION_TYPE.values()).anyMatch(t -> t.label.equals(item)); - } + public static String getValidCompressionTypeList() { - return Arrays.stream(COMPRESSION_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); + return COMPRESSION_TYPE.TYPE_LIST; } /////// @@ -284,9 +276,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isStandardConsumerConfItem(String item) { - return Arrays.stream(CONSUMER_CONF_STD_KEY.values()).anyMatch(t -> t.label.equals(item)); - } /////// // Custom consumer configuration (activity-level settings) @@ -301,9 +290,16 @@ public class PulsarAdapterUtil { CONSUMER_CONF_CUSTOM_KEY(String label) { this.label = label; } + + private static final Set LABELS = Stream.of(values()).map(v -> v.label).collect(Collectors.toUnmodifiableSet()); + + public static boolean isValidLabel(String label) { + return LABELS.contains(label); + } + } public static boolean isCustomConsumerConfItem(String item) { - return Arrays.stream(CONSUMER_CONF_CUSTOM_KEY.values()).anyMatch(t -> t.label.equals(item)); + return CONSUMER_CONF_CUSTOM_KEY.isValidLabel(item); } // subscriptionTyp @@ -318,12 +314,21 @@ public class PulsarAdapterUtil { SUBSCRIPTION_TYPE(String label) { this.label = label; } + + private static final Set LABELS = Stream.of(values()).map(v -> v.label) + .collect(Collectors.toUnmodifiableSet()); + + public static boolean isValidLabel(String label) { + return LABELS.contains(label); + } + + private final static String TYPE_LIST = Stream.of(COMPRESSION_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); } public static boolean isValidSubscriptionType(String item) { - return Arrays.stream(SUBSCRIPTION_TYPE.values()).anyMatch(t -> t.label.equals(item)); + return SUBSCRIPTION_TYPE.isValidLabel(item); } public static String getValidSubscriptionTypeList() { - return Arrays.stream(SUBSCRIPTION_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); + return SUBSCRIPTION_TYPE.TYPE_LIST; } // subscriptionInitialPosition @@ -336,12 +341,12 @@ public class PulsarAdapterUtil { SUBSCRIPTION_INITIAL_POSITION(String label) { this.label = label; } - } - public static boolean isValidSubscriptionInitialPosition(String item) { - return Arrays.stream(SUBSCRIPTION_INITIAL_POSITION.values()).anyMatch(t -> t.label.equals(item)); + + private final static String TYPE_LIST = Stream.of(COMPRESSION_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); + } public static String getValidSubscriptionInitialPositionList() { - return Arrays.stream(SUBSCRIPTION_INITIAL_POSITION.values()).map(t -> t.label).collect(Collectors.joining(", ")); + return SUBSCRIPTION_INITIAL_POSITION.TYPE_LIST; } // regexSubscriptionMode @@ -355,12 +360,12 @@ public class PulsarAdapterUtil { REGEX_SUBSCRIPTION_MODE(String label) { this.label = label; } + + private final static String TYPE_LIST = Stream.of(COMPRESSION_TYPE.values()).map(t -> t.label).collect(Collectors.joining(", ")); } - public static boolean isValidRegexSubscriptionMode(String item) { - return Arrays.stream(REGEX_SUBSCRIPTION_MODE.values()).anyMatch(t -> t.label.equals(item)); - } + public static String getValidRegexSubscriptionModeList() { - return Arrays.stream(REGEX_SUBSCRIPTION_MODE.values()).map(t -> t.label).collect(Collectors.joining(", ")); + return REGEX_SUBSCRIPTION_MODE.TYPE_LIST; } /////// @@ -383,9 +388,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isStandardReaderConfItem(String item) { - return Arrays.stream(READER_CONF_STD_KEY.values()).anyMatch(t -> t.label.equals(item)); - } /////// // Custom reader configuration (activity-level settings) @@ -400,9 +402,6 @@ public class PulsarAdapterUtil { this.label = label; } } - public static boolean isCustomReaderConfItem(String item) { - return Arrays.stream(READER_CONF_CUSTOM_KEY.values()).anyMatch(t -> t.label.equals(item)); - } /////// // Valid read positions for a Pulsar reader @@ -415,135 +414,72 @@ public class PulsarAdapterUtil { READER_MSG_POSITION_TYPE(String label) { this.label = label; } + + private static final Set LABELS = Stream.of(values()).map(v -> v.label) + .collect(Collectors.toUnmodifiableSet()); + + public static boolean isValidLabel(String label) { + return LABELS.contains(label); + } } public static boolean isValideReaderStartPosition(String item) { - return Arrays.stream(READER_MSG_POSITION_TYPE.values()).anyMatch(t -> t.label.equals(item)); + return READER_MSG_POSITION_TYPE.isValidLabel(item); } + private static final Map> PRIMITIVE_SCHEMA_TYPE_MAPPING = Stream.of(SchemaType.values()) + .filter(SchemaType::isPrimitive) + .collect(Collectors.toUnmodifiableMap(schemaType -> schemaType.name().toUpperCase(), + schemaType -> Schema.getSchema(SchemaInfo.builder().type(schemaType).build()))); + /////// // Primitive Schema type public static boolean isPrimitiveSchemaTypeStr(String typeStr) { - boolean isPrimitive = false; - - // Use "BYTES" as the default type if the type string is not explicitly specified - if (StringUtils.isBlank(typeStr)) { - typeStr = "BYTES"; - } - - if (typeStr.equalsIgnoreCase("BOOLEAN") || typeStr.equalsIgnoreCase("INT8") || - typeStr.equalsIgnoreCase("INT16") || typeStr.equalsIgnoreCase("INT32") || - typeStr.equalsIgnoreCase("INT64") || typeStr.equalsIgnoreCase("FLOAT") || - typeStr.equalsIgnoreCase("DOUBLE") || typeStr.equalsIgnoreCase("BYTES") || - typeStr.equalsIgnoreCase("DATE") || typeStr.equalsIgnoreCase("TIME") || - typeStr.equalsIgnoreCase("TIMESTAMP") || typeStr.equalsIgnoreCase("INSTANT") || - typeStr.equalsIgnoreCase("LOCAL_DATE") || typeStr.equalsIgnoreCase("LOCAL_TIME") || - typeStr.equalsIgnoreCase("LOCAL_DATE_TIME")) { - isPrimitive = true; - } - - return isPrimitive; + return StringUtils.isBlank(typeStr) || PRIMITIVE_SCHEMA_TYPE_MAPPING.containsKey(typeStr.toUpperCase()); } + public static Schema getPrimitiveTypeSchema(String typeStr) { - Schema schema; - - if (StringUtils.isBlank(typeStr)) { - typeStr = "BYTES"; + String lookupKey = StringUtils.isBlank(typeStr) ? "BYTES" : typeStr.toUpperCase(); + Schema schema = PRIMITIVE_SCHEMA_TYPE_MAPPING.get(lookupKey); + if (schema == null) { + throw new PulsarAdapterInvalidParamException("Invalid Pulsar primitive schema type string : " + typeStr); } - - switch (typeStr.toUpperCase()) { - case "BOOLEAN": - schema = Schema.BOOL; - break; - case "INT8": - schema = Schema.INT8; - break; - case "INT16": - schema = Schema.INT16; - break; - case "INT32": - schema = Schema.INT32; - break; - case "INT64": - schema = Schema.INT64; - break; - case "FLOAT": - schema = Schema.FLOAT; - break; - case "DOUBLE": - schema = Schema.DOUBLE; - break; - case "DATE": - schema = Schema.DATE; - break; - case "TIME": - schema = Schema.TIME; - break; - case "TIMESTAMP": - schema = Schema.TIMESTAMP; - break; - case "INSTANT": - schema = Schema.INSTANT; - break; - case "LOCAL_DATE": - schema = Schema.LOCAL_DATE; - break; - case "LOCAL_TIME": - schema = Schema.LOCAL_TIME; - break; - case "LOCAL_DATE_TIME": - schema = Schema.LOCAL_DATE_TIME; - break; - case "BYTES": - schema = Schema.BYTES; - break; - // Report an error if non-valid, non-empty schema type string is provided - default: - throw new PulsarAdapterInvalidParamException("Invalid Pulsar primitive schema type string : " + typeStr); - } - return schema; } /////// // Complex strut type: Avro or Json public static boolean isAvroSchemaTypeStr(String typeStr) { - return (StringUtils.isNotBlank(typeStr) && typeStr.equalsIgnoreCase("AVRO")); + return "AVRO".equalsIgnoreCase(typeStr); } // automatic decode the type from the Registry public static boolean isAutoConsumeSchemaTypeStr(String typeStr) { - return (StringUtils.isNotBlank(typeStr) && typeStr.equalsIgnoreCase("AUTO_CONSUME")); + return "AUTO_CONSUME".equalsIgnoreCase(typeStr); } - public static Schema getAvroSchema(String typeStr, String definitionStr) { - String schemaDefinitionStr = definitionStr; - String filePrefix = "file://"; - Schema schema; + private static final Map> AVRO_SCHEMA_CACHE = new ConcurrentHashMap<>(); + + public static Schema getAvroSchema(String typeStr, final String definitionStr) { // Check if payloadStr points to a file (e.g. "file:///path/to/a/file") if (isAvroSchemaTypeStr(typeStr)) { - if (StringUtils.isBlank(schemaDefinitionStr)) { - throw new PulsarAdapterInvalidParamException( - "Schema definition must be provided for \"Avro\" schema type!"); + if (StringUtils.isBlank(definitionStr)) { + throw new PulsarAdapterInvalidParamException("Schema definition must be provided for \"Avro\" schema type!"); } - else if (schemaDefinitionStr.startsWith(filePrefix)) { - try { - Path filePath = Paths.get(URI.create(schemaDefinitionStr)); - schemaDefinitionStr = Files.readString(filePath, StandardCharsets.US_ASCII); + return AVRO_SCHEMA_CACHE.computeIfAbsent(definitionStr, __ -> { + String schemaDefinitionStr = definitionStr; + if (schemaDefinitionStr.startsWith("file://")) { + try { + Path filePath = Paths.get(URI.create(schemaDefinitionStr)); + schemaDefinitionStr = Files.readString(filePath, StandardCharsets.UTF_8); + } catch (IOException ioe) { + throw new PulsarAdapterUnexpectedException("Error reading the specified \"Avro\" schema definition file: " + definitionStr + ": " + ioe.getMessage()); + } } - catch (IOException ioe) { - throw new PulsarAdapterUnexpectedException( - "Error reading the specified \"Avro\" schema definition file: " + definitionStr + ": " + ioe.getMessage()); - } - } - - schema = PulsarAvroSchemaUtil.GetSchema_PulsarAvro("NBAvro", schemaDefinitionStr); + return PulsarAvroSchemaUtil.GetSchema_PulsarAvro("NBAvro", schemaDefinitionStr); + }); + } else { + throw new PulsarAdapterInvalidParamException("Trying to create a \"Avro\" schema for a non-Avro schema type string: " + typeStr); } - else { - throw new PulsarAdapterInvalidParamException( - "Trying to create a \"Avro\" schema for a non-Avro schema type string: " + typeStr); - } - - return schema; } /////// @@ -560,11 +496,14 @@ public class PulsarAdapterUtil { /////// // Convert JSON string to a key/value map - public static Map convertJsonToMap(String jsonStr) throws Exception { - ObjectMapper mapper = new ObjectMapper(); - return mapper.readValue(jsonStr, Map.class); + private static final ObjectMapper JACKSON_OBJECT_MAPPER = new ObjectMapper(); + private static final TypeReference> MAP_TYPE_REF = new TypeReference<>() {}; + + public static Map convertJsonToMap(String jsonStr) throws IOException { + return JACKSON_OBJECT_MAPPER.readValue(jsonStr, MAP_TYPE_REF); } + /////// // Get full namespace name (/) from a Pulsar topic URI public static String getFullNamespaceName(String topicUri) { From 54917907514cb9bb35267c11b3df20a1f08f223d Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 7 Feb 2023 08:06:42 +0200 Subject: [PATCH 010/120] Optimize cache keys and fix races with caches in PulsarSpace --- .../adapter/pulsar/PulsarSpace.java | 27 ++++-- .../dispensers/PulsarBaseOpDispenser.java | 90 +++++-------------- .../pulsar/util/PulsarAdapterUtil.java | 12 --- 3 files changed, 40 insertions(+), 89 deletions(-) diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java index 4aba161f1..9cc5e44c6 100644 --- a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java +++ b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java @@ -32,8 +32,10 @@ import org.apache.pulsar.client.admin.PulsarAdminBuilder; import org.apache.pulsar.client.api.*; import org.apache.pulsar.common.schema.KeyValueEncodingType; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; public class PulsarSpace implements AutoCloseable { @@ -50,9 +52,18 @@ public class PulsarSpace implements AutoCloseable { private PulsarAdmin pulsarAdmin; private Schema pulsarSchema; - private final ConcurrentHashMap> producers = new ConcurrentHashMap<>(); - private final ConcurrentHashMap> consumers = new ConcurrentHashMap<>(); - private final ConcurrentHashMap> readers = new ConcurrentHashMap<>(); + public record ProducerCacheKey(String producerName, String topicName) { + } + + private final ConcurrentHashMap> producers = new ConcurrentHashMap<>(); + + public record ConsumerCacheKey(String consumerName, String subscriptionName, List topicNameList, String topicPattern) { + } + private final ConcurrentHashMap> consumers = new ConcurrentHashMap<>(); + + public record ReaderCacheKey(String readerName, String topicName, String startMsgPosStr) { + } + private final ConcurrentHashMap> readers = new ConcurrentHashMap<>(); public PulsarSpace(String spaceName, NBConfiguration cfg) { @@ -89,13 +100,11 @@ public class PulsarSpace implements AutoCloseable { public int getProducerSetCnt() { return producers.size(); } public int getConsumerSetCnt() { return consumers.size(); } public int getReaderSetCnt() { return readers.size(); } - public Producer getProducer(String name) { return producers.get(name); } - public void setProducer(String name, Producer producer) { producers.put(name, producer); } - public Consumer getConsumer(String name) { return consumers.get(name); } - public void setConsumer(String name, Consumer consumer) { consumers.put(name, consumer); } + public Producer getProducer(ProducerCacheKey key, Supplier> producerSupplier) { return producers.computeIfAbsent(key, __ -> producerSupplier.get()); } - public Reader getReader(String name) { return readers.get(name); } - public void setReader(String name, Reader reader) { readers.put(name, reader); } + public Consumer getConsumer(ConsumerCacheKey key, Supplier> consumerSupplier) { return consumers.computeIfAbsent(key, __ -> consumerSupplier.get()); } + + public Reader getReader(ReaderCacheKey key, Supplier> readerSupplier) { return readers.computeIfAbsent(key, __ -> readerSupplier.get()); } /** diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java index 1de99a097..2e1b40230 100644 --- a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java +++ b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java @@ -37,7 +37,6 @@ import java.util.*; import java.util.function.LongFunction; import java.util.function.Predicate; import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; public abstract class PulsarBaseOpDispenser extends BaseOpDispenser implements NBNamedElement { @@ -239,10 +238,8 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser producer = pulsarSpace.getProducer(producerCacheKey); - - if (producer == null) { + PulsarSpace.ProducerCacheKey producerCacheKey = new PulsarSpace.ProducerCacheKey(producerName, topicName); + return pulsarSpace.getProducer(producerCacheKey, () -> { PulsarClient pulsarClient = pulsarSpace.getPulsarClient(); // Get other possible producer settings that are set at global level @@ -262,21 +259,17 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser producer = producerBuilder.create(); pulsarAdapterMetrics.registerProducerApiMetrics(producer, getPulsarAPIMetricsPrefix( PulsarAdapterUtil.PULSAR_API_TYPE.PRODUCER.label, producerName, topicName)); - } - catch (PulsarClientException ple) { + return producer; + } catch (PulsarClientException ple) { throw new PulsarAdapterUnexpectedException("Failed to create a Pulsar producer."); } - } - - return producer; + }); } private List getEffectiveConsumerTopicNameList(String cycleTopicNameListStr) { @@ -296,24 +289,6 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser topicNameList = getEffectiveConsumerTopicNameList(cycleTopicNameListStr); - String topicPatternStr = getEffectiveConValue( + String topicPatternStr = StringUtils.trimToNull(getEffectiveConValue( PulsarAdapterUtil.CONF_GATEGORY.Consumer.label, PulsarAdapterUtil.CONSUMER_CONF_STD_KEY.topicsPattern.label, - cycleTopicPatternStr); - Pattern topicPattern = getEffectiveConsumerTopicPattern(cycleTopicPatternStr); + cycleTopicPatternStr)); String subscriptionName = getEffectiveConValue( PulsarAdapterUtil.CONF_GATEGORY.Consumer.label, @@ -368,28 +342,14 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser 1 || (topicPattern != null)); - - String consumerTopicListString; - if (!topicNameList.isEmpty()) { - consumerTopicListString = String.join("|", topicNameList); - } else { - consumerTopicListString = topicPatternStr; - } - - String consumerCacheKey = PulsarAdapterUtil.buildCacheKey( - consumerName, - subscriptionName, - consumerTopicListString); - Consumer consumer = pulsarSpace.getConsumer(consumerCacheKey); - - if (consumer == null) { + return pulsarSpace.getConsumer( + new PulsarSpace.ConsumerCacheKey(consumerName, subscriptionName, topicNameList, topicPatternStr), () -> { PulsarClient pulsarClient = pulsarSpace.getPulsarClient(); // Get other possible consumer settings that are set at global level @@ -417,6 +377,7 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser 1 || (topicPatternStr != null)); if (!multiTopicConsumer) { assert (topicNameList.size() == 1); consumerBuilder = pulsarClient.newConsumer(pulsarSpace.getPulsarSchema()); @@ -429,6 +390,7 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser consumer = consumerBuilder.subscribe(); + String consumerTopicListString = (!topicNameList.isEmpty()) ? String.join("|", topicNameList) : topicPatternStr; pulsarAdapterMetrics.registerConsumerApiMetrics( consumer, getPulsarAPIMetricsPrefix( PulsarAdapterUtil.PULSAR_API_TYPE.CONSUMER.label, consumerName, consumerTopicListString)); + + return consumer; } catch (PulsarClientException ple) { throw new PulsarAdapterUnexpectedException("Failed to create a Pulsar consumer!"); } - } - - return consumer; + }); } private static Range[] parseRanges(String ranges) { @@ -528,10 +490,7 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser reader = pulsarSpace.getReader(readerCacheKey); - - if (reader == null) { + return pulsarSpace.getReader(new PulsarSpace.ReaderCacheKey(readerName, topicName, startMsgPosStr), () -> { PulsarClient pulsarClient = pulsarSpace.getPulsarClient();; Map readerConf = pulsarSpace.getPulsarNBClientConf().getReaderConfMapTgt(); @@ -558,17 +517,12 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser !StringUtils.isBlank(s)) - .collect(Collectors.joining(",")); - - return Base64.getEncoder().encodeToString(joinedKeyStr.getBytes()); - } - /////// // Convert JSON string to a key/value map private static final ObjectMapper JACKSON_OBJECT_MAPPER = new ObjectMapper(); From c144114c6929acbddfc25fa239133ad9eabef6bd Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 7 Feb 2023 08:33:03 +0200 Subject: [PATCH 011/120] Run builddocs only for pushes to master branch in nosqlbench/nosqlbench --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed002fbf7..ed7c23fdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,6 +79,7 @@ jobs: builddocs: needs: build runs-on: ubuntu-20.04 + if: ${{ github.repository == 'nosqlbench/nosqlbench' && github.event_name == 'push' && github.ref_name == 'master' }} steps: - name: set git username From f9fe79818a9494c9a32a6cba868e9ca81038a0de Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 7 Feb 2023 08:45:02 +0200 Subject: [PATCH 012/120] Re-add tests for MessageSequenceNumberSendingHandler and ReceivedMessageSequenceTracker - migrate tests from NB4 to NB5 --- ...ssageSequenceNumberSendingHandlerTest.java | 90 +++++++ .../ReceivedMessageSequenceTrackerTest.java | 247 ++++++++++++++++++ 2 files changed, 337 insertions(+) create mode 100644 adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/MessageSequenceNumberSendingHandlerTest.java create mode 100644 adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/ReceivedMessageSequenceTrackerTest.java diff --git a/adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/MessageSequenceNumberSendingHandlerTest.java b/adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/MessageSequenceNumberSendingHandlerTest.java new file mode 100644 index 000000000..9b16a7892 --- /dev/null +++ b/adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/MessageSequenceNumberSendingHandlerTest.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.adapter.pulsar.util; + +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class MessageSequenceNumberSendingHandlerTest { + MessageSequenceNumberSendingHandler sequenceNumberSendingHandler = new MessageSequenceNumberSendingHandler(); + + @Test + void shouldAddMonotonicSequence() { + for (long l = 1; l <= 100; l++) { + assertEquals(l, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + } + } + + @Test + void shouldInjectMessageLoss() { + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(3L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.singleton(PulsarAdapterUtil.MSG_SEQ_ERROR_SIMU_TYPE.MsgLoss), 100)); + } + + @Test + void shouldInjectMessageDuplication() { + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.singleton(PulsarAdapterUtil.MSG_SEQ_ERROR_SIMU_TYPE.MsgDup), 100)); + } + + @Test + void shouldInjectMessageOutOfOrder() { + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(4L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.singleton(PulsarAdapterUtil.MSG_SEQ_ERROR_SIMU_TYPE.OutOfOrder), 100)); + assertEquals(2L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(3L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(5L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + assertEquals(6, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + } + + @Test + void shouldInjectOneOfTheSimulatedErrorsRandomly() { + Set allErrorTypes = new HashSet<>(Arrays.asList(PulsarAdapterUtil.MSG_SEQ_ERROR_SIMU_TYPE.values())); + + assertEquals(1L, sequenceNumberSendingHandler.getNextSequenceNumber(Collections.emptySet())); + long previousSequenceNumber = 1L; + int outOfSequenceInjectionCounter = 0; + int messageDupCounter = 0; + int messageLossCounter = 0; + int successCounter = 0; + for (int i = 0; i < 1000; i++) { + long nextSequenceNumber = sequenceNumberSendingHandler.getNextSequenceNumber(allErrorTypes); + if (nextSequenceNumber >= previousSequenceNumber + 3) { + outOfSequenceInjectionCounter++; + } else if (nextSequenceNumber <= previousSequenceNumber) { + messageDupCounter++; + } else if (nextSequenceNumber >= previousSequenceNumber + 2) { + messageLossCounter++; + } else if (nextSequenceNumber == previousSequenceNumber + 1) { + successCounter++; + } + previousSequenceNumber = nextSequenceNumber; + } + assertTrue(outOfSequenceInjectionCounter > 0); + assertTrue(messageDupCounter > 0); + assertTrue(messageLossCounter > 0); + assertEquals(1000, outOfSequenceInjectionCounter + messageDupCounter + messageLossCounter + successCounter); + } + +} diff --git a/adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/ReceivedMessageSequenceTrackerTest.java b/adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/ReceivedMessageSequenceTrackerTest.java new file mode 100644 index 000000000..6b66e5f4d --- /dev/null +++ b/adapter-pulsar/src/test/java/io/nosqlbench/adapter/pulsar/util/ReceivedMessageSequenceTrackerTest.java @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package io.nosqlbench.adapter.pulsar.util; + +import com.codahale.metrics.Counter; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class ReceivedMessageSequenceTrackerTest { + Counter msgErrOutOfSeqCounter = new Counter(); + Counter msgErrDuplicateCounter = new Counter(); + Counter msgErrLossCounter = new Counter(); + ReceivedMessageSequenceTracker messageSequenceTracker = new ReceivedMessageSequenceTracker(msgErrOutOfSeqCounter, msgErrDuplicateCounter, msgErrLossCounter, 20, 20); + + @Test + void shouldCountersBeZeroWhenSequenceDoesntContainGaps() { + // when + for (long l = 0; l < 100L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.close(); + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @ParameterizedTest + @ValueSource(longs = {10L, 11L, 19L, 20L, 21L, 100L}) + void shouldDetectMsgLossWhenEverySecondMessageIsLost(long totalMessages) { + doShouldDetectMsgLoss(totalMessages, 2); + } + + @ParameterizedTest + @ValueSource(longs = {10L, 11L, 19L, 20L, 21L, 100L}) + void shouldDetectMsgLossWhenEveryThirdMessageIsLost(long totalMessages) { + doShouldDetectMsgLoss(totalMessages, 3); + } + + @ParameterizedTest + @ValueSource(longs = {20L, 21L, 40L, 41L, 42L, 43L, 100L}) + void shouldDetectMsgLossWhenEvery21stMessageIsLost(long totalMessages) { + doShouldDetectMsgLoss(totalMessages, 21); + } + + private void doShouldDetectMsgLoss(long totalMessages, int looseEveryNthMessage) { + int messagesLost = 0; + // when + boolean lastMessageWasLost = false; + for (long l = 0; l < totalMessages; l++) { + if (l % looseEveryNthMessage == 1) { + messagesLost++; + lastMessageWasLost = true; + continue; + } else { + lastMessageWasLost = false; + } + messageSequenceTracker.sequenceNumberReceived(l); + } + if (lastMessageWasLost) { + messageSequenceTracker.sequenceNumberReceived(totalMessages); + } + messageSequenceTracker.close(); + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(messagesLost, msgErrLossCounter.getCount()); + } + + @ParameterizedTest + @ValueSource(longs = {10L, 11L, 19L, 20L, 21L, 100L}) + void shouldDetectMsgDuplication(long totalMessages) { + int messagesDuplicated = 0; + // when + for (long l = 0; l < totalMessages; l++) { + if (l % 2 == 1) { + messagesDuplicated++; + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.sequenceNumberReceived(l); + } + if (totalMessages % 2 == 0) { + messageSequenceTracker.sequenceNumberReceived(totalMessages); + } + if (totalMessages < 2 * messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers()) { + messageSequenceTracker.close(); + } + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(messagesDuplicated, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectSingleMessageOutOfSequence() { + // when + for (long l = 0; l < 10L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.sequenceNumberReceived(10L); + messageSequenceTracker.sequenceNumberReceived(12L); + messageSequenceTracker.sequenceNumberReceived(11L); + for (long l = 13L; l < 100L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + + // then + assertEquals(1, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectMultipleMessagesOutOfSequence() { + // when + for (long l = 0; l < 10L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + messageSequenceTracker.sequenceNumberReceived(10L); + messageSequenceTracker.sequenceNumberReceived(14L); + messageSequenceTracker.sequenceNumberReceived(13L); + messageSequenceTracker.sequenceNumberReceived(11L); + messageSequenceTracker.sequenceNumberReceived(12L); + for (long l = 15L; l < 100L; l++) { + messageSequenceTracker.sequenceNumberReceived(l); + } + + // then + assertEquals(2, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectIndividualMessageLoss() { + // when + for (long l = 0; l < 100L; l++) { + if (l != 11L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(1, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectGapAndMessageDuplication() { + // when + for (long l = 0; l < 100L; l++) { + if (l != 11L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == 12L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(1, msgErrDuplicateCounter.getCount()); + assertEquals(1, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectGapAndMessageDuplicationTimes2() { + // when + for (long l = 0; l < 100L; l++) { + if (l != 11L) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == 12L) { + messageSequenceTracker.sequenceNumberReceived(l); + messageSequenceTracker.sequenceNumberReceived(l); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(0, msgErrOutOfSeqCounter.getCount()); + assertEquals(2, msgErrDuplicateCounter.getCount()); + assertEquals(1, msgErrLossCounter.getCount()); + } + + + @Test + void shouldDetectDelayedOutOfOrderDelivery() { + // when + for (long l = 0; l < 5 * messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers(); l++) { + if (l != 10) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers() * 2) { + messageSequenceTracker.sequenceNumberReceived(10); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(1, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } + + @Test + void shouldDetectDelayedOutOfOrderDeliveryOf2ConsecutiveSequenceNumbers() { + // when + for (long l = 0; l < 5 * messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers(); l++) { + if (l != 10 && l != 11) { + messageSequenceTracker.sequenceNumberReceived(l); + } + if (l == messageSequenceTracker.getMaxTrackOutOfOrderSequenceNumbers() * 2) { + messageSequenceTracker.sequenceNumberReceived(10); + messageSequenceTracker.sequenceNumberReceived(11); + } + } + messageSequenceTracker.close(); + + // then + assertEquals(2, msgErrOutOfSeqCounter.getCount()); + assertEquals(0, msgErrDuplicateCounter.getCount()); + assertEquals(0, msgErrLossCounter.getCount()); + } +} From 125341d22d98eecb8d15d5fc8a0255bde550e84e Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Tue, 7 Feb 2023 07:18:37 -0500 Subject: [PATCH 013/120] Fix contributors json spec --- .all-contributorsrc | 99 ++++----------------------------------------- CONTRIBUTING.md | 5 ++- README.md | 2 + 3 files changed, 13 insertions(+), 93 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7e3d0b334..4c7e00c66 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1,100 +1,17 @@ -{ "projectName": "nosqlbench", +{ "projectOwner": "nosqlbench", + "projectName": "nosqlbench", "repoType": "github", "repoHost": "https://github.com", - "files": ["README.md"], + "files": [ + "README.md" + ], "imageSize": 50, "commit": false, + "commitConvention": "angular", "contributorsPerLine": 7, "contributorsSortAlphabetically": false, - "badgeTemplate": "[![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors)", - "contributorTemplate": "\">\" width=\"<%= options.imageSize %>px;\" alt=\"\"/>
<%= contributor.name %>", - "types": { - "custom": { - "symbol": "🔭", - "description": "A custom contribution type.", - "link": "[<%= symbol %>](<%= url %> \"<%= description %>\")," - } - }, - "linkToUsage": false, + "linkToUsage": true, "skipCi": true, - "contributors": [ - { - "login": "jshook", - "name": "Jonathan Shook", - "avatar_url": "https://avatars.githubusercontent.com/u/2148847?v=4", - "profile": "https://github.com/jshook", - "contributions": [ - "question", - "doc", - "review", - "talk", - "mentoring", - "platform", - "projectManagement", - "research", - - ] - }, - { - "login": "phact", - "name": "Sebastián Estévez", - "avatar_url": "https://avatars.githubusercontent.com/u/1313220?v=4", - "profile": "https://www.sestevez.com", - "contributions": [ - "question", - "doc", - "review", - "talk" - ] - }, - { - "login": "yabinmeng", - "name": "Yabin Meng", - "avatar_url": "https://avatars.githubusercontent.com/u/16789452?v=4", - "profile": "https://github.com/yabinmeng", - "contributions": [ - "question", - "doc", - "review", - "talk" - ] - }, - { - "login": "MikeYaacoubStax", - "name": "Mike Yaacoub", - "avatar_url": "https://avatars.githubusercontent.com/u/117678633?v=4", - "profile": "https://github.com/MikeYaacoubStax", - "contributions": [ - "question", - "doc", - "review", - "talk" - ] - }, - { - "login": "jeffbanks", - "name": "Jeff Banks", - "avatar_url": "https://avatars.githubusercontent.com/u/4078933?v=4", - "profile": "https://github.com/jeffbanks", - "contributions": [ - "question", - "doc", - "review", - "talk" - ] - }, - { - "login": "msmygit", - "name": "Madhavan S.", - "avatar_url": "https://avatars.githubusercontent.com/u/19366623?v=4", - "profile": "https://github.com/msmygit", - "contributions": [ - "question", - "doc", - "review", - "talk" - ] - }, - ] + "contributors": [] } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb2c97f41..225c03ba1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,5 @@ [![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-37-orange.svg?style=flat-square)](#contributors) NoSQLBench is an ambitious project. It aims to solve long-standing problems in distributed systems testing. There are *many* ways you can contribute! Please take a moment to review this document @@ -119,8 +120,8 @@ are eager to get it into the hands of users who need it. [discord server](https://discord.gg/dBHRakusMN) and raise your hand! -## Contributors! :sparkle: -Thanks to these contributors! +## Contributors +Thanks to these contributors! :sparkle: For recognizing contributions, please follow [this documentation](https://allcontributors.org/docs/en/bot/usage). diff --git a/README.md b/README.md index fcc4d1630..3123776e3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ [comment]: < ![build](https://github.com/nosqlbench/nosqlbench/workflows/build/badge.svg) > [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.nosqlbench/nosqlbench/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.nosqlbench/nosqlbench) +[![Star on Github](https://img.shields.io/github/stars/nosqlbench/nosqlbench.svg?style=social)](https://github.com/nosqlbench/nosqlbench/stargazers) +[![Chat on Discord](https://img.shields.io/discord/819995781406130176?logo=discord)](https://discord.gg/dBHRakusMN) # NoSQLBench v5 From fbd10b2ce17600c34c14719cdbeca6a13c800a69 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Tue, 7 Feb 2023 09:37:49 -0500 Subject: [PATCH 014/120] adding an extra line at the end --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3123776e3..5f1e957dd 100644 --- a/README.md +++ b/README.md @@ -118,3 +118,4 @@ available, but more work is needed to support them fully. Here is what is suppor + From 03351c3cb8ade6ae59c3ad65895f703e62b2d43b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 16:24:57 +0000 Subject: [PATCH 015/120] docs: update README.md [skip ci] --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 5f1e957dd..6ab967b0e 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,22 @@ available, but more work is needed to support them fully. Here is what is suppor + + + + + + + + + + + +
Jonathan Shook
Jonathan Shook
🧑‍🏫
+ + Add your contributions + +
From ed38ac3592f261e3e172c9efce041ea0b69ea2c4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 16:24:58 +0000 Subject: [PATCH 016/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4c7e00c66..6a467fbf4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1,4 +1,4 @@ -{ +{ "projectOwner": "nosqlbench", "projectName": "nosqlbench", "repoType": "github", @@ -13,5 +13,15 @@ "contributorsSortAlphabetically": false, "linkToUsage": true, "skipCi": true, - "contributors": [] + "contributors": [ + { + "login": "jshook", + "name": "Jonathan Shook", + "avatar_url": "https://avatars.githubusercontent.com/u/2148847?v=4", + "profile": "https://github.com/jshook", + "contributions": [ + "mentoring" + ] + } + ] } From 73c8a2435fcb732fec13b3c23d60437a81afefe1 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Tue, 7 Feb 2023 11:49:19 -0500 Subject: [PATCH 017/120] Moving contributors section to CONTRIBUTING guide --- .all-contributorsrc | 4 ++-- CONTRIBUTING.md | 19 +++++++++++++++++-- README.md | 27 ++------------------------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 6a467fbf4..541e6fc9d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -4,14 +4,14 @@ "repoType": "github", "repoHost": "https://github.com", "files": [ - "README.md" + "CONTRIBUTING.md" ], "imageSize": 50, "commit": false, "commitConvention": "angular", "contributorsPerLine": 7, "contributorsSortAlphabetically": false, - "linkToUsage": true, + "linkToUsage": false, "skipCi": true, "contributors": [ { diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 225c03ba1..d1a73c6aa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,4 @@ [![All Contributors](https://img.shields.io/github/all-contributors/nosqlbench/nosqlbench?color=ee8449&style=flat-square)](#contributors) -[![All Contributors](https://img.shields.io/badge/all_contributors-37-orange.svg?style=flat-square)](#contributors) NoSQLBench is an ambitious project. It aims to solve long-standing problems in distributed systems testing. There are *many* ways you can contribute! Please take a moment to review this document @@ -122,11 +121,27 @@ are eager to get it into the hands of users who need it. ## Contributors Thanks to these contributors! :sparkle: -For recognizing contributions, please follow [this documentation](https://allcontributors.org/docs/en/bot/usage). +For recognizing contributions, please follow [this documentation](https://allcontributors.org/docs/en/bot/usage) and pick a key/contribution type from [here](https://allcontributors.org/docs/en/emoji-key). + + + + + + + + + + + +
Jonathan Shook
Jonathan Shook
🧑‍🏫
+ + Add your contributions + +
diff --git a/README.md b/README.md index 6ab967b0e..fb91ad3d2 100644 --- a/README.md +++ b/README.md @@ -109,29 +109,6 @@ available, but more work is needed to support them fully. Here is what is suppor ## Contributors +Checkout all our wonderful contributors [here](./CONTRIBUTING.md#contributors). - - - - - - - - - - - - - - -
Jonathan Shook
Jonathan Shook
🧑‍🏫
- - Add your contributions - -
- - - - - - +--- From 0bcd4ef160511b8261b3d0da31442de8c8079a4f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 16:58:04 +0000 Subject: [PATCH 018/120] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6ab967b0e..6663277e0 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ available, but more work is needed to support them fully. Here is what is suppor Jonathan Shook
Jonathan Shook
🧑‍🏫 + Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ From 1f68fffbfbf5ffdbf87b8245dba51be78d3bc30a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 16:58:05 +0000 Subject: [PATCH 019/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 6a467fbf4..7d24133e3 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -22,6 +22,25 @@ "contributions": [ "mentoring" ] + }, + { + "login": "msmygit", + "name": "Madhavan", + "avatar_url": "https://avatars.githubusercontent.com/u/19366623?v=4", + "profile": "https://github.com/msmygit", + "contributions": [ + "code", + "bug", + "doc", + "ideas", + "question", + "research", + "review", + "tool", + "userTesting", + "talk", + "tutorial" + ] } ] } From 1e9710b8a741f40b2351ec6d84cf14369eb898a2 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Tue, 7 Feb 2023 12:04:31 -0500 Subject: [PATCH 020/120] capture all contributors --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d1a73c6aa..12ef9d9a4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,6 +130,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jonathan Shook
Jonathan Shook
🧑‍🏫 + Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ From 5db1c2040489d4074ad252c8c45c5ea0f382affc Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:10:17 +0000 Subject: [PATCH 021/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 12ef9d9a4..b30a5d48e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -131,17 +131,9 @@ For recognizing contributions, please follow [this documentation](https://allcon Jonathan Shook
Jonathan Shook
🧑‍🏫 Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ + MikeYaacoubStax
MikeYaacoubStax
👀 🔧 - - - - - Add your contributions - - - - From c7c171ebd5911658f908e59663b97dee2dbc3174 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:10:18 +0000 Subject: [PATCH 022/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8cb2be743..a983433d7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -41,6 +41,16 @@ "talk", "tutorial" ] + }, + { + "login": "MikeYaacoubStax", + "name": "MikeYaacoubStax", + "avatar_url": "https://avatars.githubusercontent.com/u/117678633?v=4", + "profile": "https://github.com/MikeYaacoubStax", + "contributions": [ + "review", + "tool" + ] } ] } From 179f88d46268951affebbd55a9253667099def18 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:12:35 +0000 Subject: [PATCH 023/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b30a5d48e..709046bd6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -132,6 +132,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jonathan Shook
Jonathan Shook
🧑‍🏫 Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ MikeYaacoubStax
MikeYaacoubStax
👀 🔧 + Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ From d2a59b332cad7ec41ebdcb0ed108cfa29af5c756 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:12:36 +0000 Subject: [PATCH 024/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index a983433d7..347446383 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -51,6 +51,17 @@ "review", "tool" ] + }, + { + "login": "jeffbanks", + "name": "Jeff Banks", + "avatar_url": "https://avatars.githubusercontent.com/u/4078933?v=4", + "profile": "http://jjbanks.com", + "contributions": [ + "code", + "mentoring", + "test" + ] } ] } From 57b4e261b2de657819bac16366cc22c74cc53f9d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:45:56 +0000 Subject: [PATCH 025/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 709046bd6..cbb20e257 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -133,6 +133,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ MikeYaacoubStax
MikeYaacoubStax
👀 🔧 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ + Stefano Lottini
Stefano Lottini
🐛 From 09b9670cf5b63695ecefca1f320ab8e2d47197cf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:45:57 +0000 Subject: [PATCH 026/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 347446383..0f56d4add 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -62,6 +62,15 @@ "mentoring", "test" ] + }, + { + "login": "hemidactylus", + "name": "Stefano Lottini", + "avatar_url": "https://avatars.githubusercontent.com/u/14221764?v=4", + "profile": "https://github.com/hemidactylus", + "contributions": [ + "bug" + ] } ] } From bf6d3964b755ddb2b2e29e5fc1b8374110834f9b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:48:48 +0000 Subject: [PATCH 027/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbb20e257..d8947224e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,6 +134,7 @@ For recognizing contributions, please follow [this documentation](https://allcon MikeYaacoubStax
MikeYaacoubStax
👀 🔧 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ Stefano Lottini
Stefano Lottini
🐛 + Sebastián Estévez
Sebastián Estévez
🐛 🎨 From a962a64f00a6c43981dcee10c2c7d80fd64fccb5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:48:49 +0000 Subject: [PATCH 028/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0f56d4add..7f47aef74 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -71,6 +71,16 @@ "contributions": [ "bug" ] + }, + { + "login": "phact", + "name": "Sebastián Estévez", + "avatar_url": "https://avatars.githubusercontent.com/u/1313220?v=4", + "profile": "https://github.com/phact", + "contributions": [ + "bug", + "design" + ] } ] } From 49b103cd6a6c61537d266030e8a3bf8974be4b23 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:50:38 +0000 Subject: [PATCH 029/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbb20e257..508995e4a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,6 +134,7 @@ For recognizing contributions, please follow [this documentation](https://allcon MikeYaacoubStax
MikeYaacoubStax
👀 🔧 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ Stefano Lottini
Stefano Lottini
🐛 + yabinmeng
yabinmeng
🐛 ⚠️ From 3a16f4d345e1b430af2901c8493047c061627696 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:50:39 +0000 Subject: [PATCH 030/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0f56d4add..8d8adb3b7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -71,6 +71,16 @@ "contributions": [ "bug" ] + }, + { + "login": "yabinmeng", + "name": "yabinmeng", + "avatar_url": "https://avatars.githubusercontent.com/u/16789452?v=4", + "profile": "https://github.com/yabinmeng", + "contributions": [ + "bug", + "test" + ] } ] } From 0d8f8146c15dd73b8438db74fc5fbe4b5db6bc73 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:53:08 +0000 Subject: [PATCH 031/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbb20e257..9a11140ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,6 +134,7 @@ For recognizing contributions, please follow [this documentation](https://allcon MikeYaacoubStax
MikeYaacoubStax
👀 🔧 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ Stefano Lottini
Stefano Lottini
🐛 + Enrico Olivelli
Enrico Olivelli
⚠️ From a9675fb9d6a52aa97858f39df9dd396cacb0e3bf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:53:09 +0000 Subject: [PATCH 032/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0f56d4add..5bb5f63e7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -71,6 +71,15 @@ "contributions": [ "bug" ] + }, + { + "login": "eolivelli", + "name": "Enrico Olivelli", + "avatar_url": "https://avatars.githubusercontent.com/u/9469110?v=4", + "profile": "http://eolivelli.blogspot.it/", + "contributions": [ + "test" + ] } ] } From 250cdfd77cd2a7fc236bf87a58f72533fa42acff Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:54:07 +0000 Subject: [PATCH 033/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbb20e257..768e8a33b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,6 +134,7 @@ For recognizing contributions, please follow [this documentation](https://allcon MikeYaacoubStax
MikeYaacoubStax
👀 🔧 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ Stefano Lottini
Stefano Lottini
🐛 + Lari Hotari
Lari Hotari
🐛 💻 👀 From ab1f09a4dbe329bd73017fc670e5e547dcfe59e6 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:54:08 +0000 Subject: [PATCH 034/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 0f56d4add..9d004fce9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -71,6 +71,17 @@ "contributions": [ "bug" ] + }, + { + "login": "lhotari", + "name": "Lari Hotari", + "avatar_url": "https://avatars.githubusercontent.com/u/66864?v=4", + "profile": "https://github.com/lhotari", + "contributions": [ + "bug", + "code", + "review" + ] } ] } From 59c904e531dbfb921f2da9fae874373a0bcce7ef Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 14:09:38 -0600 Subject: [PATCH 035/120] all-contributors updates --- .all-contributorsrc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8ac542a74..4ee860df7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -85,25 +85,27 @@ ] }, { - -"login": "yabinmeng", + "login": "yabinmeng", "name": "yabinmeng", "avatar_url": "https://avatars.githubusercontent.com/u/16789452?v=4", "profile": "https://github.com/yabinmeng", "contributions": [ "bug", - "test" ] - }, - { + "test" + ] + }, + { "login": "eolivelli", "name": "Enrico Olivelli", "avatar_url": "https://avatars.githubusercontent.com/u/9469110?v=4", "profile": "http://eolivelli.blogspot.it/", "contributions": [ - "test", "code", "review" - ] - }, - { + "test", + "code", + "review" + ] + }, + { "login": "lhotari", "name": "Lari Hotari", "avatar_url": "https://avatars.githubusercontent.com/u/66864?v=4", From 4cdb8c0af4b996fe61ebf2f1f95512ed9a1016ca Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 14:13:46 -0600 Subject: [PATCH 036/120] all-contributors troubleshooting --- .all-contributorsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4ee860df7..acb45b5a2 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -9,7 +9,7 @@ "imageSize": 50, "commit": false, "commitConvention": "angular", - "contributorsPerLine": 7, + "contributorsPerLine": 10, "contributorsSortAlphabetically": false, "linkToUsage": false, "skipCi": true, From a3d6d61968fe5efaa346287a415f93ab6e1acb02 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 14:25:56 -0600 Subject: [PATCH 037/120] all-contributors troubleshooting --- .all-contributorsrc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index acb45b5a2..5a74e0c69 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -79,9 +79,7 @@ "profile": "https://github.com/phact", "contributions": [ "bug", - "design", - "issues", - "community" + "design" ] }, { From e43328476fe852c29157505086ef6cbb79f9afbf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:38:24 +0000 Subject: [PATCH 038/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7288e8029..cba0a2963 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -129,15 +129,16 @@ For recognizing contributions, please follow [this documentation](https://allcon - - - - - - - - - + + + + + + + + + +
Jonathan Shook
Jonathan Shook
🧑‍🏫		Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		MikeYaacoubStax
MikeYaacoubStax
👀 🔧		Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️		Stefano Lottini
Stefano Lottini
🐛		Sebastián Estévez
Sebastián Estévez
🐛 🎨		yabinmeng
yabinmeng
🐛 ⚠️		Enrico Olivelli
Enrico Olivelli
⚠️		Lari Hotari
Lari Hotari
🐛 💻 👀		Jonathan Shook
Jonathan Shook
🧑‍🏫		Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		MikeYaacoubStax
MikeYaacoubStax
👀 🔧		Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️		Stefano Lottini
Stefano Lottini
🐛		Sebastián Estévez
Sebastián Estévez
🐛 🎨		yabinmeng
yabinmeng
🐛 ⚠️		Enrico Olivelli
Enrico Olivelli
⚠️ 💻 👀		Lari Hotari
Lari Hotari
🐛 💻 👀		Matt Fleming
Matt Fleming
🐛 🎨
From e9fefed5c6ffe9764d71229601b0ac4ecf91b771 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:38:25 +0000 Subject: [PATCH 039/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 5a74e0c69..4111783c9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -113,6 +113,16 @@ "code", "review" ] + }, + { + "login": "mfleming", + "name": "Matt Fleming", + "avatar_url": "https://avatars.githubusercontent.com/u/94254?v=4", + "profile": "http://www.codeblueprint.co.uk", + "contributions": [ + "bug", + "design" + ] } ] } From b9ca38e68cb731b6ead2ee77cb4234d095cf86a0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:49:13 +0000 Subject: [PATCH 040/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cba0a2963..df01241f2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -140,6 +140,9 @@ For recognizing contributions, please follow [this documentation](https://allcon Lari Hotari
Lari Hotari
🐛 💻 👀 Matt Fleming
Matt Fleming
🐛 🎨 + + Jake Luciani
Jake Luciani
🐛 + From 26fbf6f02a9852210842d536ea72dba5225b1e5c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:49:14 +0000 Subject: [PATCH 041/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4111783c9..d2b608166 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -123,6 +123,15 @@ "bug", "design" ] + }, + { + "login": "tjake", + "name": "Jake Luciani", + "avatar_url": "https://avatars.githubusercontent.com/u/44456?v=4", + "profile": "https://github.com/tjake", + "contributions": [ + "bug" + ] } ] } From 025f36739ef2247fca6f7f632271ff7924d8e297 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:50:15 +0000 Subject: [PATCH 042/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df01241f2..f7dd40dad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,6 +142,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jake Luciani
Jake Luciani
🐛 + Lakshmi Manjunatha
Lakshmi Manjunatha
🐛 From 4e37513ca3b37cce71177c3acdf59428ba147b87 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:50:16 +0000 Subject: [PATCH 043/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index d2b608166..ae0c605f1 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -132,6 +132,15 @@ "contributions": [ "bug" ] + }, + { + "login": "lakshmi-M18", + "name": "Lakshmi Manjunatha", + "avatar_url": "https://avatars.githubusercontent.com/u/89935678?v=4", + "profile": "https://github.com/lakshmi-M18", + "contributions": [ + "bug" + ] } ] } From b473d44f778eeb2d9bbbb7eb627057707fcd2b00 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:50:53 +0000 Subject: [PATCH 044/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7dd40dad..cf6c5efac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -143,6 +143,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jake Luciani
Jake Luciani
🐛 Lakshmi Manjunatha
Lakshmi Manjunatha
🐛 + Pierre Laporte
Pierre Laporte
🤔 🐛 From acd04db60c028037b4251c6d15a86e190257902b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:50:54 +0000 Subject: [PATCH 045/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index ae0c605f1..925f1c8f6 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -141,6 +141,16 @@ "contributions": [ "bug" ] + }, + { + "login": "pingtimeout", + "name": "Pierre Laporte", + "avatar_url": "https://avatars.githubusercontent.com/u/1159578?v=4", + "profile": "http://www.pingtimeout.fr", + "contributions": [ + "ideas", + "bug" + ] } ] } From 1fd3c193d26ee7c5c163136a4f0f9f2fb8e63ec6 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:51:33 +0000 Subject: [PATCH 046/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf6c5efac..a276eebca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -144,6 +144,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jake Luciani
Jake Luciani
🐛 Lakshmi Manjunatha
Lakshmi Manjunatha
🐛 Pierre Laporte
Pierre Laporte
🤔 🐛 + Tatu Saloranta
Tatu Saloranta
📖 From 7c335f280312a4c00a72d9df1741a545a301fb64 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:51:34 +0000 Subject: [PATCH 047/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 925f1c8f6..843dc53dc 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -151,6 +151,15 @@ "ideas", "bug" ] + }, + { + "login": "tatu-at-datastax", + "name": "Tatu Saloranta", + "avatar_url": "https://avatars.githubusercontent.com/u/87213665?v=4", + "profile": "https://github.com/tatu-at-datastax", + "contributions": [ + "doc" + ] } ] } From 97529f2905d1b5ab1f0bf0658be7196efacbd9ae Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:52:10 +0000 Subject: [PATCH 048/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a276eebca..9b1e14929 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -145,6 +145,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Lakshmi Manjunatha
Lakshmi Manjunatha
🐛 Pierre Laporte
Pierre Laporte
🤔 🐛 Tatu Saloranta
Tatu Saloranta
📖 + Alex Ott
Alex Ott
📦 🐛 💻 From 85eacccfcec932de83dac6519d1595660ffea353 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:52:11 +0000 Subject: [PATCH 049/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 843dc53dc..7dd9e7705 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -160,6 +160,17 @@ "contributions": [ "doc" ] + }, + { + "login": "alexott", + "name": "Alex Ott", + "avatar_url": "https://avatars.githubusercontent.com/u/30342?v=4", + "profile": "http://alexott.net", + "contributions": [ + "platform", + "bug", + "code" + ] } ] } From e2525d7d55650bb9f300703b384cfacde945287c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:52:51 +0000 Subject: [PATCH 050/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b1e14929..eb8c4bac3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -146,6 +146,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Pierre Laporte
Pierre Laporte
🤔 🐛 Tatu Saloranta
Tatu Saloranta
📖 Alex Ott
Alex Ott
📦 🐛 💻 + Jeffrey Carpenter
Jeffrey Carpenter
🐛 ⚠️ 🚧 From d50107ed562b4626b76a1be223aee4d6c547c54d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:52:52 +0000 Subject: [PATCH 051/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7dd9e7705..5a58461be 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -171,6 +171,17 @@ "bug", "code" ] + }, + { + "login": "jeffreyscarpenter", + "name": "Jeffrey Carpenter", + "avatar_url": "https://avatars.githubusercontent.com/u/12115970?v=4", + "profile": "https://github.com/jeffreyscarpenter", + "contributions": [ + "bug", + "test", + "maintenance" + ] } ] } From c041a28a30b02789050357808c08ff671dda1ff3 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 14:53:42 -0600 Subject: [PATCH 052/120] adjust layout of all contributors --- .all-contributorsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 5a58461be..98bb7d097 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -9,7 +9,7 @@ "imageSize": 50, "commit": false, "commitConvention": "angular", - "contributorsPerLine": 10, + "contributorsPerLine": 6, "contributorsSortAlphabetically": false, "linkToUsage": false, "skipCi": true, From a8f3dd83697d8026665619a7f62160e49cc2b4eb Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:54:22 +0000 Subject: [PATCH 053/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eb8c4bac3..f35f7a72e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -129,24 +129,26 @@ For recognizing contributions, please follow [this documentation](https://allcon - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + + + +
Jonathan Shook
Jonathan Shook
🧑‍🏫		Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		MikeYaacoubStax
MikeYaacoubStax
👀 🔧		Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️		Stefano Lottini
Stefano Lottini
🐛		Sebastián Estévez
Sebastián Estévez
🐛 🎨		yabinmeng
yabinmeng
🐛 ⚠️		Enrico Olivelli
Enrico Olivelli
⚠️ 💻 👀		Lari Hotari
Lari Hotari
🐛 💻 👀		Matt Fleming
Matt Fleming
🐛 🎨		Jonathan Shook
Jonathan Shook
🧑‍🏫		Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		MikeYaacoubStax
MikeYaacoubStax
👀 🔧		Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️		Stefano Lottini
Stefano Lottini
🐛		Sebastián Estévez
Sebastián Estévez
🐛 🎨
Jake Luciani
Jake Luciani
🐛		Lakshmi Manjunatha
Lakshmi Manjunatha
🐛		Pierre Laporte
Pierre Laporte
🤔 🐛		Tatu Saloranta
Tatu Saloranta
📖		Alex Ott
Alex Ott
📦 🐛 💻		Jeffrey Carpenter
Jeffrey Carpenter
🐛 ⚠️ 🚧		yabinmeng
yabinmeng
🐛 ⚠️		Enrico Olivelli
Enrico Olivelli
⚠️ 💻 👀		Lari Hotari
Lari Hotari
🐛 💻 👀		Matt Fleming
Matt Fleming
🐛 🎨		Jake Luciani
Jake Luciani
🐛 🤔		Lakshmi Manjunatha
Lakshmi Manjunatha
🐛
Pierre Laporte
Pierre Laporte
🤔 🐛		Tatu Saloranta
Tatu Saloranta
📖		Alex Ott
Alex Ott
📦 🐛 💻		Jeffrey Carpenter
Jeffrey Carpenter
🐛 ⚠️ 🚧
From 74f034eb8899040bf0b5b31d9b014f79398437d3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:54:23 +0000 Subject: [PATCH 054/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 98bb7d097..a6751a8f3 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -130,7 +130,8 @@ "avatar_url": "https://avatars.githubusercontent.com/u/44456?v=4", "profile": "https://github.com/tjake", "contributions": [ - "bug" + "bug", + "ideas" ] }, { From 6dc195fbd6c35fafe4f2ff81d889a8f359f53cd4 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:54:56 +0000 Subject: [PATCH 055/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f35f7a72e..3bc068b8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -149,6 +149,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Tatu Saloranta
Tatu Saloranta
📖 Alex Ott
Alex Ott
📦 🐛 💻 Jeffrey Carpenter
Jeffrey Carpenter
🐛 ⚠️ 🚧 + yassermohamed81
yassermohamed81
💻 From 87ccf1c0145a555a63f9e8fccb9249e157c428d2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:54:57 +0000 Subject: [PATCH 056/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index a6751a8f3..4780040be 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -183,6 +183,15 @@ "test", "maintenance" ] + }, + { + "login": "yassermohamed81", + "name": "yassermohamed81", + "avatar_url": "https://avatars.githubusercontent.com/u/53837411?v=4", + "profile": "https://github.com/yassermohamed81", + "contributions": [ + "code" + ] } ] } From cba819c38557cc3466f191e48647874cde7d2a88 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:55:31 +0000 Subject: [PATCH 057/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3bc068b8b..c371a2dbf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -150,6 +150,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Alex Ott
Alex Ott
📦 🐛 💻 Jeffrey Carpenter
Jeffrey Carpenter
🐛 ⚠️ 🚧 yassermohamed81
yassermohamed81
💻 + Pierre Sauvage
Pierre Sauvage
💻 From 990671c21a412b4d26d159f51d4edb119958c544 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:55:32 +0000 Subject: [PATCH 058/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 4780040be..42411606d 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -192,6 +192,15 @@ "contributions": [ "code" ] + }, + { + "login": "Pierrotws", + "name": "Pierre Sauvage", + "avatar_url": "https://avatars.githubusercontent.com/u/6002161?v=4", + "profile": "https://github.com/Pierrotws", + "contributions": [ + "code" + ] } ] } From bb5804f6fd92ebd117f2ca69914da65fdbcf8608 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:55:59 +0000 Subject: [PATCH 059/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c371a2dbf..e3d811023 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -152,6 +152,9 @@ For recognizing contributions, please follow [this documentation](https://allcon yassermohamed81
yassermohamed81
💻 Pierre Sauvage
Pierre Sauvage
💻 + + Doug Wettlaufer
Doug Wettlaufer
⚠️ + From 4e0f66c29c778366d36eccf86369d6dcc9b80621 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:56:00 +0000 Subject: [PATCH 060/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 42411606d..e8f8ba6a0 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -201,6 +201,15 @@ "contributions": [ "code" ] + }, + { + "login": "dougwettlaufer", + "name": "Doug Wettlaufer", + "avatar_url": "https://avatars.githubusercontent.com/u/45750136?v=4", + "profile": "https://github.com/dougwettlaufer", + "contributions": [ + "test" + ] } ] } From 6a4c346c5b21cc28aa6d69b71dc38a7a5d245f6f Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:56:27 +0000 Subject: [PATCH 061/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e3d811023..9414b27c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -154,6 +154,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Doug Wettlaufer
Doug Wettlaufer
⚠️ + Jeremy Hanna
Jeremy Hanna
⚠️ 🤔 From 71e3a8580a2fdba8ab20fe93495770ca377820d8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:56:28 +0000 Subject: [PATCH 062/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index e8f8ba6a0..61f185b95 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -210,6 +210,16 @@ "contributions": [ "test" ] + }, + { + "login": "jeromatron", + "name": "Jeremy Hanna", + "avatar_url": "https://avatars.githubusercontent.com/u/254887?v=4", + "profile": "http://jeromatron.blogspot.com", + "contributions": [ + "test", + "ideas" + ] } ] } From 904793a847cdbabdf54065ef75a138494ecffdc2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:57:22 +0000 Subject: [PATCH 063/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9414b27c3..0e9daf29d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -155,6 +155,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Doug Wettlaufer
Doug Wettlaufer
⚠️ Jeremy Hanna
Jeremy Hanna
⚠️ 🤔 + Alice Lottini
Alice Lottini
🐛 🤔 ⚠️ From 5347aedd346865b5fa14ba3e68bbeffd3373f6f8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:57:23 +0000 Subject: [PATCH 064/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 61f185b95..51cb8bb58 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -220,6 +220,17 @@ "test", "ideas" ] + }, + { + "login": "alicel", + "name": "Alice Lottini", + "avatar_url": "https://avatars.githubusercontent.com/u/2972347?v=4", + "profile": "https://github.com/alicel", + "contributions": [ + "bug", + "ideas", + "test" + ] } ] } From c01486ecf5aea091a904d369561bf9f39a8e3cf8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:00:11 +0000 Subject: [PATCH 065/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e9daf29d..af3f9b24d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -156,6 +156,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Doug Wettlaufer
Doug Wettlaufer
⚠️ Jeremy Hanna
Jeremy Hanna
⚠️ 🤔 Alice Lottini
Alice Lottini
🐛 🤔 ⚠️ + Eric Borczuk
Eric Borczuk
💻 👀 ⚠️ From fb2011ac3c4087d38f3eb1ea98c5648aa9947154 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:00:12 +0000 Subject: [PATCH 066/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 51cb8bb58..774d72a00 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -231,6 +231,17 @@ "ideas", "test" ] + }, + { + "login": "EricBorczuk", + "name": "Eric Borczuk", + "avatar_url": "https://avatars.githubusercontent.com/u/4205492?v=4", + "profile": "https://github.com/EricBorczuk", + "contributions": [ + "code", + "review", + "test" + ] } ] } From 1d488e58bdc99f1aec70ce03ebb40af4982eabb5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:01:01 +0000 Subject: [PATCH 067/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af3f9b24d..fe3a7ed4d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -157,6 +157,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jeremy Hanna
Jeremy Hanna
⚠️ 🤔 Alice Lottini
Alice Lottini
🐛 🤔 ⚠️ Eric Borczuk
Eric Borczuk
💻 👀 ⚠️ + weideng1
weideng1
⚠️ 🤔 💻 From 95545605a4404786f924723f00b4c1f6dd6e1112 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:01:02 +0000 Subject: [PATCH 068/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 774d72a00..3a444840c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -242,6 +242,17 @@ "review", "test" ] + }, + { + "login": "weideng1", + "name": "weideng1", + "avatar_url": "https://avatars.githubusercontent.com/u/5520525?v=4", + "profile": "https://github.com/weideng1", + "contributions": [ + "test", + "ideas", + "code" + ] } ] } From 4eb6a3f53a4d26cae62ff3c8857095602ce2d588 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:01:51 +0000 Subject: [PATCH 069/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fe3a7ed4d..4767daa17 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -158,6 +158,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Alice Lottini
Alice Lottini
🐛 🤔 ⚠️ Eric Borczuk
Eric Borczuk
💻 👀 ⚠️ weideng1
weideng1
⚠️ 🤔 💻 + Ivan Senic
Ivan Senic
⚠️ From 9669e360ecda126b5935b85361e070ebdd1d15e2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:01:52 +0000 Subject: [PATCH 070/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3a444840c..b66edb694 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -253,6 +253,15 @@ "ideas", "code" ] + }, + { + "login": "ivansenic", + "name": "Ivan Senic", + "avatar_url": "https://avatars.githubusercontent.com/u/10600041?v=4", + "profile": "https://github.com/ivansenic", + "contributions": [ + "test" + ] } ] } From 8c40cb2e5515c14a6f73785bb5ef3bbf0bfc8f8a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:02:30 +0000 Subject: [PATCH 071/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4767daa17..f6957b9d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -160,6 +160,9 @@ For recognizing contributions, please follow [this documentation](https://allcon weideng1
weideng1
⚠️ 🤔 💻 Ivan Senic
Ivan Senic
⚠️ + + Justin Chu
Justin Chu
💻 ⚠️ 👀 + From 262716d230cbfa02a1baf1346a2cad8a7b17f2a5 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:02:31 +0000 Subject: [PATCH 072/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index b66edb694..48d40cfa4 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -262,6 +262,17 @@ "contributions": [ "test" ] + }, + { + "login": "justinchuch", + "name": "Justin Chu", + "avatar_url": "https://avatars.githubusercontent.com/u/15710241?v=4", + "profile": "https://justinchuch.wordpress.com/", + "contributions": [ + "code", + "test", + "review" + ] } ] } From b6c2ada29fd0c8c2e1f257fe2da20eee63119ada Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:03:20 +0000 Subject: [PATCH 073/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6957b9d1..d809f6ed7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -162,6 +162,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Justin Chu
Justin Chu
💻 ⚠️ 👀 + Steven Matison
Steven Matison
⚠️ 🤔 From 45f0b6aeda9e03fd43051d4a3b505b4a7f5d26ee Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:03:21 +0000 Subject: [PATCH 074/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 48d40cfa4..92e5b5faf 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -273,6 +273,16 @@ "test", "review" ] + }, + { + "login": "ds-steven-matison", + "name": "Steven Matison", + "avatar_url": "https://avatars.githubusercontent.com/u/70520951?v=4", + "profile": "https://ds-steven-matison.github.io/", + "contributions": [ + "test", + "ideas" + ] } ] } From e6cacf58c42866ab350659afa9c4896fca200a2c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:04:08 +0000 Subject: [PATCH 075/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d809f6ed7..9dc65a332 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,6 +163,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Justin Chu
Justin Chu
💻 ⚠️ 👀 Steven Matison
Steven Matison
⚠️ 🤔 + shahar z
shahar z
🤔 💻 From 38ce8110b3535e102c63e2692f5af2d6f6d1ce1c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:04:09 +0000 Subject: [PATCH 076/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 92e5b5faf..3e9bdd754 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -283,6 +283,16 @@ "test", "ideas" ] + }, + { + "login": "szimmer1", + "name": "shahar z", + "avatar_url": "https://avatars.githubusercontent.com/u/8455475?v=4", + "profile": "https://github.com/szimmer1", + "contributions": [ + "ideas", + "code" + ] } ] } From 02ac51f8c721a06dc5e6949ef17fbb7589f6e2b6 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:04:59 +0000 Subject: [PATCH 077/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9dc65a332..5b2aed9bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -164,6 +164,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Justin Chu
Justin Chu
💻 ⚠️ 👀 Steven Matison
Steven Matison
⚠️ 🤔 shahar z
shahar z
🤔 💻 + ncarvind
ncarvind
💻 ⚠️ From 2122b49aad39019829f07499137edb35c9c365c9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:05:00 +0000 Subject: [PATCH 078/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3e9bdd754..3c9c5e68e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -293,6 +293,16 @@ "ideas", "code" ] + }, + { + "login": "ncarvind", + "name": "ncarvind", + "avatar_url": "https://avatars.githubusercontent.com/u/70302571?v=4", + "profile": "https://github.com/ncarvind", + "contributions": [ + "code", + "test" + ] } ] } From dff4469cc7f256c274f510aa84316b6cb5d8291b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:05:46 +0000 Subject: [PATCH 079/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b2aed9bc..39335850b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -165,6 +165,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Steven Matison
Steven Matison
⚠️ 🤔 shahar z
shahar z
🤔 💻 ncarvind
ncarvind
💻 ⚠️ + Derrick Cosmas
Derrick Cosmas
💻 🤔 From 74a38c3dd6f74c0a7e57fd6370b0b877e921deec Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:05:47 +0000 Subject: [PATCH 080/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3c9c5e68e..43fa86416 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -303,6 +303,16 @@ "code", "test" ] + }, + { + "login": "derrickCos", + "name": "Derrick Cosmas", + "avatar_url": "https://avatars.githubusercontent.com/u/25781387?v=4", + "profile": "https://github.com/derrickCos", + "contributions": [ + "code", + "ideas" + ] } ] } From f66f0c8aeaa7181389833d636f7923b3eb7b98ab Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:07:27 +0000 Subject: [PATCH 081/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b2aed9bc..e8e9661d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -165,6 +165,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Steven Matison
Steven Matison
⚠️ 🤔 shahar z
shahar z
🤔 💻 ncarvind
ncarvind
💻 ⚠️ + Massimiliano Mirelli
Massimiliano Mirelli
📦 From 701b300e75010a650e2316414e95f419555900e3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:07:28 +0000 Subject: [PATCH 082/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3c9c5e68e..5f22578b5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -303,6 +303,15 @@ "code", "test" ] + }, + { + "login": "MMirelli", + "name": "Massimiliano Mirelli", + "avatar_url": "https://avatars.githubusercontent.com/u/22191891?v=4", + "profile": "https://github.com/MMirelli", + "contributions": [ + "platform" + ] } ] } From 7791e1aa56fafefa5a3b0af2b1d5823244316387 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:09:26 +0000 Subject: [PATCH 083/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c7aeb6e15..dcef45a17 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -168,6 +168,9 @@ For recognizing contributions, please follow [this documentation](https://allcon Massimiliano Mirelli
Massimiliano Mirelli
📦 Derrick Cosmas
Derrick Cosmas
💻 🤔 + + Gianluca Righetto
Gianluca Righetto
📦 + From cd21e64aa0e48ca9d80cb63548f51e2f5c601f97 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:09:27 +0000 Subject: [PATCH 084/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 8d3d33135..dabf8ae13 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -322,6 +322,15 @@ "code", "ideas" ] + }, + { + "login": "grighetto", + "name": "Gianluca Righetto", + "avatar_url": "https://avatars.githubusercontent.com/u/413792?v=4", + "profile": "https://github.com/grighetto", + "contributions": [ + "platform" + ] } ] } From ff0437b4d9d966f072902aacea2bdaeba3a6b7fe Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:10:06 +0000 Subject: [PATCH 085/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dcef45a17..bb5673a77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -170,6 +170,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Gianluca Righetto
Gianluca Righetto
📦 + Bryn Cooke
Bryn Cooke
📖 From f7e282747d9a10a7674d22247369cb29df755b9c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:10:07 +0000 Subject: [PATCH 086/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index dabf8ae13..4f1c75ecb 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -331,6 +331,15 @@ "contributions": [ "platform" ] + }, + { + "login": "BrynCooke", + "name": "Bryn Cooke", + "avatar_url": "https://avatars.githubusercontent.com/u/747836?v=4", + "profile": "https://github.com/BrynCooke", + "contributions": [ + "doc" + ] } ] } From 645c4a5d1d2086701e23daf758a048c0fd568d42 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:15:20 +0000 Subject: [PATCH 087/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 709046bd6..b2f3ce5d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -132,7 +132,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jonathan Shook
Jonathan Shook
🧑‍🏫 Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ MikeYaacoubStax
MikeYaacoubStax
👀 🔧 - Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ + Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ 🐛 💼 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 📦 🔌 📆 🔬 👀 🛡️ 🔧 📓 From bc18a7899575d12a233f14fe910fa2289bf54f41 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:15:21 +0000 Subject: [PATCH 088/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 347446383..6861468bb 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -60,7 +60,25 @@ "contributions": [ "code", "mentoring", - "test" + "test", + "bug", + "business", + "content", + "data", + "doc", + "design", + "example", + "ideas", + "infra", + "maintenance", + "platform", + "plugin", + "projectManagement", + "research", + "review", + "security", + "tool", + "userTesting" ] } ] From 3354be42b67a69bed474979c983524d2f6aeebaf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:18:43 +0000 Subject: [PATCH 089/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13622d9f1..1b9d4618d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -129,10 +129,10 @@ For recognizing contributions, please follow [this documentation](https://allcon - + - - + + From 99735c63f27bde5cf5c188ef8a5fc2c795369edd Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:18:44 +0000 Subject: [PATCH 090/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9f59d0e2e..14dbb6729 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -49,7 +49,26 @@ "profile": "https://github.com/MikeYaacoubStax", "contributions": [ "review", - "tool" + "tool", + "bug", + "business", + "code", + "content", + "data", + "doc", + "design", + "example", + "ideas", + "infra", + "maintenance", + "mentoring", + "platform", + "plugin", + "projectManagement", + "research", + "security", + "test", + "userTesting" ] }, { From 908cbfcf85fc93cf90285e6f484e910af6d6686f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 15:20:16 -0600 Subject: [PATCH 091/120] updated project maintainers --- .all-contributorsrc | 56 ++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 14dbb6729..9b8e1a9a5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -20,26 +20,27 @@ "avatar_url": "https://avatars.githubusercontent.com/u/2148847?v=4", "profile": "https://github.com/jshook", "contributions": [ - "mentoring" - ] - }, - { - "login": "msmygit", - "name": "Madhavan", - "avatar_url": "https://avatars.githubusercontent.com/u/19366623?v=4", - "profile": "https://github.com/msmygit", - "contributions": [ - "code", - "bug", - "doc", - "ideas", - "question", - "research", "review", "tool", - "userTesting", - "talk", - "tutorial" + "bug", + "business", + "code", + "content", + "data", + "doc", + "design", + "example", + "ideas", + "infra", + "maintenance", + "mentoring", + "platform", + "plugin", + "projectManagement", + "research", + "security", + "test", + "userTesting" ] }, { @@ -100,6 +101,25 @@ "userTesting" ] }, + { + "login": "msmygit", + "name": "Madhavan", + "avatar_url": "https://avatars.githubusercontent.com/u/19366623?v=4", + "profile": "https://github.com/msmygit", + "contributions": [ + "code", + "bug", + "doc", + "ideas", + "question", + "research", + "review", + "tool", + "userTesting", + "talk", + "tutorial" + ] + }, { "login": "hemidactylus", "name": "Stefano Lottini", From 6dd1ed9c623adf1241a9ef7d76b32322fbecdd67 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:23:37 +0000 Subject: [PATCH 092/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1b9d4618d..b970a588a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -129,10 +129,10 @@ For recognizing contributions, please follow [this documentation](https://allcon
Jonathan Shook
Jonathan Shook
🧑‍🏫		Jonathan Shook
Jonathan Shook
🧑‍🏫		 Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		MikeYaacoubStax
MikeYaacoubStax
👀 🔧		Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ 🐛 💼 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 📦 🔌 📆 🔬 👀 🛡️ 🔧 📓		MikeYaacoubStax
MikeYaacoubStax
👀 🔧 🐛 💼 💻 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 🧑‍🏫 📦 🔌 📆 🔬 🛡️ ⚠️ 📓		Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ 🐛 💼 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 📦 🔌 📆 🔬 👀 🛡️ 🔧 📓		 Stefano Lottini
Stefano Lottini
🐛		 Sebastián Estévez
Sebastián Estévez
🐛 🎨
- - + + @@ -171,6 +171,7 @@ For recognizing contributions, please follow [this documentation](https://allcon +
Jonathan Shook
Jonathan Shook
🧑‍🏫		Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		Jonathan Shook
Jonathan Shook
👀 🔧 🐛 💼 💻 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 🧑‍🏫 📦 🔌 📆 🔬 🛡️ ⚠️ 📓		 MikeYaacoubStax
MikeYaacoubStax
👀 🔧 🐛 💼 💻 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 🧑‍🏫 📦 🔌 📆 🔬 🛡️ ⚠️ 📓		 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ 🐛 💼 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 📦 🔌 📆 🔬 👀 🛡️ 🔧 📓		Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅		 Stefano Lottini
Stefano Lottini
🐛		 Sebastián Estévez
Sebastián Estévez
🐛 🎨
Gianluca Righetto
Gianluca Righetto
📦		 Bryn Cooke
Bryn Cooke
📖		KatSarah
KatSarah
🤔
From 9bdb17ba8d692139df0c23844ea5db2b1e25cc91 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:23:38 +0000 Subject: [PATCH 093/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9b8e1a9a5..349749e60 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -397,6 +397,15 @@ "contributions": [ "doc" ] + }, + { + "login": "KatSarah", + "name": "KatSarah", + "avatar_url": "https://avatars.githubusercontent.com/u/658015?v=4", + "profile": "https://github.com/KatSarah", + "contributions": [ + "ideas" + ] } ] } From f96e34f0c23559c2edbf8acafa23096220ec5a11 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:25:11 +0000 Subject: [PATCH 094/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b970a588a..00bc3440d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -172,6 +172,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Gianluca Righetto
Gianluca Righetto
📦 Bryn Cooke
Bryn Cooke
📖 KatSarah
KatSarah
🤔 + Peyton Casper
Peyton Casper
🤔 💻 From fcf755d45de88892eca270dfa708432f9cca5dde Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:25:12 +0000 Subject: [PATCH 095/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 349749e60..580428f82 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -406,6 +406,16 @@ "contributions": [ "ideas" ] + }, + { + "login": "peytoncasper", + "name": "Peyton Casper", + "avatar_url": "https://avatars.githubusercontent.com/u/8305883?v=4", + "profile": "https://github.com/peytoncasper", + "contributions": [ + "ideas", + "code" + ] } ] } From 7127e2830877f69904e35771b5c0c20b5ff3e8f3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:30:10 +0000 Subject: [PATCH 096/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 00bc3440d..207eccdf6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -173,6 +173,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Bryn Cooke
Bryn Cooke
📖 KatSarah
KatSarah
🤔 Peyton Casper
Peyton Casper
🤔 💻 + Arthur Costa
Arthur Costa
🐛 From 49e038b871df9c651558a34e3e727c1cb7544f56 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:30:11 +0000 Subject: [PATCH 097/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 580428f82..a2fe64f36 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -416,6 +416,15 @@ "ideas", "code" ] + }, + { + "login": "landim", + "name": "Arthur Costa", + "avatar_url": "https://avatars.githubusercontent.com/u/91446?v=4", + "profile": "https://github.com/landim", + "contributions": [ + "bug" + ] } ] } From 8b74ba136dcec8152c839632d0ba17006fcf66f3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:31:47 +0000 Subject: [PATCH 098/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 207eccdf6..8fd65e6c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -174,6 +174,7 @@ For recognizing contributions, please follow [this documentation](https://allcon KatSarah
KatSarah
🤔 Peyton Casper
Peyton Casper
🤔 💻 Arthur Costa
Arthur Costa
🐛 + Guy Bolton King
Guy Bolton King
🐛 💻 🤔 From 19651e59fc6307cff06b255b6707d943662d4c9a Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:31:48 +0000 Subject: [PATCH 099/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index a2fe64f36..bd3b23f9e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -425,6 +425,17 @@ "contributions": [ "bug" ] + }, + { + "login": "guyboltonking", + "name": "Guy Bolton King", + "avatar_url": "https://avatars.githubusercontent.com/u/98294?v=4", + "profile": "https://github.com/guyboltonking", + "contributions": [ + "bug", + "code", + "ideas" + ] } ] } From eabcff77fcb71de2cd8b5b99ec7121092644a8b0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:33:22 +0000 Subject: [PATCH 100/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fd65e6c3..c238f1a9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -176,6 +176,9 @@ For recognizing contributions, please follow [this documentation](https://allcon Arthur Costa
Arthur Costa
🐛 Guy Bolton King
Guy Bolton King
🐛 💻 🤔 + + Sean McCarthy
Sean McCarthy
🧑‍🏫 🤔 💻 ⚠️ + From 362f91ce59459afb9e6faf4f0e4ea774defeec8e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:33:23 +0000 Subject: [PATCH 101/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index bd3b23f9e..396b098fa 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -436,6 +436,18 @@ "code", "ideas" ] + }, + { + "login": "smccarthy788", + "name": "Sean McCarthy", + "avatar_url": "https://avatars.githubusercontent.com/u/6601281?v=4", + "profile": "https://github.com/smccarthy788", + "contributions": [ + "mentoring", + "ideas", + "code", + "test" + ] } ] } From fe26cf7917cb18e3dc57e2569dddcff5692d6be3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:36:48 +0000 Subject: [PATCH 102/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c238f1a9b..fbf9fb246 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,7 +134,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ 🐛 💼 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 📦 🔌 📆 🔬 👀 🛡️ 🔧 📓 Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ Stefano Lottini
Stefano Lottini
🐛 - Sebastián Estévez
Sebastián Estévez
🐛 🎨 + Sebastián Estévez
Sebastián Estévez
🐛 🎨 💼 💻 🖋 🔣 📖 🤔 📣 🔬 yabinmeng
yabinmeng
🐛 ⚠️ From d9cfbb371e5fd28e2497b09bfcda2e15ababb6e9 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:36:50 +0000 Subject: [PATCH 103/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 396b098fa..560040704 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -136,7 +136,15 @@ "profile": "https://github.com/phact", "contributions": [ "bug", - "design" + "design", + "business", + "code", + "content", + "data", + "doc", + "ideas", + "promotion", + "research" ] }, { From 9b439424dc595470da510d296f20911f305bd862 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:38:53 +0000 Subject: [PATCH 104/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fbf9fb246..8f3450c0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -133,7 +133,7 @@ For recognizing contributions, please follow [this documentation](https://allcon MikeYaacoubStax
MikeYaacoubStax
👀 🔧 🐛 💼 💻 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 🧑‍🏫 📦 🔌 📆 🔬 🛡️ ⚠️ 📓 Jeff Banks
Jeff Banks
💻 🧑‍🏫 ⚠️ 🐛 💼 🖋 🔣 📖 🎨 💡 🤔 🚇 🚧 📦 🔌 📆 🔬 👀 🛡️ 🔧 📓 Madhavan
Madhavan
💻 🐛 📖 🤔 💬 🔬 👀 🔧 📓 📢 ✅ - Stefano Lottini
Stefano Lottini
🐛 + Stefano Lottini
Stefano Lottini
🐛 📝 💻 🖋 🔣 📖 💡 📋 🧑‍🏫 📣 🔬 ✅ 📓 📹 Sebastián Estévez
Sebastián Estévez
🐛 🎨 💼 💻 🖋 🔣 📖 🤔 📣 🔬 From 4e20e2cca5f15db83bab3cb81d320dd3c47fda74 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:38:54 +0000 Subject: [PATCH 105/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 560040704..fc93421b0 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -126,7 +126,20 @@ "avatar_url": "https://avatars.githubusercontent.com/u/14221764?v=4", "profile": "https://github.com/hemidactylus", "contributions": [ - "bug" + "bug", + "blog", + "code", + "content", + "data", + "doc", + "example", + "eventOrganizing", + "mentoring", + "promotion", + "research", + "tutorial", + "userTesting", + "video" ] }, { From d27083e0988f9913e855eb15e1bb37f07cea9cd0 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 15:41:54 -0600 Subject: [PATCH 106/120] pull up Sean --- .all-contributorsrc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index fc93421b0..963a04e50 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -160,6 +160,18 @@ "research" ] }, + { + "login": "smccarthy788", + "name": "Sean McCarthy", + "avatar_url": "https://avatars.githubusercontent.com/u/6601281?v=4", + "profile": "https://github.com/smccarthy788", + "contributions": [ + "mentoring", + "ideas", + "code", + "test" + ] + }, { "login": "yabinmeng", "name": "yabinmeng", @@ -457,18 +469,6 @@ "code", "ideas" ] - }, - { - "login": "smccarthy788", - "name": "Sean McCarthy", - "avatar_url": "https://avatars.githubusercontent.com/u/6601281?v=4", - "profile": "https://github.com/smccarthy788", - "contributions": [ - "mentoring", - "ideas", - "code", - "test" - ] } ] } From 0ad26aefb07bcb655b977bdffce0cd37b9914114 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:43:05 +0000 Subject: [PATCH 107/120] docs: update CONTRIBUTING.md [skip ci] --- CONTRIBUTING.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8f3450c0c..311e5fcdf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -137,47 +137,48 @@ For recognizing contributions, please follow [this documentation](https://allcon Sebastián Estévez
Sebastián Estévez
🐛 🎨 💼 💻 🖋 🔣 📖 🤔 📣 🔬 + Sean McCarthy
Sean McCarthy
🧑‍🏫 🤔 💻 ⚠️ yabinmeng
yabinmeng
🐛 ⚠️ Enrico Olivelli
Enrico Olivelli
⚠️ 💻 👀 Lari Hotari
Lari Hotari
🐛 💻 👀 Matt Fleming
Matt Fleming
🐛 🎨 Jake Luciani
Jake Luciani
🐛 🤔 - Lakshmi Manjunatha
Lakshmi Manjunatha
🐛 + Lakshmi Manjunatha
Lakshmi Manjunatha
🐛 Pierre Laporte
Pierre Laporte
🤔 🐛 Tatu Saloranta
Tatu Saloranta
📖 Alex Ott
Alex Ott
📦 🐛 💻 Jeffrey Carpenter
Jeffrey Carpenter
🐛 ⚠️ 🚧 yassermohamed81
yassermohamed81
💻 - Pierre Sauvage
Pierre Sauvage
💻 + Pierre Sauvage
Pierre Sauvage
💻 Doug Wettlaufer
Doug Wettlaufer
⚠️ Jeremy Hanna
Jeremy Hanna
⚠️ 🤔 Alice Lottini
Alice Lottini
🐛 🤔 ⚠️ Eric Borczuk
Eric Borczuk
💻 👀 ⚠️ weideng1
weideng1
⚠️ 🤔 💻 - Ivan Senic
Ivan Senic
⚠️ + Ivan Senic
Ivan Senic
⚠️ Justin Chu
Justin Chu
💻 ⚠️ 👀 Steven Matison
Steven Matison
⚠️ 🤔 shahar z
shahar z
🤔 💻 ncarvind
ncarvind
💻 ⚠️ Massimiliano Mirelli
Massimiliano Mirelli
📦 - Derrick Cosmas
Derrick Cosmas
💻 🤔 + Derrick Cosmas
Derrick Cosmas
💻 🤔 Gianluca Righetto
Gianluca Righetto
📦 Bryn Cooke
Bryn Cooke
📖 KatSarah
KatSarah
🤔 Peyton Casper
Peyton Casper
🤔 💻 Arthur Costa
Arthur Costa
🐛 - Guy Bolton King
Guy Bolton King
🐛 💻 🤔 - Sean McCarthy
Sean McCarthy
🧑‍🏫 🤔 💻 ⚠️ + Guy Bolton King
Guy Bolton King
🐛 💻 🤔 + Christopher Lambert
Christopher Lambert
💻 🤔 From dfe00941040ef10e5588a7a7a4218add841c52c3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:43:06 +0000 Subject: [PATCH 108/120] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 963a04e50..cd5020d17 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -469,6 +469,16 @@ "code", "ideas" ] + }, + { + "login": "XN137", + "name": "Christopher Lambert", + "avatar_url": "https://avatars.githubusercontent.com/u/1204398?v=4", + "profile": "https://github.com/XN137", + "contributions": [ + "code", + "ideas" + ] } ] } From 8e41b41bb14782f4882961fe92ffc407da00bd74 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 7 Feb 2023 23:53:21 +0200 Subject: [PATCH 109/120] Target main branch with builddocs --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed7c23fdf..20f1f52b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,7 +79,7 @@ jobs: builddocs: needs: build runs-on: ubuntu-20.04 - if: ${{ github.repository == 'nosqlbench/nosqlbench' && github.event_name == 'push' && github.ref_name == 'master' }} + if: ${{ github.repository == 'nosqlbench/nosqlbench' && github.event_name == 'push' && github.ref_name == 'main' }} steps: - name: set git username From 8ba0684b8dcefd774426d0d99f466d7741a3d714 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 18:18:39 -0600 Subject: [PATCH 110/120] allow inline deprecation of activity params --- .../api/engine/activityimpl/ActivityDef.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java b/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java index 1ab2d6ebc..f9e2068b6 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java @@ -18,6 +18,7 @@ package io.nosqlbench.api.engine.activityimpl; import io.nosqlbench.api.config.NBNamedElement; import io.nosqlbench.api.engine.util.Unit; +import io.nosqlbench.api.errors.BasicError; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -213,4 +214,22 @@ public class ActivityDef implements NBNamedElement { public String getName() { return getAlias(); } + + public ActivityDef deprecate(String deprecatedName, String newName) { + Object deprecatedParam = this.parameterMap.get(deprecatedName); + if (deprecatedParam==null) { + return this; + } + if (deprecatedParam instanceof CharSequence chars) { + if (this.parameterMap.containsKey(newName)) { + throw new BasicError("You have specified activity param '" + deprecatedName + "' in addition to the valid name '" + newName +"'. Remove '" + deprecatedName + "'."); + } else { + logger.warn("Auto replacing deprecated activity param " + deprecatedName + " with new '" + newName +"="+ chars +"."); + parameterMap.put(newName,parameterMap.remove(deprecatedParam)); + } + } else { + throw new BasicError("Can't replace deprecated name with value of type " + deprecatedName.getClass().getCanonicalName()); + } + return this; + } } From 47c1f2db5a95ec1cc9cbad5bb446f56c08b3dbf1 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 18:19:03 -0600 Subject: [PATCH 111/120] update bindings-bigdecimal to work with J17 enums --- nbr/src/main/resources/examples/bindings-bigdecimal.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nbr/src/main/resources/examples/bindings-bigdecimal.yaml b/nbr/src/main/resources/examples/bindings-bigdecimal.yaml index 2d05000b9..47f388678 100644 --- a/nbr/src/main/resources/examples/bindings-bigdecimal.yaml +++ b/nbr/src/main/resources/examples/bindings-bigdecimal.yaml @@ -10,13 +10,16 @@ scenarios: # a scale parameter or a custom MathContext, but not both. The scale parameter # is not supported for String or Double input forms. +# As of Java 17, the roundingMode enums are UP DOWN CEILING FLOOR HALF_UP HALF_DOWN HALF_EVEN UNNECESSARY +# and the precision must be zero or greater + bindings: # convert an example double with some fractional values, then convert it to BigDecimal from_double: ToDouble(); Div(100.0d); ToBigDecimal(); # convert doubles to BigDecimal, with custom precision and rounding - from_double_custom5: ToDouble(); Div(100.0d); ToBigDecimal('precision=5 roundingMode=HALF'); + from_double_custom5: ToDouble(); Div(100.0d); ToBigDecimal('precision=5 roundingMode=HALF_EVEN'); # convert directly to BigDecimal from long as whole numbers from_long: ToBigDecimal(); From 0d955b2158ae7d654f9a3e2a89e7fb167af0d194 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 18:19:53 -0600 Subject: [PATCH 112/120] remove incompatible example from bindings-bytebuffers --- nbr/src/main/resources/examples/bindings-bytebuffers.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/nbr/src/main/resources/examples/bindings-bytebuffers.yaml b/nbr/src/main/resources/examples/bindings-bytebuffers.yaml index 19e3f51a0..510809000 100644 --- a/nbr/src/main/resources/examples/bindings-bytebuffers.yaml +++ b/nbr/src/main/resources/examples/bindings-bytebuffers.yaml @@ -21,9 +21,6 @@ bindings: # control the size of the extracted sample with a hash range hashed_bb_sizerange: ByteBufferSizedHashed(HashRange(1,10)); ToHexString(); - # control the size of the extracted sample based on a continuous function - hashed_bb_size_normal: ByteBufferSizedHashed(Normal(5.0, 1.0)); ToHexString(); - # control the size of the extracted sample based on a discrete function hashed_bb_size_binomial: ByteBufferSizedHashed(Binomial(8,0.5)); ToHexString(); From c78ff2118b5d1d20dfff2828b2c76e8bb00370c0 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 18:20:13 -0600 Subject: [PATCH 113/120] improve error for MathContext init --- .../library/basics/shared/util/MathContextReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java index df2c6bcbe..7e124231b 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * Copyright (c) 2022-2023 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public class MathContextReader { } } catch (IllegalArgumentException iae) { throw new BasicError("'" + name + "' was not a valid format for a new MathContext(String), try something " + - "like 'precision=17 roundingMode=UP"); + "like 'precision=17 roundingMode=UP', original exception:" + iae); } } From c45e3ff9643a6ab6967ec98d10aaf2ad840ea109 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 18:20:49 -0600 Subject: [PATCH 114/120] deprecate yaml->workload and type->driver, and make loader more robust --- .../api/activityimpl/uniform/StandardActivity.java | 1 + .../activityimpl/uniform/StandardActivityType.java | 13 ++++++++----- .../core/lifecycle/activity/ActivityLoader.java | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java index f21c8a468..b2377b9f1 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java @@ -80,6 +80,7 @@ public class StandardActivity extends SimpleActivity implements for (OpTemplate ot : opTemplates) { ParsedOp incompleteOpDef = new ParsedOp(ot, NBConfiguration.empty(), List.of()); String driverName = incompleteOpDef.takeOptionalStaticValue("driver", String.class) + .or(() -> incompleteOpDef.takeOptionalStaticValue("type",String.class)) .or(() -> activityDef.getParams().getOptionalString("driver")) .orElseThrow(() -> new OpConfigError("Unable to identify driver name for op template:\n" + ot)); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java index c319852e6..b45b91de6 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java @@ -16,15 +16,15 @@ package io.nosqlbench.engine.api.activityimpl.uniform; +import io.nosqlbench.api.config.standard.NBConfigModel; +import io.nosqlbench.api.config.standard.NBConfiguration; +import io.nosqlbench.api.config.standard.NBReconfigurable; +import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityapi.core.ActionDispenser; import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityconfig.OpsLoader; import io.nosqlbench.engine.api.activityconfig.yaml.OpsDocList; -import io.nosqlbench.api.engine.activityimpl.ActivityDef; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; -import io.nosqlbench.api.config.standard.NBConfigModel; -import io.nosqlbench.api.config.standard.NBConfiguration; -import io.nosqlbench.api.config.standard.NBReconfigurable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,7 +39,10 @@ public class StandardActivityType> extends Simpl private final Map adapters = new HashMap<>(); public StandardActivityType(DriverAdapter adapter, ActivityDef activityDef) { - super(activityDef); + super(activityDef + .deprecate("type","driver") + .deprecate("yaml", "workload") + ); this.adapters.put(adapter.getAdapterName(),adapter); if (adapter instanceof ActivityDefAware) { ((ActivityDefAware) adapter).setActivityDef(activityDef); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java index fb0f9bd95..97634ced7 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * Copyright (c) 2022-2023 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +41,7 @@ public class ActivityLoader { } public synchronized Activity loadActivity(ActivityDef activityDef) { + activityDef= activityDef.deprecate("yaml","workload").deprecate("type","driver"); Activity activity = new StandardActivityType(activityDef).getAssembledActivity(activityDef, activityMap); activityMap.put(activity.getAlias(),activity); logger.debug("Resolved activity for alias '" + activityDef.getAlias() + "'"); From 1711c5c02c78017c0081041ac80fbc5868de37c3 Mon Sep 17 00:00:00 2001 From: Jeff Banks Date: Tue, 7 Feb 2023 18:28:05 -0600 Subject: [PATCH 115/120] Phase 2 scenario upgrades #1019 (#1031) --- .../cqlgen/core/CGWorkloadExporter.java | 4 +- .../activities/baselines/cql-iot-dse.yaml | 4 +- .../activities/baselines/cql-iot.yaml | 4 +- .../baselines/cql-keyvalue-astra.yaml | 4 +- .../activities/baselines/cql-starter.yaml | 79 +++++++++++++++++++ .../activities/baselines/incremental.yaml | 6 +- .../activities/baselinesv2/cql-tabular2.yaml | 14 ++-- .../baselinesv2/cql-timeseries2.yaml | 4 +- .../src/main/resources/cqlgen/cqlgen.conf | 2 +- .../resources/data/cql-starter-message.txt | 1 + .../resources/testschemas/cql_alltypes.yaml | 6 +- .../baselinesv2/dynamodb-keyvalue2.yaml | 4 +- .../baselinesv2/dynamodb-tabular2.yaml | 4 +- .../baselinesv2/dynamodb-timeseries2.yaml | 2 +- .../baselines/http-rest-keyvalue.yaml | 4 +- .../baselines/http-rest-tabular.yaml | 6 +- .../baselines/http-rest-timeseries.yaml | 6 +- .../http-docsapi-crud-basic.yaml | 2 +- .../http-docsapi-crud-dataset.yaml | 2 +- .../documents-api/http-docsapi-keyvalue.yaml | 2 +- .../http-docsapi-search-advanced.yaml | 2 +- .../http-docsapi-search-basic.yaml | 2 +- .../http-graphql-cql-keyvalue.yaml | 2 +- .../http-graphql-cql-tabular.yaml | 4 +- .../http-graphql-keyvalue.yaml | 4 +- .../http-graphql-tabular.yaml | 4 +- .../http-graphql-timeseries.yaml | 4 +- .../baselinesv2/mongodb-keyvalue2.yaml | 2 +- .../baselinesv2/mongodb-tabular2.yaml | 2 +- .../baselinesv2/mongodb-timeseries2.yaml | 2 +- .../resources/activities/mongodb-basic.yaml | 2 +- .../activities/mongodb-crud-basic.yaml | 2 +- .../activities/mongodb-crud-dataset.yaml | 2 +- .../activities/mongodb-search-basic.yaml | 2 +- .../rawyaml/RawYamlTemplateLoaderTest.java | 2 +- .../resources/testdocs/docs_blocks_ops.yaml | 2 +- .../src/main/resources/scripts/auto/fm.js | 2 +- .../engine/cli/NBCLIScenarioParserTest.java | 4 +- .../activities/scenario-formats-test.yaml | 2 +- .../resources/activities/scenario-test.yaml | 6 +- .../getting_started/01_example_commands.md | 2 +- 41 files changed, 148 insertions(+), 68 deletions(-) create mode 100644 adapter-cqld4/src/main/resources/activities/baselines/cql-starter.yaml create mode 100644 adapter-cqld4/src/main/resources/data/cql-starter-message.txt diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java index d9415a00b..0794067b9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java @@ -320,9 +320,9 @@ public class CGWorkloadExporter implements BundledApp { put("default", new LinkedHashMap<>() {{ - put("schema", "run driver=cql tags=block:'schema-*.*' threads===UNDEF cycles===UNDEF"); + put("schema", "run driver=cql tags=block:\"schema.*\" threads===UNDEF cycles===UNDEF"); put("rampup", "run driver=cql tags=block:rampup threads=auto cycles===TEMPLATE(rampup-cycles,10000)"); - put("main", "run driver=cql tags=block:'main-*.*' threads=auto cycles===TEMPLATE(main-cycles,10000)"); + put("main", "run driver=cql tags=block:\"main.*\" threads=auto cycles===TEMPLATE(main-cycles,10000)"); }}); put("main-insert", "run driver=cql tags=block:main-insert threads=auto cycles===TEMPLATE(main-cycles,10000)"); diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql-iot-dse.yaml b/adapter-cqld4/src/main/resources/activities/baselines/cql-iot-dse.yaml index 1bc40fad9..ae83d127f 100644 --- a/adapter-cqld4/src/main/resources/activities/baselines/cql-iot-dse.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselines/cql-iot-dse.yaml @@ -2,8 +2,8 @@ description: An IOT workload with more optimal settings for DSE scenarios: default: schema: run driver=cql tags==block:schema threads==1 cycles==UNDEF - rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,100) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,100) threads=auto bindings: machine_id: Mod(<>); ToHashedUUID() -> java.util.UUID diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql-iot.yaml b/adapter-cqld4/src/main/resources/activities/baselines/cql-iot.yaml index 6250cc8ce..3daaf9eda 100644 --- a/adapter-cqld4/src/main/resources/activities/baselines/cql-iot.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselines/cql-iot.yaml @@ -7,11 +7,11 @@ scenarios: default: schema: run driver=cql tags==block:schema threads==1 cycles==UNDEF rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto astra: schema: run driver=cql tags==block:schema-astra threads==1 cycles==UNDEF rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto params: instrument: TEMPLATE(instrument,false) diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql-keyvalue-astra.yaml b/adapter-cqld4/src/main/resources/activities/baselines/cql-keyvalue-astra.yaml index 7ef9285d3..17bcc06a4 100644 --- a/adapter-cqld4/src/main/resources/activities/baselines/cql-keyvalue-astra.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselines/cql-keyvalue-astra.yaml @@ -5,11 +5,11 @@ scenarios: default: schema: run driver=cql tags==block:schema threads==1 cycles==UNDEF rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:'main-*.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto astra: schema: run driver=cql tags==block:schema-astra threads==1 cycles==UNDEF rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:'main-*.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: seq_key: Mod(<>); ToString() -> String diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql-starter.yaml b/adapter-cqld4/src/main/resources/activities/baselines/cql-starter.yaml new file mode 100644 index 000000000..120fb6753 --- /dev/null +++ b/adapter-cqld4/src/main/resources/activities/baselines/cql-starter.yaml @@ -0,0 +1,79 @@ +description: | + A cql-starter workload primarily for: + * Cassandra: 3.x, 4.x. + * DataStax Enterprise: 6.8.x. + * DataStax Astra. + +scenarios: + default: + schema: run driver=cql tags==block:schema threads==1 cycles==UNDEF + rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10) threads=auto + astra: + schema: run driver=cql tags==block:schema-astra threads==1 cycles==UNDEF + rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10) threads=auto + +params: + x: y + +bindings: + machine_id: Mod(<>); ToHashedUUID() -> java.util.UUID + message: ToString(); TextOfFile('data/cql-starter-message.txt') + time: Mul(100L); Div(10000L); ToJavaInstant() + timestamp: Mul(<>L); Div(<>L); Mul(1000L); + +blocks: + schema: + params: + prepared: false + ops: + create-keyspace: | + create keyspace if not exists <> + WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '<>'} + AND durable_writes = true; + create-table: | + create table if not exists <>.<> ( + machine_id UUID, + message text, + time timestamp, + PRIMARY KEY ((machine_id), time) + ) WITH CLUSTERING ORDER BY (time DESC); +# truncate-table: | +# truncate table <>.<>; + schema-astra: + params: + prepared: false + ops: + create-table-astra: | + create table if not exists <>.<> ( + machine_id UUID, + message text, + time timestamp, + PRIMARY KEY ((machine_id), time) + ) WITH CLUSTERING ORDER BY (time DESC); + rampup: + params: + cl: <> + idempotent: true + ops: + insert-rampup: | + insert into <>.<> (machine_id, message, time) + values ({machine_id}, {message}, {time}) using timestamp {timestamp}; + main-read: + params: + ratio: <> + cl: <> + ops: + select-read: | + select * from <>.<> + where machine_id={machine_id}; + main-write: + params: + ratio: <> + cl: <> + idempotent: true + ops: + insert-main: | + insert into <>.<> + (machine_id, message, time) values ({machine_id}, {message}, {time}) using timestamp {timestamp}; \ No newline at end of file diff --git a/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml b/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml index 9606236b6..5220be278 100644 --- a/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml @@ -29,11 +29,11 @@ scenarios: default: schema: run tags=block:schema.* threads==1 main: run tags=block:main-.*.* cycles===TEMPLATE(main-cycles,0) threads=auto - default-schema: run tags=block:'schema.*' threads==1 - default-main: run tags=block:'main.*' cycles===TEMPLATE(main-cycles,0) threads=auto + default-schema: run tags=block:"schema.*" threads==1 + default-main: run tags=block:"main.*" cycles===TEMPLATE(main-cycles,0) threads=auto astra: schema: run tags=block:astra-schema threads==1 - main: run tags=block:'main.*' cycles===TEMPLATE(main-cycles,0) threads=auto + main: run tags=block:"main.*" cycles===TEMPLATE(main-cycles,0) threads=auto params: instrument: true diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-tabular2.yaml b/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-tabular2.yaml index 67d3947f9..150665129 100644 --- a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-tabular2.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-tabular2.yaml @@ -28,12 +28,12 @@ description: | scenarios: default: schema: run driver=cql tags==block:schema threads==1 cycles==UNDEF - rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10B) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,100M) threads=auto + rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,100) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,100) threads=auto astra: schema: run driver=cql tags==block:schema-astra threads==1 cycles==UNDEF - rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,100) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,100) threads=auto params: instrument: true @@ -100,13 +100,13 @@ blocks: rampup-insert: | insert into TEMPLATE(keyspace,baselines).TEMPLATE(table,tabular) (part,clust,data0,data1,data2,data3,data4,data5,data6,data7) - values ({part_layout},{clust_layout},{data0},{data1},{data2},{data3},{data4},{data5},{data6},{data7}) + values ({part_layout},{clust_layout},{data0},{data1},{data2},{data3},{data4},{data5},{data6},{data7}); verify: params: cl: TEMPLATE(read_cl,LOCAL_QUORUM) ops: verify-select: | - select * from TEMPLATE(keyspace,baselines).TEMPLATE(table,tabular) where part={part_layout} and clust={clust_layout} + select * from TEMPLATE(keyspace,baselines).TEMPLATE(table,tabular) where part={part_layout} and clust={clust_layout}; main-read: params: ratio: 1 @@ -136,4 +136,4 @@ blocks: main-write: | insert into TEMPLATE(keyspace,baselines).TEMPLATE(table,tabular) (part, clust, data0,data1,data2,data3,data4,data5,data6,data7) - values ({part_write},{clust_write},{data0},{data1},{data2},{data3},{data4},{data5},{data6},{data7}) + values ({part_write},{clust_write},{data0},{data1},{data2},{data3},{data4},{data5},{data6},{data7}) \ No newline at end of file diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-timeseries2.yaml b/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-timeseries2.yaml index 60cac37b0..afec3d713 100644 --- a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-timeseries2.yaml +++ b/adapter-cqld4/src/main/resources/activities/baselinesv2/cql-timeseries2.yaml @@ -7,11 +7,11 @@ scenarios: default: schema: run driver=cql tags==block:schema threads==1 cycles==UNDEF rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto astra: schema: run driver=cql tags==block:schema-astra threads==1 cycles==UNDEF rampup: run driver=cql tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=cql tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=cql tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto params: instrument: TEMPLATE(instrument,false) diff --git a/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf b/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf index 7c12bcaea..0aab9c35c 100644 --- a/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf +++ b/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf @@ -126,7 +126,7 @@ timeouts: blockplan: - # not needed when tags=block:'schema.*' + # not needed when tags=block:"schema.*" # schema: schema-keyspaces, schema-tables, schema-types schema-keyspaces: schema-keyspaces schema-tables: schema-tables diff --git a/adapter-cqld4/src/main/resources/data/cql-starter-message.txt b/adapter-cqld4/src/main/resources/data/cql-starter-message.txt new file mode 100644 index 000000000..2d56aa368 --- /dev/null +++ b/adapter-cqld4/src/main/resources/data/cql-starter-message.txt @@ -0,0 +1 @@ +Welcome to cql-starter! \ No newline at end of file diff --git a/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml b/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml index d952f3c03..dd7c96517 100644 --- a/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml +++ b/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml @@ -1,9 +1,9 @@ description: Auto-generated workload from source schema. scenarios: default: - schema: run driver=cql tags=block:'schema.*' threads===UNDEF cycles===UNDEF - rampup: run driver=cql tags=block:'rampup.*' threads=auto cycles===TEMPLATE(rampup-cycles,10000) - main: run driver=cql tags=block:'main.*' threads=auto cycles===TEMPLATE(main-cycles,10000) + schema: run driver=cql tags=block:"schema.*" threads===UNDEF cycles===UNDEF + rampup: run driver=cql tags=block:"rampup.*" threads=auto cycles===TEMPLATE(rampup-cycles,10000) + main: run driver=cql tags=block:"main.*" threads=auto cycles===TEMPLATE(main-cycles,10000) main-insert: run driver=cql tags=block:main-insert threads=auto cycles===TEMPLATE(main-cycles,10000) main-select: run driver=cql tags=block:main-select threads=auto cycles===TEMPLATE(main-cycles,10000) main-scan: run driver=cql tags=block:main-scan threads=auto cycles===TEMPLATE(main-cycles,10000) diff --git a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml b/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml index af52ac337..6509963cd 100644 --- a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml +++ b/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml @@ -6,9 +6,9 @@ description: | scenarios: default: - schema: run driver=dynamodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=dynamodb tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=dynamodb tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=dynamodb tags==block:'main-*.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=dynamodb tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto read: run driver=dynamodb tags==block:main-read cycles===TEMPLATE(main-cycles,10000000) threads=auto write: run driver=dynamodb tags==block:main-write cycles===TEMPLATE(main-cycles,10000000) threads=auto diff --git a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml b/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml index ac531efe8..acc0acd51 100644 --- a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml +++ b/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml @@ -4,10 +4,10 @@ description: | Run a read/write workload against DynamoDB with varying field sizes and query patterns scenarios: - schema: run driver=dynamodb tags=block:'schema.*' region=us-east-1 + schema: run driver=dynamodb tags=block:"schema.*" region=us-east-1 rampup: run driver=dynamodb tags=block:rampup region=us-east-1 read: run driver=dynamodb tags=block:read region=us-east-1 - main: run driver=dynamodb tags=block:'main-*.*' region=us-east-1 + main: run driver=dynamodb tags=block:"main.*" region=us-east-1 read01: run driver=dynamodb tags='name:.*main-read-01' region=us-east-1 delete: table: run driver=dynamodb tags==block:delete threads==1 cycles==UNDEF diff --git a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml b/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml index 34a76afb6..2c53654b8 100644 --- a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml +++ b/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml @@ -11,7 +11,7 @@ description: | scenarios: default: - schema: run driver=dynamodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=dynamodb tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=dynamodb tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto main: run driver=dynamodb tags==block:main cycles===TEMPLATE(main-cycles,10000000) threads=auto delete: diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml b/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml index d186f6e99..80a5d127c 100644 --- a/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml +++ b/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml @@ -9,8 +9,8 @@ description: | scenarios: default: schema: run driver=http tags==block:schema threads==1 cycles==UNDEF - rampup: run driver=http tags==block:"rampup-*.*" cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=http tags==block:"main-*.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto + rampup: run driver=http tags==block:"rampup.*" cycles===TEMPLATE(rampup-cycles,10000000) threads=auto + main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml b/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml index 8c3534ff0..2a9f278b2 100644 --- a/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml +++ b/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml @@ -9,9 +9,9 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF - rampup: run driver=http tags==block:'rampup-*.*' cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=http tags==block:'main-*.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF + rampup: run driver=http tags==block:"rampup.*" cycles===TEMPLATE(rampup-cycles,10000000) threads=auto + main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml b/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml index cf77c6cb4..be6fedc24 100644 --- a/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml +++ b/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml @@ -12,10 +12,10 @@ description: | scenarios: default: - schema: run driver=cql tags==block:'schema-*.*' threads==1 cycles==UNDEF + schema: run driver=cql tags==block:"schema.*" threads==1 cycles==UNDEF schema-astra: run driver=cql tags==block:schema-astra threads==1 cycles==UNDEF - rampup: run driver=http tags==block:'rampup-*.*' cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=http tags==block:'main-*.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + rampup: run driver=http tags==block:"rampup.*" cycles===TEMPLATE(rampup-cycles,10000000) threads=auto + main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml index bf1cf8417..b644da7d2 100644 --- a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml +++ b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml @@ -7,7 +7,7 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF write: run driver=http tags==block:'write.*' cycles===TEMPLATE(write-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn read: run driver=http tags==block:'read.*' cycles===TEMPLATE(read-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn update: run driver=http tags==block:'update.*' cycles===TEMPLATE(update-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml index e67d61787..5a93c57ef 100644 --- a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml +++ b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml @@ -7,7 +7,7 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF write: run driver=http tags==name:'write.*' cycles===TEMPLATE(write-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn read: run driver=http tags==name:'read.*' cycles===TEMPLATE(read-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn update: run driver=http tags==name:'update.*' cycles===TEMPLATE(update-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml index 4ed237879..cd1df59e5 100644 --- a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml +++ b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml @@ -10,7 +10,7 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=http tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto main: run driver=http tags==block:main cycles===TEMPLATE(main-cycles,10000000) threads=auto diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml index edf6229f3..49cb31a4e 100644 --- a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml +++ b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml @@ -15,7 +15,7 @@ description: | # complex2: (match1 LTE 0 OR match2 EQ "false") AND (match2 EQ "false" OR match3 EQ true) # complex3: (match1 LTE 0 AND match2 EQ "true") OR (match2 EQ "false" AND match3 EQ true) scenarios: - schema: run driver=http tags==block:'schema.*' threads==<> cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==<> cycles==UNDEF rampup: write: run driver=http tags==name:'rampup-put.*' cycles===TEMPLATE(docscount,10000000) docpadding=TEMPLATE(docpadding,0) match-ratio=TEMPLATE(match-ratio,0.01) threads=<> errors=timer,warn read: run driver=http tags==block:'rampup-get.*' cycles===TEMPLATE(rampup-cycles, 10000000) page-size=TEMPLATE(page-size,3) fields=TEMPLATE(fields,%5b%5d) threads=<> errors=timer,warn diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml index 8105dce04..1a6250677 100644 --- a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml +++ b/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml @@ -7,7 +7,7 @@ description: | Note that docsapi_port should reflect the port where the Docs API is exposed (defaults to 8180). scenarios: - schema: run driver=http tags==block:'schema.*' threads==<> cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==<> cycles==UNDEF rampup: write: run driver=http tags==name:'rampup-put.*' cycles===TEMPLATE(docscount,10000000) docpadding=TEMPLATE(docpadding,0) match-ratio=TEMPLATE(match-ratio,0.01) threads=<> errors=timer,warn read: run driver=http tags==name:'rampup-get.*' cycles===TEMPLATE(rampup-cycles, 10000000) page-size=TEMPLATE(page-size,3) fields=TEMPLATE(fields,%5b%5d) threads=<> errors=timer,warn diff --git a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml b/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml index 794120747..b4363eaaf 100644 --- a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml +++ b/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml @@ -9,7 +9,7 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=http tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto diff --git a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml b/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml index 777359c92..b44f48f51 100644 --- a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml +++ b/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml @@ -10,9 +10,9 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=http tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=http tags==block:'main.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml b/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml index 19754747c..1901efdfc 100644 --- a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml +++ b/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml @@ -13,9 +13,9 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=http tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=http tags==block:'main.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml b/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml index 8f5004e26..e88b804d2 100644 --- a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml +++ b/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml @@ -15,9 +15,9 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=http tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - man: run driver=http tags==block:'main.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + man: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml b/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml index 7a6c28a9c..7bd663e9d 100644 --- a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml +++ b/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml @@ -19,9 +19,9 @@ description: | scenarios: default: - schema: run driver=http tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=http tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=http tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto - main: run driver=http tags==block:'main.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=http tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: # To enable an optional weighted set of hosts in place of a load balancer diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml index bae4e0254..7c65abd87 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml @@ -9,7 +9,7 @@ description: | scenarios: default: - schema: run driver=mongodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=mongodb tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=mongodb tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto main: run driver=mongodb tags==block:'main-.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto drop: run driver=mongodb tags==block:drop-collection threads==1 cycles==UNDEF diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml index 7873cb49e..8539d3157 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml @@ -9,7 +9,7 @@ description: | scenarios: default: - schema: run driver=mongodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=mongodb tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=mongodb tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto main: run driver=mongodb tags==block:'main-.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto drop: run driver=mongodb tags==block:drop-collection threads==1 cycles==UNDEF diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml index f7d519786..e8b248899 100644 --- a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml +++ b/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml @@ -13,7 +13,7 @@ description: | scenarios: default: - schema: run driver=mongodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=mongodb tags==block:"schema.*" threads==1 cycles==UNDEF rampup: run driver=mongodb tags==block:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto main: run driver=mongodb tags==block:'main-.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto drop: run driver=mongodb tags==block:drop-collection threads==1 cycles==UNDEF diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml b/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml index 7c3deb332..a502a3cf0 100644 --- a/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml +++ b/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml @@ -3,7 +3,7 @@ description: An example of a basic mongo insert and find. scenarios: default: rampup: run driver=mongodb tags==block:rampup cycles===TEMPLATE(rampup-cycles,1000000) threads=auto - main: run driver=mongodb tags==block:'main-*.*' cycles===TEMPLATE(main-cycles,10000000) threads=auto + main: run driver=mongodb tags==block:"main.*" cycles===TEMPLATE(main-cycles,10000000) threads=auto bindings: seq_key: Mod(<>L); ToInt() diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml b/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml index 14bfc0c39..36c4d7a8d 100644 --- a/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml +++ b/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml @@ -6,7 +6,7 @@ description: | scenarios: default: - schema: run driver=mongodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=mongodb tags==block:"schema.*" threads==1 cycles==UNDEF write: run driver=mongodb tags==block:main-write,type:write cycles===TEMPLATE(write-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn read: run driver=mongodb tags==block:main-read,type:read cycles===TEMPLATE(read-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn update: run driver=mongodb tags==block:main-update,type:update cycles===TEMPLATE(update-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml b/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml index 9b22f455a..fa2c695e8 100644 --- a/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml +++ b/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml @@ -6,7 +6,7 @@ description: | scenarios: default: - schema: run driver=mongodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=mongodb tags==block:"schema.*" threads==1 cycles==UNDEF write: run driver=mongodb tags==block:main-write,type:write cycles===TEMPLATE(write-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn read: run driver=mongodb tags==block:main-read,type:read cycles===TEMPLATE(read-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn update: run driver=mongodb tags==block:main-update,type:update cycles===TEMPLATE(update-cycles,TEMPLATE(docscount,10000000)) threads=auto errors=timer,warn diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml b/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml index 33d9c42be..e3a003199 100644 --- a/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml +++ b/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml @@ -6,7 +6,7 @@ description: | It's a counterpart of the Stargate's Documents API Basic Search workflow. scenarios: - schema: run driver=mongodb tags==block:'schema.*' threads==1 cycles==UNDEF + schema: run driver=mongodb tags==block:"schema.*" threads==1 cycles==UNDEF rampup-write: run driver=mongodb tags==block:rampup-write cycles===TEMPLATE(docscount,10000000) docpadding=TEMPLATE(docpadding,0) match-ratio=TEMPLATE(match-ratio,0.01) threads=auto errors=timer,warn rampup-read: run driver=mongodb tags==block:rampup-read cycles===TEMPLATE(rampup-cycles, 10000000) field-projection=TEMPLATE(fields,null) threads=<> errors=timer,warn main: run driver=mongodb tags==block:main cycles===TEMPLATE(read-cycles,TEMPLATE(docscount,10000000)) field-projection=TEMPLATE(fields,null) threads=<> errors=timer,warn diff --git a/adapters-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java b/adapters-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java index d1b7b98fa..9edddf52d 100644 --- a/adapters-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java +++ b/adapters-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java @@ -77,7 +77,7 @@ public class RawYamlTemplateLoaderTest { assertThat(schemaOnlyScenario.keySet()) .containsExactly("000"); assertThat(schemaOnlyScenario.values()) - .containsExactly("run driver=blah tags=block:'schema.*'"); + .containsExactly("run driver=blah tags=block:\"schema.*\""); assertThat(rawOpsDoc.getName()).isEqualTo("doc1"); assertThat(blocks).hasSize(1); diff --git a/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml b/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml index 4e76e12e7..c73305222 100644 --- a/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml +++ b/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml @@ -7,7 +7,7 @@ scenarios: - run driver=stdout alias=step1 - run driver=stdout alias=step2 schema-only: - - run driver=blah tags=block:'schema.*' + - run driver=blah tags=block:"schema.*" tags: atagname: atagvalue diff --git a/engine-cli/src/main/resources/scripts/auto/fm.js b/engine-cli/src/main/resources/scripts/auto/fm.js index d720b47b0..87bdf5cb7 100644 --- a/engine-cli/src/main/resources/scripts/auto/fm.js +++ b/engine-cli/src/main/resources/scripts/auto/fm.js @@ -48,7 +48,7 @@ schema_activitydef = params.withDefaults({ }); schema_activitydef.alias="findmax_schema"; schema_activitydef.threads="1"; -schema_activitydef.tags="TEMPLATE(schematags,block:'schema.*')"; +schema_activitydef.tags="TEMPLATE(schematags,block:\"schema.*\")"; print("Creating schema with schematags:" + schema_activitydef.tags); scenario.run(schema_activitydef); diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java index 9ba47e884..d3aff8cc1 100644 --- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java +++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java @@ -120,7 +120,7 @@ public class NBCLIScenarioParserTest { "alias", "scenariotest_schemaonly_schema", "cycles-test", "20", "driver", "stdout", - "tags", "block:'schema.*'", + "tags", "block:\"schema.*\"", "workload", "scenario-test" )); NBCLIOptions opts1 = new NBCLIOptions(new String[]{"scenario-test", "schema-only", "doundef=20"}); @@ -170,7 +170,7 @@ public class NBCLIScenarioParserTest { "alias", "scenariotest_schemaonly_schema", "cycles-test", "20", "driver", "stdout", - "tags", "block:'schema.*'", + "tags", "block:\"schema.*\"", "workload", "scenario-test" )); NBCLIOptions opts1 = new NBCLIOptions(new String[]{"local/example-scenarios", "namedsteps.one", "testparam1=testvalue2"}); diff --git a/engine-cli/src/test/resources/activities/scenario-formats-test.yaml b/engine-cli/src/test/resources/activities/scenario-formats-test.yaml index 9e9e4afcf..0af761189 100644 --- a/engine-cli/src/test/resources/activities/scenario-formats-test.yaml +++ b/engine-cli/src/test/resources/activities/scenario-formats-test.yaml @@ -1,6 +1,6 @@ name: alternate-format-test scenarios: default: - schema: run driver=cql protocol_version=v4 tags=block:'schema.*' threads==1 cycles=UNDEF + schema: run driver=cql protocol_version=v4 tags=block:"schema.*" threads==1 cycles=UNDEF rampup: run driver=cql protocol_version=v4 tags=block:rampup cycles=10000 main: run driver=cql protocol_version=v4 tags=block:main_mixed cycles=10000 diff --git a/engine-cli/src/test/resources/activities/scenario-test.yaml b/engine-cli/src/test/resources/activities/scenario-test.yaml index fd7eeb28d..31ab4f815 100644 --- a/engine-cli/src/test/resources/activities/scenario-test.yaml +++ b/engine-cli/src/test/resources/activities/scenario-test.yaml @@ -2,11 +2,11 @@ min_version: "5.17.1" scenarios: default: - schema: run driver==stdout workload===scenario-test tags=block:'schema.*' + schema: run driver==stdout workload===scenario-test tags=block:"schema.*" rampup: run driver=stdout workload===scenario-test tags=block:rampup cycles=TEMPLATE(cycles1,10) - main: run driver=stdout workload===scenario-test tags=block:'main.*' cycles=TEMPLATE(cycles2,10) + main: run driver=stdout workload===scenario-test tags=block:"main.*" cycles=TEMPLATE(cycles2,10) schema-only: - schema: run driver=stdout workload==scenario-test tags=block:'schema.*' doundef==undef + schema: run driver=stdout workload==scenario-test tags=block:"schema.*" doundef==undef template-test: with-template: run driver=stdout cycles=TEMPLATE(cycles-test,10) diff --git a/engine-docs/src/main/resources/docs-for-nb/getting_started/01_example_commands.md b/engine-docs/src/main/resources/docs-for-nb/getting_started/01_example_commands.md index fe51887d0..270635dc4 100644 --- a/engine-docs/src/main/resources/docs-for-nb/getting_started/01_example_commands.md +++ b/engine-docs/src/main/resources/docs-for-nb/getting_started/01_example_commands.md @@ -15,7 +15,7 @@ command line, go ahead and execute the following command, replacing the `host=` with that of one of your database nodes. ```text -./nb run driver=cql workload=cql-keyvalue tags=block:'schema.*' host= +./nb run driver=cql workload=cql-keyvalue tags=block:"schema.*" host= ``` This command is creating the following schema in your database: From b73933030376aed95eefa97d357443a24a5181b9 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 19:15:56 -0600 Subject: [PATCH 116/120] allow inline deprecation of activity params --- .../io/nosqlbench/api/engine/activityimpl/ActivityDef.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java b/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java index f9e2068b6..26bca1168 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java +++ b/nb-api/src/main/java/io/nosqlbench/api/engine/activityimpl/ActivityDef.java @@ -224,8 +224,8 @@ public class ActivityDef implements NBNamedElement { if (this.parameterMap.containsKey(newName)) { throw new BasicError("You have specified activity param '" + deprecatedName + "' in addition to the valid name '" + newName +"'. Remove '" + deprecatedName + "'."); } else { - logger.warn("Auto replacing deprecated activity param " + deprecatedName + " with new '" + newName +"="+ chars +"."); - parameterMap.put(newName,parameterMap.remove(deprecatedParam)); + logger.warn("Auto replacing deprecated activity param '" + deprecatedName + "="+ chars +"' with new '" + newName +"="+ chars +"'."); + parameterMap.put(newName,parameterMap.remove(deprecatedName)); } } else { throw new BasicError("Can't replace deprecated name with value of type " + deprecatedName.getClass().getCanonicalName()); From 663a721f1d63b1bc3664fecbb9b3344aae3297f6 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 19:16:02 -0600 Subject: [PATCH 117/120] data path correction --- .../io/nosqlbench/virtdata/library/realer/CountryNames.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java index aacba6d47..295e4b56b 100644 --- a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java +++ b/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 nosqlbench + * Copyright (c) 2022-2023 nosqlbench * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class CountryNames extends CSVSampler implements LongFunction { @Example("CountryNames()") public CountryNames() { - super("COUNTRY_NAME","n/a","name","countries.csv"); + super("COUNTRY_NAME","n/a","name","data/countries.csv"); } } From 262ac17b985228f39a8629d23ad2c47bc3065d8f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 19:16:05 -0600 Subject: [PATCH 118/120] correct binding regexes --- .../main/resources/examples/bindings-premade.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nbr/src/main/resources/examples/bindings-premade.yaml b/nbr/src/main/resources/examples/bindings-premade.yaml index ec16c5271..8343a1f85 100644 --- a/nbr/src/main/resources/examples/bindings-premade.yaml +++ b/nbr/src/main/resources/examples/bindings-premade.yaml @@ -5,12 +5,12 @@ description: | scenarios: default: run driver===stdout format=readout - names: run driver===stdout format=readout bindings=names - cities: run driver===stdout format=readout bindings=cities - states: run driver===stdout format=readout bindings=states - zips: run driver===stdout format=readout bindings=zips - counties: run driver===stdout format=readout bindings=counties - countries: run driver===stdout format=readout bindings=country + names: run driver===stdout format=readout bindings='names.*' + cities: run driver===stdout format=readout bindings='cities.*' + states: run driver===stdout format=readout bindings='states.*' + zips: run driver===stdout format=readout bindings='zips.*' + counties: run driver===stdout format=readout bindings='counties.*' + countries: run driver===stdout format=readout bindings='country.*' # Each binding is named, so the bindings is a map of names to From da866eae6c31eda4d5b575a2b3b820297b5c568d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 19:16:07 -0600 Subject: [PATCH 119/120] make bindings-utilities more useful --- nbr/src/main/resources/examples/bindings-utilities.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nbr/src/main/resources/examples/bindings-utilities.yaml b/nbr/src/main/resources/examples/bindings-utilities.yaml index 3f78c04cd..adfed6198 100644 --- a/nbr/src/main/resources/examples/bindings-utilities.yaml +++ b/nbr/src/main/resources/examples/bindings-utilities.yaml @@ -21,10 +21,10 @@ bindings: # The TypeOf() function tells you the java class of its input - typeof: TypeOf(); + typeof: ToJavaInstant(); TypeOf(); # The Show() function provides a snapshot of what is in the thread-local # variable map as a String - show: Show(); + show: SaveLong('var42'); Show(); From d7c1a36586ce1592189938fcff23bb8bd160a2a5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 7 Feb 2023 19:16:10 -0600 Subject: [PATCH 120/120] typo fix --- .../io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java index ae5f83050..16ca54d9d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java @@ -139,7 +139,7 @@ public class NBCLIScenarioParser { if (selectedScenario.containsKey(stepname)) { namedSteps.put(stepname,selectedScenario.get(stepname)); } else { - throw new BasicError("Unable to find named scenario.step'" + scenarioName + "' in workload '" + workloadName + throw new BasicError("Unable to find named scenario.step '" + scenarioName + "' in workload '" + workloadName + "', but you can pick from one of: " + selectedScenario.keySet().stream().map(n -> nameparts[0].concat(".").concat(n)).collect(Collectors.joining(", "))); } }