From d7f7c16cfa0f517ca4449f8610c474c518f78717 Mon Sep 17 00:00:00 2001 From: Ola Aunrønning Date: Wed, 19 Feb 2020 13:44:15 +0100 Subject: Only print size related stats when input is file --- .../main/java/com/yahoo/vespa/http/client/runner/Runner.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'vespa-http-client') diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java index e557bb3ca1b..59953fbe002 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/Runner.java @@ -70,7 +70,6 @@ public class Runner { Optional.ofNullable(commandLineArgs.getFile()), commandLineArgs.getAddRootElementToXml()); - double inputSizeMb = ((double) formatInputStream.getInputStream().available()) / 1024.0 / 1024.0; int intervalOfLogging = commandLineArgs.getVerbose() ? commandLineArgs.getWhenVerboseEnabledPrintMessageForEveryXDocuments() : Integer.MAX_VALUE; @@ -87,11 +86,14 @@ public class Runner { if (commandLineArgs.getVerbose()) { System.err.println(feedClient.getStatsAsJson()); double transferTimeSec = ((double) sendTotalTimeMs) / 1000.0; - System.err.println("Sent " + inputSizeMb + " MB in " + transferTimeSec + " seconds."); - System.err.println("Speed: " + ((inputSizeMb / transferTimeSec) * 8.0) + " Mbits/sec, + HTTP overhead " + - "(not taking compression into account)"); if (transferTimeSec > 0) { - System.err.printf("Docs/sec %.3f%n\n", numSent.get() / transferTimeSec); + System.err.printf("Docs/sec %.3f%n", numSent.get() / transferTimeSec); + } + if (commandLineArgs.getFile() != null) { + double fileSizeMb = ((double) new File(commandLineArgs.getFile()).length()) / 1024.0 / 1024.0; + System.err.println("Sent " + fileSizeMb + " MB in " + transferTimeSec + " seconds."); + System.err.println("Speed: " + ((fileSizeMb / transferTimeSec) * 8.0) + " Mbits/sec, + HTTP overhead " + + "(not taking compression into account)"); } } callback.printProgress(); -- cgit v1.2.3