diff options
author | Arnstein Ressem <aressem@gmail.com> | 2017-03-01 21:30:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 21:30:10 +0100 |
commit | f54fab309823c56de15f477bde39a84eb0a4e378 (patch) | |
tree | b4b58eacf3e8de90b1172a4754853c4a81346964 /container-search | |
parent | d37abf742d3fa48ad564ab72689c91a1a1c81209 (diff) |
Revert "Store streaming stats in query instead of query context"
Diffstat (limited to 'container-search')
3 files changed, 14 insertions, 10 deletions
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java index ad42d560b94..3d795674039 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java @@ -2,12 +2,13 @@ package com.yahoo.vespa.streamingvisitors; import com.yahoo.log.event.Event; -import com.yahoo.processing.request.CompoundName; +import com.yahoo.search.query.context.QueryContext; +import com.yahoo.search.result.ErrorMessage; +import com.yahoo.search.searchchain.Execution; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.result.ErrorMessage; -import com.yahoo.search.searchchain.Execution; +import com.yahoo.processing.request.CompoundName; import com.yahoo.vdslib.VisitorStatistics; import java.util.Map; @@ -76,7 +77,11 @@ public class MetricsSearcher extends Searcher { stats.ok++; } - VisitorStatistics visitorstats = (VisitorStatistics) query.properties().get(STREAMING_STATISTICS); + VisitorStatistics visitorstats = null; + final QueryContext queryContext = query.getContext(false); + if (queryContext != null) { + visitorstats = (VisitorStatistics)queryContext.getProperty(STREAMING_STATISTICS); + } if (visitorstats != null) { stats.dataStreamed += visitorstats.getBytesVisited(); stats.documentsStreamed += visitorstats.getDocumentsVisited(); 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 56de88fa843..a84a1a545b6 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 @@ -26,7 +26,6 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.searchlib.aggregation.Grouping; import com.yahoo.vdslib.DocumentSummary; import com.yahoo.vdslib.SearchResult; -import com.yahoo.vdslib.VisitorStatistics; import java.io.IOException; import java.math.BigInteger; @@ -154,9 +153,9 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { result.setTotalHitCount(visitor.getTotalHitCount()); - VisitorStatistics statistics = visitor.getStatistics(); - query.trace(statistics.toString(), false, 2); - query.properties().set(STREAMING_STATISTICS, statistics); + Execution.Trace traceChild = query.getContext(true).getTrace().createChild(); + traceChild.setTraceLevel(2); + traceChild.setProperty(STREAMING_STATISTICS, visitor.getStatistics()); Packet[] summaryPackets = new Packet [hits.size()]; diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java index fab132c78b3..1fe62c2cd35 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java @@ -132,9 +132,9 @@ public class MetricsSearcherTestCase { private void assignContextProperties(Query query, String loadType) { if (loadType != null && loadType.equals(LOADTYPE1)) { - query.properties().set(VdsStreamingSearcher.STREAMING_STATISTICS, visitorStats); + query.getContext(true).setProperty(VdsStreamingSearcher.STREAMING_STATISTICS, visitorStats); } else { - query.properties().set(VdsStreamingSearcher.STREAMING_STATISTICS, null); + query.getContext(true).setProperty(VdsStreamingSearcher.STREAMING_STATISTICS, null); } } } |