Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 26 insertions, 4 deletions

diff --git a/lib/gitlab/repository_set_cache.rb b/lib/gitlab/repository_set_cache.rb
index 69c1688767c..f73ac628bce 100644
--- a/lib/gitlab/repository_set_cache.rb
+++ b/lib/gitlab/repository_set_cache.rb
@@ -36,10 +36,32 @@ module Gitlab
     end
 
     def fetch(key, &block)
-      if exist?(key)
-        read(key)
-      else
-        write(key, yield)
+      full_key = cache_key(key)
+
+      smembers, exists = with do |redis|
+        redis.multi do
+          redis.smembers(full_key)
+          redis.exists(full_key)
+        end
+      end
+
+      return smembers if exists
+
+      write(key, yield)
+    end
+
+    # Searches the cache set using SSCAN with the MATCH option. The MATCH
+    # parameter is the pattern argument.
+    # See https://redis.io/commands/scan#the-match-option for more information.
+    # Returns an Enumerator that enumerates all SSCAN hits.
+    def search(key, pattern, &block)
+      full_key = cache_key(key)
+
+      with do |redis|
+        exists = redis.exists(full_key)
+        write(key, yield) unless exists
+
+        redis.sscan_each(full_key, match: pattern)
       end
     end
   end