diff options
author | Nathan Harmata <nharmata@google.com> | 2016-06-28 15:58:20 +0000 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2016-06-29 08:53:37 +0000 |
commit | 116c2f6724718fc408e0c73c9026d89281c75e87 (patch) | |
tree | e56d5c24e0548e95c4741987c1b57bd69297e3b0 /src/main/java/com/google/devtools | |
parent | 3cd00496502a335a958490be3308f39796d114ba (diff) |
Truncate the log line for transformed query expressions larger than 1000 chars.
--
MOS_MIGRATED_REVID=126079533
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java index 5f8749d0c3..834b69d410 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java @@ -120,6 +120,7 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> // TODO(janakr): Unify with RecursivePackageProviderBackedTargetPatternResolver's constant. private static final int BATCH_CALLBACK_SIZE = 10000; private static final int DEFAULT_THREAD_COUNT = Runtime.getRuntime().availableProcessors(); + private static final int MAX_QUERY_EXPRESSION_LOG_CHARS = 1000; private static final Logger LOG = Logger.getLogger(SkyQueryEnvironment.class.getName()); private static final Function<Target, Label> TARGET_LABEL_FUNCTION = new Function<Target, Label>() { @@ -230,6 +231,13 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> ExecutorUtil.interruptibleShutdown(threadPool); } + private static String getLogString(QueryExpression queryExpression) { + String queryExpressionString = queryExpression.toString(); + return queryExpressionString.length() <= MAX_QUERY_EXPRESSION_LOG_CHARS + ? queryExpressionString + : queryExpressionString.substring(0, MAX_QUERY_EXPRESSION_LOG_CHARS) + "...[truncated]"; + } + @Override public QueryExpression transformParsedQuery(QueryExpression queryExpression) { // Transform each occurrence of an expressions of the form 'rdeps(<universeScope>, <T>)' to @@ -261,8 +269,10 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> } }; QueryExpression transformedQueryExpression = queryExpression.getMapped(rdepsToAllRDepsMapper); - LOG.info(String.format("transformed query [%s] to [%s]", queryExpression, - transformedQueryExpression)); + LOG.info(String.format( + "transformed query [%s] to [%s]", + getLogString(queryExpression), + getLogString(transformedQueryExpression))); return transformedQueryExpression; } |