From 8abed4bea512a4682ca715c900ed7fb4e27abf64 Mon Sep 17 00:00:00 2001 From: twerth Date: Thu, 5 Apr 2018 01:44:04 -0700 Subject: Make code much easier to read without misleading variable name and negation. RELNOTES: None PiperOrigin-RevId: 191709934 --- .../build/lib/query2/output/QueryOutputUtils.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/QueryOutputUtils.java b/src/main/java/com/google/devtools/build/lib/query2/output/QueryOutputUtils.java index d28b96a8ec..42687e2063 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/QueryOutputUtils.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/QueryOutputUtils.java @@ -42,17 +42,21 @@ public class QueryOutputUtils { * output everything in one batch. This happens when the QueryEnvironment does not * support streaming but we don't care about ordered results. */ - boolean orderedResults = !shouldStreamResults(queryOptions, formatter); - if (orderedResults) { - formatter.output(queryOptions, - ((DigraphQueryEvalResult) result).getGraph().extractSubgraph(targetsResult), - outputStream, aspectResolver); - } else { + if (shouldStreamResults(queryOptions, formatter)) { StreamedFormatter streamedFormatter = (StreamedFormatter) formatter; streamedFormatter.setOptions(queryOptions, aspectResolver); OutputFormatterCallback.processAllTargets( streamedFormatter.createPostFactoStreamCallback(outputStream, queryOptions), targetsResult); + } else { + @SuppressWarnings("unchecked") + DigraphQueryEvalResult digraphQueryEvalResult = + (DigraphQueryEvalResult) result; + formatter.output( + queryOptions, + digraphQueryEvalResult.getGraph().extractSubgraph(targetsResult), + outputStream, + aspectResolver); } } } -- cgit v1.2.3