Test basic query execution in search visitor.

1 files changed, 8 insertions, 1 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 8980bc1f54d..105196a3249 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -238,7 +238,7 @@ void SearchVisitor::GroupingEntry::aggregate(const document::Document & doc, sea
 }
 
 SearchVisitor::~SearchVisitor() {
-    if (! isCompletedCalled()) {
+    if (!isCompletedCalled() && _queryResult) {
         HitCounter hc;
         completedVisitingInternal(hc);
     }
@@ -1126,6 +1126,13 @@ void SearchVisitor::completedBucket(const document::BucketId&, HitCounter&)
     LOG(debug, "Completed bucket");
 }
 
+std::unique_ptr<documentapi::QueryResultMessage>
+SearchVisitor::generate_query_result(HitCounter& counter)
+{
+    completedVisitingInternal(counter);
+    return std::move(_queryResult);
+}
+
 void SearchVisitor::completedVisitingInternal(HitCounter& hitCounter)
 {
     if (_vsmAdapter == nullptr) {