Merge branch 'an-reduce-repository-cache-adapter-calls' into 'master'

Improves the performance of the Redis set cache See merge request gitlab-org/gitlab!19125

Merge branch 'an-reduce-repository-cache-adapter-calls' into 'master'
Improves the performance of the Redis set cache See merge request gitlab-org/gitlab!19125
7cb4be36 · Stan Hu · 13113802 · 389e6f58 · 7cb4be36 · 7cb4be36
--- a/lib/gitlab/repository_cache_adapter.rb
+++ b/lib/gitlab/repository_cache_adapter.rb
@@ -58,11 +58,16 @@ def cache_method_as_redis_set(name, fallback: nil)
        # wrong answer. We handle that by querying the full list - which fills
        # the cache - and using it directly to answer the question.
        define_method("#{name}_include?") do |value|
-          if strong_memoized?(name) || !redis_set_cache.exist?(name)
-            return __send__(name).include?(value) # rubocop:disable GitlabSecurity/PublicSend
-          end
+          return __send__(name).include?(value) if strong_memoized?(name) # rubocop:disable GitlabSecurity/PublicSend
+
+          # If the member exists in the set, return as such early.
+          return true if redis_set_cache.include?(name, value)
+
+          # If it did not, make sure the collection exists.
+          # If the collection exists, then item does not.
+          return false if redis_set_cache.exist?(name)

-          redis_set_cache.include?(name, value)
+          __send__(name).include?(value) # rubocop:disable GitlabSecurity/PublicSend
        end
      end


--- a/lib/gitlab/repository_set_cache.rb
+++ b/lib/gitlab/repository_set_cache.rb
@@ -25,7 +25,7 @@ def exist?(key)
    end

    def read(key)
-      with { |redis| redis.smembers(cache_key(key)) }
+      with { |redis| redis.sscan_each(cache_key(key)).to_a }
    end

    def write(key, value)
@@ -47,11 +47,10 @@ def write(key, value)
    end

    def fetch(key, &block)
-      if exist?(key)
-        read(key)
-      else
-        write(key, yield)
-      end
+      result = read(key)
+      return result unless result.empty?
+
+      write(key, yield)
    end

    def include?(key, value)