diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-27 17:46:17 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-27 17:46:17 +0000 |
| commit | 1d0570f9fbaa06d7d89d1ca0d06b92f25395c8bc (patch) | |
| tree | a62e7a5bfb6a184bd297d2f4e471edcd5f63d8fc /searchcore | |
| parent | 8aead1fd3a4cee143ba1c915c7180255fbd0446b (diff) | |
GC some unused code related to fs4 protocol that has now gone missing.
Diffstat (limited to 'searchcore')
3 files changed, 1 insertions, 3 deletions
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> |