GC current exception based error handling.

2 files changed, 2 insertions, 15 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index cbe697fa426..e8c3ac885ea 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -763,14 +763,8 @@ DocumentDB::getNewestFlushedSerial()
 std::unique_ptr<SearchReply>
 DocumentDB::match(const SearchRequest &req, vespalib::ThreadBundle &threadBundle) const
 {
-    // Ignore input searchhandler. Use readysubdb's searchhandler instead.
     ISearchHandler::SP view(_subDBs.getReadySubDB()->getSearchView());
-    try {
-        return view->match(req, threadBundle);
-    } catch (const std::exception & e) {
-        LOG(warning, "match failed for document type '%s' with exception: %s", getName().c_str(), e.what());
-        throw e;
-    }
+    return view->match(req, threadBundle);
 }
 
 std::unique_ptr<DocsumReply>
diff --git a/searchcore/src/vespa/searchcore/proton/server/matchview.cpp b/searchcore/src/vespa/searchcore/proton/server/matchview.cpp
index 53cc3e27d6c..768e2c80b62 100644
--- a/searchcore/src/vespa/searchcore/proton/server/matchview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/matchview.cpp
@@ -52,14 +52,7 @@ MatchView::~MatchView() = default;
 Matcher::SP
 MatchView::getMatcher(const vespalib::string & rankProfile) const
 {
-    Matcher::SP retval = _matchers->lookup(rankProfile);
-    if ( ! retval) {
-        throw IllegalArgumentException(fmt("Failed locating Matcher for rank profile '%s' docIdLimit=%d num_matchers=%d matchers='%s'",
-                                           rankProfile.c_str(), _docIdLimit.get(), _matchers->numMatchers(), _matchers->listMatchers().c_str()),
-                                       VESPA_STRLOC);
-    }
-    LOG(debug, "Rankprofile = %s has termwise_limit=%f", rankProfile.c_str(), retval->get_termwise_limit());
-    return retval;
+    return _matchers->lookup(rankProfile);
 }
 
 MatchContext::UP