Merge the same QuadTree requests (#1197)

Merge the same quadtree requests during concurrent GetTile and
PrefetchTiles API requests. Later this approach will be replaced
with merging inside OlpClient.

Additionally, take version into account when merging the requests.

Resolves: OLPSUP-13676

Signed-off-by: Mykhailo Kuchma <[email protected]>

Author: mykhailo-kuchma

olp-cpp-sdk-dataservice-read/src/repositories/PartitionsRepository.cpp

@@ -172,7 +172,8 @@ PartitionsRepository::GetPartitionsExtendedResponse(
   // OlpClient could handle that.
   const auto detail =
       partition_ids.empty() ? "" : HashPartitions(partition_ids);
-  NamedMutex mutex(catalog_str + layer_id_ + detail);
+  const auto version_str = version ? std::to_string(*version) : "";
+  NamedMutex mutex(catalog_str + layer_id_ + version_str + detail);
   std::unique_lock<NamedMutex> lock(mutex, std::defer_lock);
 
   // If we are not planning to go online or access the cache, do not lock.
@@ -349,7 +350,10 @@ QuadTreeIndexResponse PartitionsRepository::GetQuadTreeIndexForTile(
   const auto& root_tile_key = tile_key.ChangedLevelBy(-kAggregateQuadTreeDepth);
   const auto root_tile_here = root_tile_key.ToHereTile();
 
-  NamedMutex mutex(catalog_.ToString() + layer_id_ + root_tile_here + "Index");
+  const auto quad_cache_key =
+      cache_.CreateQuadKey(root_tile_key, kAggregateQuadTreeDepth, version);
+
+  NamedMutex mutex(quad_cache_key);
   std::unique_lock<NamedMutex> lock(mutex, std::defer_lock);
 
   // If we are not planning to go online or access the cache, do not lock.

olp-cpp-sdk-dataservice-read/src/repositories/PrefetchTilesRepository.cpp

@@ -32,6 +32,7 @@
 #include <olp/core/thread/Atomic.h>
 #include <olp/core/thread/TaskScheduler.h>
 #include "ExtendedApiResponseHelpers.h"
+#include "NamedMutex.h"
 #include "PartitionsRepository.h"
 #include "QuadTreeIndex.h"
 #include "generated/api/QueryApi.h"
@@ -63,6 +64,7 @@ PrefetchTilesRepository::PrefetchTilesRepository(
     client::OlpClientSettings settings, client::ApiLookupClient client,
     boost::optional<std::string> billing_tag)
     : catalog_(std::move(catalog)),
+      catalog_str_(catalog_.ToString()),
       layer_id_(layer_id),
       settings_(std::move(settings)),
       lookup_client_(std::move(client)),
@@ -195,6 +197,12 @@ client::NetworkStatistics PrefetchTilesRepository::LoadAggregatedSubQuads(
     while (root.Level() > aggregated_tile_key.Level()) {
       root = root.ChangedLevelBy(-kMaxQuadTreeIndexDepth - 1);
 
+      const auto quad_cache_key = cache_repository_.CreateQuadKey(
+          root, kMaxQuadTreeIndexDepth, version);
+
+      NamedMutex mutex(quad_cache_key);
+      std::unique_lock<NamedMutex> lock(mutex);
+
       if (!cache_repository_.ContainsTree(root, kMaxQuadTreeIndexDepth,
                                           version)) {
         QuadTreeResponse response = DownloadVersionedQuadTree(
@@ -217,6 +225,12 @@ SubQuadsResponse PrefetchTilesRepository::GetVersionedSubQuads(
   QuadTreeIndex quad_tree;
   client::NetworkStatistics network_stats;
 
+  const auto quad_cache_key =
+      cache_repository_.CreateQuadKey(tile, kMaxQuadTreeIndexDepth, version);
+
+  NamedMutex mutex(quad_cache_key);
+  std::unique_lock<NamedMutex> lock(mutex);
+
   if (cache_repository_.Get(tile, depth, version, quad_tree)) {
     OLP_SDK_LOG_DEBUG_F(kLogTag,
                         "GetSubQuads found in cache, tile='%s', "

olp-cpp-sdk-dataservice-read/src/repositories/PrefetchTilesRepository.h

@@ -122,8 +122,9 @@ class PrefetchTilesRepository {
       client::CancellationContext context);
 
  private:
-  client::HRN catalog_;
-  std::string layer_id_;
+  const client::HRN catalog_;
+  const std::string catalog_str_;
+  const std::string layer_id_;
   client::OlpClientSettings settings_;
   client::ApiLookupClient lookup_client_;
   PartitionsCacheRepository cache_repository_;