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

fix NPE when no filter or validator applied

Browse Source
This commit is contained in:
Jonathan Shook 2023-09-10 19:17:45 -05:00
parent 17fa8500ab
commit 7b9f4389b8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
View File

@ -122,8 +122,8 @@ public class Annotators {
} }
public static synchronized void recordAnnotation(Annotation annotation) { public static synchronized void recordAnnotation(Annotation annotation) {
annotation.applyLabelFunction(filter); if (filter!=null) annotation.applyLabelFunction(filter);
annotation.applyLabelFunction(validator); if (validator!=null) annotation.applyLabelFunction(validator);
// sanity check here first // sanity check here first
annotation.getLabels(); annotation.getLabels();
for (Annotator annotator : getAnnotators()) { for (Annotator annotator : getAnnotators()) {

4
nb-api/src/main/java/io/nosqlbench/api/engine/metrics/ActivityMetrics.java
View File

@ -76,8 +76,8 @@ public class ActivityMetrics {
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
private static Metric register(NBLabels labels, MetricProvider metricProvider) { private static Metric register(NBLabels labels, MetricProvider metricProvider) {
labels = labelFilter.apply(labels); labels = labelFilter!=null ? labelFilter.apply(labels) : labels;
labels = labelValidator.apply(labels); labels = labelValidator != null ? labelValidator.apply(labels) : labels;
final String graphiteName = labels.linearizeValues('.',"[activity]","[space]","[op]","name"); final String graphiteName = labels.linearizeValues('.',"[activity]","[space]","[op]","name");
Metric metric = get().getMetrics().get(graphiteName); Metric metric = get().getMetrics().get(graphiteName);