From a13e46d1c03a62068ebaa95676602495c5f30b3e Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Thu, 20 Jul 2023 11:51:06 -0400 Subject: [PATCH] this is probably a bad idea --- .../harvard/hms/dbmi/avillach/hpds/data/query/Query.java | 6 +++++- .../hms/dbmi/avillach/hpds/processing/QueryProcessor.java | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/Query.java b/client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/Query.java index 50c6a9c8..eb7ff4d7 100644 --- a/client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/Query.java +++ b/client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/Query.java @@ -4,9 +4,13 @@ import edu.harvard.hms.dbmi.avillach.hpds.data.query.Filter.DoubleFilter; import edu.harvard.hms.dbmi.avillach.hpds.data.query.Filter.FloatFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class Query { + private static final Logger log = LoggerFactory.getLogger(Query.class); + public Query() { } @@ -180,7 +184,7 @@ public String toString() { break; default: //no logic here; all enum values should be present above - System.out.println("Formatting not supported for type " + expectedResultType); + log.warn("Formatting not supported for type {}", expectedResultType); } writePartFormat("Required Fields", requiredFields, builder, false); diff --git a/processing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/QueryProcessor.java b/processing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/QueryProcessor.java index dcd5c1ac..c49a1902 100644 --- a/processing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/QueryProcessor.java +++ b/processing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/QueryProcessor.java @@ -56,9 +56,9 @@ public String[] getHeaderRow(Query query) { public void runQuery(Query query, AsyncResult result) { TreeSet idList = abstractProcessor.getPatientSubsetForQuery(query); log.info("Processing " + idList.size() + " rows for result " + result.id); - for(List list : Lists.partition(new ArrayList<>(idList), ID_BATCH_SIZE)){ - result.stream.appendResultStore(buildResult(result, query, new TreeSet(list))); - }; + Lists.partition(new ArrayList<>(idList), ID_BATCH_SIZE).parallelStream() + .map(list -> buildResult(result, query, new TreeSet(list))) + .forEach(result.stream::appendResultStore); }