IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into nosqlbench-797-callable

Browse Source
This commit is contained in:
Jonathan Shook
2022-12-12 15:04:39 -06:00
parent 86c4dfd966 21eb031da9
commit 2b39f3c350
87 changed files with 4935 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine-api/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>4.17.31-SNAPSHOT</version>
<version>4.17.32-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@@ -39,31 +39,31 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-api</artifactId>
<version>4.17.31-SNAPSHOT</version>
<version>4.17.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>adapters-api</artifactId>
<version>4.17.31-SNAPSHOT</version>
<version>4.17.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-spectest</artifactId>
<version>4.17.31-SNAPSHOT</version>
<version>4.17.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-annotations</artifactId>
<version>4.17.31-SNAPSHOT</version>
<version>4.17.32-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>virtdata-userlibs</artifactId>
<version>4.17.31-SNAPSHOT</version>
<version>4.17.32-SNAPSHOT</version>
</dependency>
<dependency>

5
engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CountErrorHandler.java
View File

@@ -30,11 +30,14 @@ import org.apache.logging.log4j.Logger;
@Service(value = ErrorHandler.class, selector = "count")
public class CountErrorHandler extends CounterErrorHandler {
public CountErrorHandler() {
logger.warn("Starting with v4.17 onward, use 'counter'. See cql-errors.md for usage.");
}
private static final Logger logger = LogManager.getLogger(CountErrorHandler.class);
@Override
public ErrorDetail handleError(String name, Throwable t, long cycle, long durationInNanos, ErrorDetail detail) {
logger.warn("Starting with v4.17 onward, use 'counter'. See cql-errors.md for usage.");
return super.handleError(name, t, cycle, durationInNanos, detail);
}
}

10
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardAction.java
View File

@@ -32,11 +32,11 @@ import org.apache.logging.log4j.Logger;
import java.util.concurrent.TimeUnit;
/**
* This is the generified version of an Action. All activity types should endeavor to use
* this, as the API surface is being consolidated so that the internal machinery of NB
* works in a very consistent and uniform way.
* There will be changes to multiple drivers to support this consolidation, but the bulk
* of this work will be undertaken by the project maintainers.
* This is the generified version of an Action. All driver adapters us this, as opposed
* to previous NB versions where it was implemented for each driver.
*
* This allows the API to be consolidated so that the internal machinery of NB
* works in a very consistent and uniform way for all users and drivers.
*
* @param <A> The type of activity
* @param <R> The type of operation