From 1d0570f9fbaa06d7d89d1ca0d06b92f25395c8bc Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 27 Sep 2019 17:46:17 +0000
Subject: GC some unused code related to fs4 protocol that has now gone
 missing.

---
 searchcore/src/vespa/searchcore/proton/matching/matcher.cpp | 2 --
 searchcore/src/vespa/searchcore/proton/server/proton.cpp    | 1 +
 searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
index fe7a7616c18..8e48135886f 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
@@ -214,8 +214,6 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl
                                                                metaStore, *feature_overrides);
         traceQuery(6, request.trace(), mtf->query());
         if (!mtf->valid()) {
-            reply->errorCode = ECODE_QUERY_PARSE_ERROR;
-            reply->errorMessage = "query execution failed (invalid query)";
             return reply;
         }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index cd1488890fd..a8f5cb32375 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -23,6 +23,7 @@
 #include <vespa/searchcore/proton/matchengine/matchengine.h>
 #include <vespa/searchlib/transactionlog/trans_log_server_explorer.h>
 #include <vespa/searchlib/util/fileheadertk.h>
+#include <vespa/searchlib/common/packets.h>
 #include <vespa/document/base/exceptions.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
index 78e3c5d3f3c..d8dc3d5f4db 100644
--- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
+++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h
@@ -7,7 +7,6 @@
 #include <vespa/vespalib/util/closure.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/searchlib/common/packets.h>
 #include <vespa/searchlib/engine/proto_rpc_adapter.h>
 #include <mutex>
 #include <condition_variable>
-- 
cgit v1.2.3