This is an automated email from the ASF dual-hosted git repository. mattyb149 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push: new 5106b76 NIFI-6649 - repaired test due to min zero fix 5106b76 is described below commit 5106b764da021149054231d08c25381c736964bb Author: Yolanda M. Davis <yolanda.m.da...@gmail.com> AuthorDate: Thu Sep 12 15:49:34 2019 -0400 NIFI-6649 - repaired test due to min zero fix NIFI-6649 - added check if logging debug is enabled Signed-off-by: Matthew Burgess <mattyb...@apache.org> This closes #3730 --- .../analytics/ConnectionStatusAnalytics.java | 2 +- .../analytics/TestConnectionStatusAnalytics.java | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/ConnectionStatusAnalytics.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/ConnectionStatusAnalytics.java index 7abba4b..e152339 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/ConnectionStatusAnalytics.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/ConnectionStatusAnalytics.java @@ -97,7 +97,7 @@ public class ConnectionStatusAnalytics implements StatusAnalytics { LOG.debug("Refreshing model with new data for connection id: {} ", connectionIdentifier); model.learn(Stream.of(features), Stream.of(values)); - if(MapUtils.isNotEmpty(model.getScores())){ + if(LOG.isDebugEnabled() && MapUtils.isNotEmpty(model.getScores())){ model.getScores().forEach((key, value) -> { LOG.debug("Model Scores for prediction metric {} for connection id {}: {}={} ", metric, connectionIdentifier, key, value); }); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestConnectionStatusAnalytics.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestConnectionStatusAnalytics.java index 5d9279f..ffa86a8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestConnectionStatusAnalytics.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/TestConnectionStatusAnalytics.java @@ -287,12 +287,12 @@ public class TestConnectionStatusAnalytics { } @Test - public void testCannotPredictNextIntervalBytesNegative() { + public void testNextIntervalBytesZero() { Map<String, Tuple<StatusAnalyticsModel, StatusMetricExtractFunction>> modelMap = getModelMap("queuedBytes",.9,-1.0,-1.0); ConnectionStatusAnalytics connectionStatusAnalytics = getConnectionStatusAnalytics(modelMap); Long nextIntervalBytes = connectionStatusAnalytics.getNextIntervalBytes(); assertNotNull(nextIntervalBytes); - assert (nextIntervalBytes == -1); + assert (nextIntervalBytes == 0); } @Test @@ -335,30 +335,30 @@ public class TestConnectionStatusAnalytics { } @Test - public void testCannotPredictNextIntervalCountNegative() { + public void testGetNextIntervalCountZero() { Map<String, Tuple<StatusAnalyticsModel, StatusMetricExtractFunction>> modelMap = getModelMap("queuedCount",.9,-1.0,-1.0); ConnectionStatusAnalytics connectionStatusAnalytics = getConnectionStatusAnalytics(modelMap); - Long nextIntervalBytes = connectionStatusAnalytics.getNextIntervalCount(); - assertNotNull(nextIntervalBytes); - assert (nextIntervalBytes == -1); + Long nextIntervalCount = connectionStatusAnalytics.getNextIntervalCount(); + assertNotNull(nextIntervalCount); + assert (nextIntervalCount == 0); } @Test public void testCannotPredictNextIntervalCountNaN() { Map<String, Tuple<StatusAnalyticsModel, StatusMetricExtractFunction>> modelMap = getModelMap("queuedCount",.9,Double.NaN,Double.NaN); ConnectionStatusAnalytics connectionStatusAnalytics = getConnectionStatusAnalytics(modelMap); - Long nextIntervalBytes = connectionStatusAnalytics.getNextIntervalCount(); - assertNotNull(nextIntervalBytes); - assert (nextIntervalBytes == -1); + Long nextIntervalCount = connectionStatusAnalytics.getNextIntervalCount(); + assertNotNull(nextIntervalCount); + assert (nextIntervalCount == -1); } @Test public void testCannotPredictNextIntervalCountInfinity() { Map<String, Tuple<StatusAnalyticsModel, StatusMetricExtractFunction>> modelMap = getModelMap("queuedCount",.9,Double.POSITIVE_INFINITY,Double.POSITIVE_INFINITY); ConnectionStatusAnalytics connectionStatusAnalytics = getConnectionStatusAnalytics(modelMap); - Long nextIntervalBytes = connectionStatusAnalytics.getNextIntervalCount(); - assertNotNull(nextIntervalBytes); - assert (nextIntervalBytes == -1); + Long nextIntervalCount = connectionStatusAnalytics.getNextIntervalCount(); + assertNotNull(nextIntervalCount); + assert (nextIntervalCount == -1); } @Test