Move common sessionid to common Request parent.

6 files changed, 4 insertions, 6 deletions

diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp b/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp
index 00c190220ab..4a716557d87 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp
+++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp
@@ -13,7 +13,6 @@ DocsumRequest::DocsumRequest(RelativeTime relativeTime)
     : Request(std::move(relativeTime)),
       resultClassName(),
       hits(),
-      sessionId(),
       _fields()
 {
 }
diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.h b/searchlib/src/vespa/searchlib/engine/docsumrequest.h
index 403b8e047f4..447bb390816 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumrequest.h
+++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.h
@@ -28,7 +28,6 @@ public:
 
     vespalib::string  resultClassName;
     std::vector<Hit>  hits;
-    std::vector<char> sessionId;
 
     DocsumRequest();
     explicit DocsumRequest(RelativeTime relativeTime);
diff --git a/searchlib/src/vespa/searchlib/engine/request.cpp b/searchlib/src/vespa/searchlib/engine/request.cpp
index 89860a0e87c..b58b2110bdc 100644
--- a/searchlib/src/vespa/searchlib/engine/request.cpp
+++ b/searchlib/src/vespa/searchlib/engine/request.cpp
@@ -16,6 +16,7 @@ Request::Request(RelativeTime relativeTime, uint32_t reservePropMaps)
       location(),
       propertiesMap(reservePropMaps),
       stackDump(),
+      sessionId(),
       _trace(_relativeTime, 0)
 {
 }
diff --git a/searchlib/src/vespa/searchlib/engine/request.h b/searchlib/src/vespa/searchlib/engine/request.h
index eb428246d00..31eb5c8683f 100644
--- a/searchlib/src/vespa/searchlib/engine/request.h
+++ b/searchlib/src/vespa/searchlib/engine/request.h
@@ -23,7 +23,7 @@ public:
     vespalib::duration getTimeLeft() const;
     bool expired() const { return getTimeLeft() <= vespalib::duration::zero(); }
 
-    const vespalib::stringref getStackRef() const {
+    vespalib::stringref getStackRef() const {
         return vespalib::stringref(stackDump.data(), stackDump.size());
     }
 
@@ -43,6 +43,7 @@ public:
     vespalib::string   location;
     PropertiesMap      propertiesMap;
     std::vector<char>  stackDump;
+    std::vector<char>  sessionId;
 private:
     mutable Trace      _trace;
 };
diff --git a/searchlib/src/vespa/searchlib/engine/searchrequest.cpp b/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
index ad1a6e8cde5..c7a3ffc9380 100644
--- a/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
+++ b/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
@@ -12,8 +12,7 @@ SearchRequest::SearchRequest(RelativeTime relativeTime)
       offset(0),
       maxhits(10),
       sortSpec(),
-      groupSpec(),
-      sessionId()
+      groupSpec()
 {
 }
 
diff --git a/searchlib/src/vespa/searchlib/engine/searchrequest.h b/searchlib/src/vespa/searchlib/engine/searchrequest.h
index 158df4a3dd4..d6807806cd5 100644
--- a/searchlib/src/vespa/searchlib/engine/searchrequest.h
+++ b/searchlib/src/vespa/searchlib/engine/searchrequest.h
@@ -19,7 +19,6 @@ public:
     uint32_t          maxhits;
     vespalib::string  sortSpec;
     std::vector<char> groupSpec;
-    std::vector<char> sessionId;
 
     SearchRequest();
     explicit SearchRequest(RelativeTime relativeTime);