summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-03-03 11:59:42 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-03-03 11:59:42 +0100
commitf6dcdc30d077c5175c3e8989c8f6af4fbe1ce763 (patch)
tree50758583d5458cc2aa3a03167f99a7497db0e8b3 /container-search
parent0deed7df3810513799320dca1a2907a576b27637 (diff)
Revert "Don't add statistics property as trace level 0"
This reverts commit 640880aad9d5585c9d079717a1ae5ce03993fcce.
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java20
1 files changed, 9 insertions, 11 deletions
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index a84a1a545b6..e27893a2b20 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -1,6 +1,12 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.streamingvisitors;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
import com.yahoo.document.DocumentId;
import com.yahoo.document.idstring.IdString;
import com.yahoo.document.select.parser.ParseException;
@@ -17,9 +23,9 @@ import com.yahoo.prelude.fastsearch.FastHit;
import com.yahoo.prelude.fastsearch.GroupingListHit;
import com.yahoo.prelude.fastsearch.TimeoutException;
import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
-import com.yahoo.processing.request.CompoundName;
import com.yahoo.search.Query;
import com.yahoo.search.Result;
+import com.yahoo.processing.request.CompoundName;
import com.yahoo.search.result.ErrorMessage;
import com.yahoo.search.result.Relevance;
import com.yahoo.search.searchchain.Execution;
@@ -27,12 +33,6 @@ import com.yahoo.searchlib.aggregation.Grouping;
import com.yahoo.vdslib.DocumentSummary;
import com.yahoo.vdslib.SearchResult;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
/**
* The searcher which forwards queries to storage nodes using visiting.
* The searcher is a visitor client responsible for starting search
@@ -152,10 +152,8 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
summaryMap.size());
result.setTotalHitCount(visitor.getTotalHitCount());
-
- Execution.Trace traceChild = query.getContext(true).getTrace().createChild();
- traceChild.setTraceLevel(2);
- traceChild.setProperty(STREAMING_STATISTICS, visitor.getStatistics());
+ query.trace(visitor.getStatistics().toString(), false, 2);
+ query.getContext(true).setProperty(STREAMING_STATISTICS, visitor.getStatistics());
Packet[] summaryPackets = new Packet [hits.size()];