From bce0f9b297da6064b92ad6f31ce756d92517cdfa Mon Sep 17 00:00:00 2001 From: ShaunakDas88 Date: Wed, 4 Oct 2023 17:20:18 -0700 Subject: [PATCH] style changes --- .../activityimpl/uniform/DiskStatsReader.java | 16 +++++++--------- .../api/activityimpl/uniform/MemInfoReader.java | 6 ++---- .../api/activityimpl/uniform/StatReader.java | 1 - 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/DiskStatsReader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/DiskStatsReader.java index 7a2b5fdc8..dff737129 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/DiskStatsReader.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/DiskStatsReader.java @@ -66,20 +66,18 @@ public class DiskStatsReader { int sectorSizeBytes = 512; String line; while ((line = reader.readLine()) != null) { - String[] fields = line.trim().split("\\s+"); - if (fields.length < 14) + String[] parts = line.trim().split("\\s+"); + if (parts.length < 14) continue; Map innerMap = new HashMap<>(); - String device = fields[2]; - Double readsCompleted = Double.parseDouble(fields[3]); - Double sectorsRead = Double.parseDouble(fields[5]); - Double writesCompleted = Double.parseDouble(fields[7]); - Double sectorsWritten = Double.parseDouble(fields[9]); - + String device = parts[2]; + Double readsCompleted = Double.parseDouble(parts[3]); + Double sectorsRead = Double.parseDouble(parts[5]); + Double writesCompleted = Double.parseDouble(parts[7]); + Double sectorsWritten = Double.parseDouble(parts[9]); Double transactions = readsCompleted + writesCompleted; Double kbRead = (sectorsRead * sectorSizeBytes) / 1024; Double kbWritten = (sectorsWritten * sectorSizeBytes) / 1024; - innerMap.put("transactions", transactions); innerMap.put("kB_read", kbRead); innerMap.put("kB_written", kbWritten); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/MemInfoReader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/MemInfoReader.java index 0d448813a..e1cfc1c08 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/MemInfoReader.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/MemInfoReader.java @@ -76,12 +76,10 @@ public class MemInfoReader { metricsMap.put(key, value); } } - if (metricsMap.get("MemTotal") != null && metricsMap.get("MemFree") != null) { + if (metricsMap.get("MemTotal") != null && metricsMap.get("MemFree") != null) metricsMap.put("MemUsed", metricsMap.get("MemTotal") - metricsMap.get("MemFree")); - } - if (metricsMap.get("SwapTotal") != null && metricsMap.get("SwapFree") != null) { + if (metricsMap.get("SwapTotal") != null && metricsMap.get("SwapFree") != null) metricsMap.put("SwapUsed", metricsMap.get("SwapTotal") - metricsMap.get("SwapFree")); - } } catch (FileNotFoundException e) { return; } diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StatReader.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StatReader.java index 630b42d9c..005bb01d9 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StatReader.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StatReader.java @@ -74,7 +74,6 @@ public class StatReader { Double irq = Double.parseDouble(parts[6]); Double softirq = Double.parseDouble(parts[7]); Double steal = Double.parseDouble(parts[8]); - Double total = user + nice + system + idle + iowait + irq + softirq + steal; metricsMap.put("user", user); metricsMap.put("system", system);