Retrieve Searcher and Search from LRU Cache

kiwix · Oct 12, 2021 · e642d41 · e642d41
1 parent 4312297
commit e642d41
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
@@ -57,8 +57,6 @@ extern "C" {
 
 #include <zim/uuid.h>
 #include <zim/error.h>
-#include <zim/search.h>
-#include <zim/suggestion.h>
 #include <zim/entry.h>
 #include <zim/item.h>
 
@@ -79,6 +77,7 @@ extern "C" {
 
 #define MAX_SEARCH_LEN 140
 #define KIWIX_MIN_CONTENT_SIZE_TO_DEFLATE 100
+#define SEARCH_CACHE_SIZE 2
 
 namespace kiwix {
 
@@ -139,7 +138,13 @@ InternalServer::InternalServer(Library* library,
   m_blockExternalLinks(blockExternalLinks),
   mp_daemon(nullptr),
   mp_library(library),
-  mp_nameMapper(nameMapper ? nameMapper : &defaultNameMapper)
+  mp_nameMapper(nameMapper ? nameMapper : &defaultNameMapper),
+  searcherCache((std::getenv("SEARCHER_CACHE_SIZE") != NULL)
+                ? atoi(std::getenv("SEARCHER_CACHE_SIZE"))
+                : std::max(1, (int) (mp_library->getBookCount(true, true)*0.1))),
+  searchCache((std::getenv("SEARCH_CACHE_SIZE"))
+                ? atoi(std::getenv("SEARCH_CACHE_SIZE"))
+                : SEARCH_CACHE_SIZE)
 {}
 
 bool InternalServer::start() {
@@ -583,7 +588,12 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
 
   std::shared_ptr<zim::Searcher> searcher;
   if (archive) {
-    searcher = std::make_shared<zim::Searcher>(*archive);
+    if (searcherCache.exist(bookId)) {
+      searcher = searcherCache.get(bookId);
+    } else {
+      searcher = std::make_shared<zim::Searcher>(*archive);
+      searcherCache.put(bookId, searcher);
+    }
   } else {
     for (auto& bookId: mp_library->filter(kiwix::Filter().local(true).valid(true))) {
       auto currentArchive = mp_library->getArchiveById(bookId);
@@ -614,6 +624,7 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
   }
 
   /* Get the results */
+  std::string queryString;
   try {
     zim::Query query;
     if (patternString.empty()) {
@@ -623,20 +634,29 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
       }
 
       query.setQuery("");
+      queryString = to_string(latitude) + to_string(longitude) + to_string(distance);
       query.setGeorange(latitude, longitude, distance);
     } else {
       // Execute Ft search
       if (m_verbose.load()) {
           cout << "Performing query `" << patternString << "'" << endl;
       }
 
-      std::string queryString = removeAccents(patternString);
+      queryString = removeAccents(patternString);
       query.setQuery(queryString);
     }
+    queryString = bookId + queryString;
+
+    std::shared_ptr<zim::Search> search;
+    if (searchCache.exist(queryString)) {
+      search = searchCache.get(queryString);
+    } else {
+      search = make_shared<zim::Search>(searcher->search(query));
+      searchCache.put(queryString, search);
+    }
 
-    zim::Search search = searcher->search(query);
-    SearchRenderer renderer(search.getResults(start, pageLength), mp_nameMapper, start,
-                            search.getEstimatedMatches());
+    SearchRenderer renderer(search->getResults(start, pageLength), mp_nameMapper, start,
+                            search->getEstimatedMatches());
     renderer.setSearchPattern(patternString);
     renderer.setSearchContent(bookName);
     renderer.setProtocolPrefix(m_root + "/");

diff --git a/src/server/internalServer.h b/src/server/internalServer.h
@@ -28,6 +28,9 @@ extern "C" {
 #include "library.h"
 #include "name_mapper.h"
 
+#include <zim/search.h>
+#include <zim/suggestion.h>
+
 #include <mustache.hpp>
 
 #include <atomic>
@@ -36,6 +39,8 @@ extern "C" {
 #include "server/request_context.h"
 #include "server/response.h"
 
+#include "tools/cache.cpp"
+
 namespace kiwix {
 
 typedef kainjow::mustache::data MustacheData;
@@ -108,6 +113,9 @@ class InternalServer {
     Library* mp_library;
     NameMapper* mp_nameMapper;
 
+    LRUCache<string, std::shared_ptr<zim::Searcher>> searcherCache;
+    LRUCache<string, std::shared_ptr<zim::Search>> searchCache;
+
     std::string m_server_id;
     std::string m_library_id;