From 04b029e1be042d92f6be6659900261902f453b5b Mon Sep 17 00:00:00 2001
From: ahr <ahr@ahr.local>
Date: Sat, 16 Dec 2017 19:19:12 +0100
Subject: [PATCH] add trace logging

---
 .../org/lucares/pdb/datastore/internal/DataStore.java |  1 +
 .../main/java/org/lucares/recommind/logs/Plotter.java | 10 ++++++----
 .../main/java/org/lucares/performance/db/Group.java   |  5 +++++
 .../java/org/lucares/performance/db/Grouping.java     | 11 ++++++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java
index f1414bb..9384d24 100644
--- a/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DataStore.java
@@ -182,6 +182,7 @@ public class DataStore {
 	public List<Doc> search(final String query) {
 
 		final IntList docIdsList = executeQuery(query);
+		LOGGER.trace("query {} found {} docs", query, docIdsList.size());
 		final List<Doc> result = mapDocIdsToDocs(docIdsList);
 		return result;
 	}
diff --git a/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java b/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java
index 3b9c3d7..d9ac3a2 100644
--- a/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java
+++ b/pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
 import org.lucares.pdb.api.Entry;
+import org.lucares.pdb.api.GroupResult;
 import org.lucares.pdb.api.Result;
 import org.lucares.pdb.api.Tags;
 import org.lucares.pdb.plot.api.CustomAggregator;
@@ -96,9 +97,9 @@ public class Plotter {
 			final AtomicInteger idCounter = new AtomicInteger(0);
 			result.getGroups().stream().parallel().forEach(groupResult -> {
 				try{
-					final Stream<Entry> entries = groupResult.asStream();
+					
 	
-					final CsvSummary csvSummary = toCsv(entries, tmpDir, dateFrom, dateTo, plotSettings);
+					final CsvSummary csvSummary = toCsv(groupResult, tmpDir, dateFrom, dateTo, plotSettings);
 	
 					final int id = idCounter.getAndIncrement();
 					final String title = title(groupResult.getGroupedBy(), csvSummary.getValues());
@@ -232,11 +233,12 @@ public class Plotter {
 
 	}
 
-	private static CsvSummary toCsv(final Stream<Entry> entries, final Path tmpDir, final OffsetDateTime dateFrom,
+	private static CsvSummary toCsv(final GroupResult groupResult, final Path tmpDir, final OffsetDateTime dateFrom,
 			final OffsetDateTime dateTo, PlotSettings plotSettings) throws IOException {
 
 		final File dataFile = File.createTempFile("data", ".dat", tmpDir.toFile());
 		final long start = System.nanoTime();
+		final Stream<Entry> entries = groupResult.asStream();
 		int count = 0;
 		final long fromEpochMilli = dateFrom.toInstant().toEpochMilli();
 		final long toEpochMilli = dateTo.toInstant().toEpochMilli();
@@ -285,7 +287,7 @@ public class Plotter {
 			}
 		}
 
-		METRICS_LOGGER.debug("wrote {} values to csv in: {}ms (ignored {} values) use millis: {}", count, (System.nanoTime() - start) / 1_000_000.0, ignoredValues, Boolean.toString(useMillis));
+		METRICS_LOGGER.debug("wrote {} values to csv in: {}ms (ignored {} values) use millis: {}, grouping={}, file={}", count, (System.nanoTime() - start) / 1_000_000.0, ignoredValues, Boolean.toString(useMillis), groupResult.getGroupedBy(),dataFile);
 		return new CsvSummary(dataFile, count,  maxValue, aggregator.getAggregatedData());
 	}
 	
diff --git a/performanceDb/src/main/java/org/lucares/performance/db/Group.java b/performanceDb/src/main/java/org/lucares/performance/db/Group.java
index 3aedd72..22a29cb 100644
--- a/performanceDb/src/main/java/org/lucares/performance/db/Group.java
+++ b/performanceDb/src/main/java/org/lucares/performance/db/Group.java
@@ -26,4 +26,9 @@ class Group {
 	public void addFile(final PdbFile file) {
 		files.add(file);
 	}
+	
+	@Override
+	public String toString() {
+		return tags + ": " + files.size()+" files";
+	}
 }
diff --git a/performanceDb/src/main/java/org/lucares/performance/db/Grouping.java b/performanceDb/src/main/java/org/lucares/performance/db/Grouping.java
index 9d380e3..49e9396 100644
--- a/performanceDb/src/main/java/org/lucares/performance/db/Grouping.java
+++ b/performanceDb/src/main/java/org/lucares/performance/db/Grouping.java
@@ -8,9 +8,12 @@ import java.util.List;
 import java.util.Map;
 
 import org.lucares.pdb.api.Tags;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Grouping {
-
+	private static final Logger LOGGER = LoggerFactory.getLogger(Grouping.class);
+	
 	public static final List<String> NO_GROUPING = Collections.emptyList();
 
 	private final List<Group> groups = new ArrayList<>();
@@ -42,6 +45,7 @@ public class Grouping {
 			}
 			result = new Grouping(grouping.values());
 		}
+		LOGGER.trace("grouped {} files by {}: {}", pdbFiles.size(), groupByField, result);
 		return result;
 	}
 
@@ -60,4 +64,9 @@ public class Grouping {
 	public Collection<Group> getGroups() {
 		return groups;
 	}
+	
+	@Override
+	public String toString() {
+		return String.valueOf(groups);
+	}
 }