summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2017-02-08 11:52:56 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2017-02-08 11:52:56 +0000
commitc9c8bbe459a42e6a0930d98571045a8a5b7f0a11 (patch)
treefd7231f8850514e87c532c19de9ee79f69b3d34d /searchcore
parent1d2fda3acf3035d628aa71bcb82bbcb88f09d5ad (diff)
Garbage collect unused proxy.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt1
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.cpp32
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.h24
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp1
4 files changed, 0 insertions, 58 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
index afcbffb28e8..afe6b392717 100644
--- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
@@ -58,7 +58,6 @@ vespa_add_library(searchcore_server STATIC
maintenancecontroller.cpp
maintenancejobrunner.cpp
matchers.cpp
- matchhandlerproxy.cpp
matchview.cpp
memoryconfigstore.cpp
memory_flush_config_updater.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.cpp
deleted file mode 100644
index 4140cdbc441..00000000000
--- a/searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/fastos/fastos.h>
-#include "matchhandlerproxy.h"
-#include "documentdb.h"
-#include <vespa/searchlib/engine/searchreply.h>
-
-namespace proton {
-
-MatchHandlerProxy::MatchHandlerProxy(const DocumentDB::SP &documentDB)
- : _documentDB(documentDB)
-{
- _documentDB->retain();
-}
-
-
-MatchHandlerProxy::~MatchHandlerProxy(void)
-{
- _documentDB->release();
-}
-
-
-std::unique_ptr<search::engine::SearchReply>
-MatchHandlerProxy::match(const ISearchHandler::SP &searchHandler,
- const search::engine::SearchRequest &req,
- vespalib::ThreadBundle &threadBundle) const
-{
- return _documentDB->match(searchHandler, req, threadBundle);
-}
-
-
-} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.h b/searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.h
deleted file mode 100644
index 94474cdda5a..00000000000
--- a/searchcore/src/vespa/searchcore/proton/server/matchhandlerproxy.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#pragma once
-
-#include <vespa/searchcore/proton/matchengine/imatchhandler.h>
-
-namespace proton {
-
-class DocumentDB;
-
-class MatchHandlerProxy : public IMatchHandler
-{
-private:
- std::shared_ptr<DocumentDB> _documentDB;
-public:
- MatchHandlerProxy(const std::shared_ptr<DocumentDB> &documentDB);
- virtual~MatchHandlerProxy();
-
- std::unique_ptr<SearchReply>
- match(const ISearchHandler::SP &searchHandler, const SearchRequest &req, ThreadBundle &threadBundle) const override;
-};
-
-} // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 17d83cc8324..2e8005b5c23 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -4,7 +4,6 @@
#include "disk_mem_usage_sampler.h"
#include "document_db_explorer.h"
#include "flushhandlerproxy.h"
-#include "matchhandlerproxy.h"
#include "memoryflush.h"
#include "persistencehandlerproxy.h"
#include "persistenceproviderproxy.h"