From 746bdcfdcbe220a3fcae2f01b36d7cd4634e3224 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Thu, 23 Apr 2020 12:41:21 -0500 Subject: [PATCH] improve debugging views --- .../activityapi/ratelimits/HybridRateLimiter.java | 14 +++++++++++--- .../engine/extensions/optimizers/MVParams.java | 12 ++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java index 521e7ff3e..5efd5c1f9 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/ratelimits/HybridRateLimiter.java @@ -214,9 +214,17 @@ public class HybridRateLimiter implements Startable, RateLimiter { @Override public String toString() { - return - //"ID:"+System.identityHashCode(this)+" "+ - this.getRateSpec().toString() + "(" + this.state + ") pool:" + filler; + StringBuilder sb = new StringBuilder(HybridRateLimiter.class.getSimpleName()); + if (this.getRateSpec()!=null) { + sb.append(" spec=").append(this.getRateSpec().toString()); + } + if (this.state!=null) { + sb.append(" state=").append(this.state); + } + if (this.filler !=null) { + sb.append(" filler=").append(this.filler.toString()); + } + return sb.toString(); } // public String getRefillLog() { diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MVParams.java b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MVParams.java index e32a5bb8b..129c0700d 100644 --- a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MVParams.java +++ b/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/optimizers/MVParams.java @@ -3,6 +3,7 @@ package io.nosqlbench.engine.extensions.optimizers; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.stream.Collectors; public class MVParams implements Iterable { private final List paramList = new ArrayList<>(); @@ -35,5 +36,16 @@ public class MVParams implements Iterable { this.min = min; this.max = max; } + + @Override + public String toString() { + return + min + "<=" + name + "<="+ max; + } + } + + @Override + public String toString() { + return paramList.stream().map(MVParam::toString).collect(Collectors.joining(" ")); } }