redis-memo 0.0.0.beta.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8d075c12b20782f27bdfe2488cba1c0f31f5fb537241a9cedcc72f484588b9
-  data.tar.gz: 0eef678b83746557ba84aca013e660ecc31a028042cf052606673179e185d61e
+  metadata.gz: c1f9810ab293851487a23911835eb644ce4401df360404a04236898b99e1ab64
+  data.tar.gz: edbd814f8e8c027207123340445f121e771e30260e7126fb91665a23139fd710
 SHA512:
-  metadata.gz: a8f573eb77832f3dfb0600ab607c8d60090969082c86a9403a98b784899931da60d66f1b761bf863fd4007492ff47dee2d7880ec2f10cf5143fce33bc791684b
-  data.tar.gz: 4f9e44c13d2b4918f69f143f78eb4d80ad306b43abb650c03c481d727a88938f70c3ef89854e5c67afe92cc656df82ff44df84bb07878904bcdfbb2b86c15275
+  metadata.gz: 2a07892d98f25a3690ee254015be04f0164053be755fcce73478598ba65e28a39a4e99b47d18b12f1ec6e89facfba06e9d1b8390dab61ac3713e291f4451b782
+  data.tar.gz: 47f5e0d42b7957d6422277f01446b6659f8526371e556957626a68c44635d1ba456380152d48f3682959cbd84f4d2adf333a50697be386f554b000b4edf67d1f

data/lib/redis_memo.rb

@@ -97,4 +97,5 @@ module RedisMemo
   # @todo Move errors to a separate file errors.rb
   class ArgumentError < ::ArgumentError; end
   class RuntimeError < ::RuntimeError; end
+  class WithoutMemoization < Exception; end
 end

data/lib/redis_memo/cache.rb

@@ -1,6 +1,7 @@
  # frozen_string_literal: true
 require_relative 'options'
 require_relative 'redis'
+require_relative 'connection_pool'
 
 class RedisMemo::Cache < ActiveSupport::Cache::RedisCacheStore
   class Rescuable < Exception; end
@@ -24,7 +25,12 @@ class RedisMemo::Cache < ActiveSupport::Cache::RedisCacheStore
   end
 
   def self.redis
-    @@redis ||= RedisMemo::DefaultOptions.redis
+    @@redis ||=
+      if RedisMemo::DefaultOptions.connection_pool
+        RedisMemo::ConnectionPool.new(**RedisMemo::DefaultOptions.connection_pool)
+      else
+        RedisMemo::DefaultOptions.redis
+      end
   end
 
   def self.redis_store
@@ -60,7 +66,7 @@ class RedisMemo::Cache < ActiveSupport::Cache::RedisCacheStore
     end
 
     # RedisCacheStore doesn't read from the local cache before reading from redis
-    def read_multi(*keys, raise_error: false)
+    def read_multi(*keys, raw: false, raise_error: false)
       return {} if keys.empty?
 
       Thread.current[THREAD_KEY_RAISE_ERROR] = raise_error
@@ -71,7 +77,7 @@ class RedisMemo::Cache < ActiveSupport::Cache::RedisCacheStore
       keys_to_fetch -= local_entries.keys unless local_entries.empty?
       return local_entries if keys_to_fetch.empty?
 
-      remote_entries = redis_store.read_multi(*keys_to_fetch)
+      remote_entries = redis_store.read_multi(*keys_to_fetch, raw: raw)
       local_cache&.merge!(remote_entries)
 
       if local_entries.empty?

data/lib/redis_memo/connection_pool.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'connection_pool'
+require_relative 'redis'
+
+class RedisMemo::ConnectionPool
+  def initialize(**options)
+    @connection_pool = ::ConnectionPool.new(**options) do
+      # Construct a new client every time the block gets called
+      RedisMemo::Redis.new(RedisMemo::DefaultOptions.redis_config)
+    end
+  end
+
+  # Avoid method_missing when possible for better performance
+  %i(get mget mapped_mget set eval).each do |method_name|
+    define_method method_name do |*args, &blk|
+      @connection_pool.with do |redis|
+        redis.send(method_name, *args, &blk)
+      end
+    end
+  end
+
+  def method_missing(method_name, *args, &blk)
+    @connection_pool.with do |redis|
+      redis.send(method_name, *args, &blk)
+    end
+  end
+end

data/lib/redis_memo/future.rb

@@ -9,14 +9,14 @@ class RedisMemo::Future
     ref,
     method_id,
     method_args,
-    depends_on,
+    dependent_memos,
     cache_options,
     method_name_without_memo
   )
     @ref = ref
     @method_id = method_id
     @method_args = method_args
-    @depends_on = depends_on
+    @dependent_memos = dependent_memos
     @cache_options = cache_options
     @method_name_without_memo = method_name_without_memo
     @method_cache_key = nil
@@ -28,7 +28,7 @@ class RedisMemo::Future
   end
 
   def context
-    [@ref, @method_id, @method_args, @depends_on]
+    [@method_id, @method_args, @dependent_memos]
   end
 
   def method_cache_key

data/lib/redis_memo/memoizable.rb

@@ -82,7 +82,11 @@ class RedisMemo::Memoizable
       if keys_to_fetch.empty?
         {}
       else
-        RedisMemo::Cache.read_multi(*keys_to_fetch, raise_error: true)
+        RedisMemo::Cache.read_multi(
+          *keys_to_fetch,
+          raw: true,
+          raise_error: true,
+        )
       end
     memo_versions.merge!(cached_versions) unless cached_versions.empty?
 

data/lib/redis_memo/memoizable/dependency.rb

@@ -26,14 +26,18 @@ class RedisMemo::Memoizable::Dependency
         instance_exec(&memo.depends_on)
       end
     when ActiveRecord::Relation
-      extracted = extract_dependencies_for_relation(dependency)
+      extracted = self.class.extract_from_relation(dependency)
       nodes.merge!(extracted.nodes)
-    when UsingActiveRecord
-      [
-        dependency.redis_memo_class_memoizable,
-        RedisMemo::MemoizeQuery.create_memo(dependency, **conditions),
-      ].each do |memo|
+    when RedisMemo::MemoizeQuery::CachedSelect::BindParams
+      # A private API
+      dependency.params.each do |model, attrs_set|
+        memo = model.redis_memo_class_memoizable
         nodes[memo.cache_key] = memo
+
+        attrs_set.each do |attrs|
+          memo = RedisMemo::MemoizeQuery.create_memo(model, **attrs)
+          nodes[memo.cache_key] = memo
+        end
       end
     else
       raise(
@@ -43,24 +47,21 @@ class RedisMemo::Memoizable::Dependency
     end
   end
 
-  def extract_dependencies_for_relation(relation)
+  private
+
+  def self.extract_from_relation(relation)
     # Extract the dependent memos of an Arel without calling exec_query to actually execute the query
     RedisMemo::MemoizeQuery::CachedSelect.with_new_query_context do
       connection = ActiveRecord::Base.connection
       query, binds, _ = connection.send(:to_sql_and_binds, relation.arel)
       RedisMemo::MemoizeQuery::CachedSelect.current_query = relation.arel
       is_query_cached = RedisMemo::MemoizeQuery::CachedSelect.extract_bind_params(query)
-        raise(
-          RedisMemo::ArgumentError,
-          "Invalid Arel dependency. Query is not enabled for RedisMemo caching."
-        ) unless is_query_cached
-        extracted_dependency = connection.dependency_of(:exec_query, query, nil, binds)
-    end
-  end
 
-  class UsingActiveRecord
-    def self.===(dependency)
-      RedisMemo::MemoizeQuery.using_active_record?(dependency)
+      unless is_query_cached
+        raise RedisMemo::WithoutMemoization, 'Arel query is not cached using RedisMemo'
+      end
+
+      connection.dependency_of(:exec_query, query, nil, binds)
     end
   end
 end

data/lib/redis_memo/memoizable/invalidation.rb

@@ -56,7 +56,10 @@ module RedisMemo::Memoizable::Invalidation
       # Fill an expected previous version so the later calculation results
       # based on this version can still be rolled out if this version
       # does not change
-      previous_version ||= RedisMemo::Cache.read_multi(key)[key]
+      previous_version ||= RedisMemo::Cache.read_multi(
+        key,
+        raw: true,
+      )[key]
     end
 
     local_cache&.send(:[]=, key, version)
@@ -123,7 +126,8 @@ module RedisMemo::Memoizable::Invalidation
       task = @@invalidation_queue.pop
       begin
         bump_version(task)
-      rescue SignalException, Redis::BaseConnectionError
+      rescue SignalException, Redis::BaseConnectionError,
+             ::ConnectionPool::TimeoutError
         retry_queue << task
       end
     end

data/lib/redis_memo/memoize_method.rb

@@ -15,6 +15,12 @@ module RedisMemo::MemoizeMethod
     define_method method_name_with_memo do |*args|
       return send(method_name_without_memo, *args) if RedisMemo.without_memo?
 
+      dependent_memos = nil
+      if depends_on
+        dependency = RedisMemo::MemoizeMethod.get_or_extract_dependencies(self, *args, &depends_on)
+        dependent_memos = dependency.memos
+      end
+
       future = RedisMemo::Future.new(
         self,
         case method_id
@@ -26,7 +32,7 @@ module RedisMemo::MemoizeMethod
           method_id.call(self, *args)
         end,
         args,
-        depends_on,
+        dependent_memos,
         options,
         method_name_without_memo,
       )
@@ -37,6 +43,8 @@ module RedisMemo::MemoizeMethod
       end
 
       future.execute
+    rescue RedisMemo::WithoutMemoization
+      send(method_name_without_memo, *args)
     end
 
     alias_method method_name, method_name_with_memo
@@ -73,27 +81,98 @@ module RedisMemo::MemoizeMethod
 
   def self.get_or_extract_dependencies(ref, *method_args, &depends_on)
     if RedisMemo::Cache.local_dependency_cache
-      RedisMemo::Cache.local_dependency_cache[ref] ||= {}
-      RedisMemo::Cache.local_dependency_cache[ref][depends_on] ||= {}
-      RedisMemo::Cache.local_dependency_cache[ref][depends_on][method_args] ||= extract_dependencies(ref, *method_args, &depends_on)
+      RedisMemo::Cache.local_dependency_cache[ref.class] ||= {}
+      RedisMemo::Cache.local_dependency_cache[ref.class][depends_on] ||= {}
+      named_args = exclude_anonymous_args(depends_on, ref, method_args)
+      RedisMemo::Cache.local_dependency_cache[ref.class][depends_on][named_args] ||= extract_dependencies(ref, *method_args, &depends_on)
     else
       extract_dependencies(ref, *method_args, &depends_on)
     end
   end
 
+  # We only look at named method parameters in the dependency block in order to define its dependent
+  # memos and ignore anonymous parameters, following the convention that nil or :_ is an anonymous parameter.
+  # Example:
+  # ```
+  #    def method(param1, param2)
+  #    end
+  #
+  #    memoize_method :method do |_, _, param2|`
+  #      depends_on RedisMemo::Memoizable.new(param2: param2)
+  #    end
+  # ```
+  #  `exclude_anonymous_args(depends_on, ref, [1, 2])` returns [2]
+  def self.exclude_anonymous_args(depends_on, ref, args)
+    return [] if depends_on.parameters.empty? or args.empty?
+
+    positional_args = []
+    kwargs = {}
+    depends_on_args = [ref] + args
+    options = depends_on_args.extract_options!
+
+    # Keep track of the splat start index, and the number of positional args before and after the splat,
+    # so we can map which args belong to positional args and which args belong to the splat.
+    named_splat = false
+    splat_index = nil
+    num_positional_args_after_splat = 0
+    num_positional_args_before_splat = 0
+
+    depends_on.parameters.each_with_index do |param, i|
+      # Defined by https://github.com/ruby/ruby/blob/22b8ddfd1049c3fd1e368684c4fd03bceb041b3a/proc.c#L3048-L3059
+      case param.first
+      when :opt, :req
+        if splat_index
+          num_positional_args_after_splat += 1
+        else
+          num_positional_args_before_splat += 1
+        end
+      when :rest
+        named_splat = is_named?(param)
+        splat_index = i
+      when :key, :keyreq
+        kwargs[param.last] = options[param.last] if is_named?(param)
+      when :keyrest
+        kwargs.merge!(options) if is_named?(param)
+      else
+        raise(RedisMemo::ArgumentError, "#{param.first} argument isn't supported in the dependency block")
+      end
+    end
+
+    # Determine the named positional and splat arguments after we know the # of pos. arguments before and after splat
+    after_splat_index = depends_on_args.size - num_positional_args_after_splat
+    depends_on_args.each_with_index do |arg, i|
+      # if the index is within the splat
+      if i >= num_positional_args_before_splat && i < after_splat_index
+        positional_args << arg if named_splat
+      else
+        j = i < num_positional_args_before_splat ? i : i - (after_splat_index - splat_index) - 1
+        positional_args << arg if is_named?(depends_on.parameters[j])
+      end
+    end
+
+    if !kwargs.empty?
+      positional_args + [kwargs]
+    elsif named_splat && !options.empty?
+      positional_args + [options]
+    else
+      positional_args
+    end
+  end
+private
+  def self.is_named?(param)
+    param.size == 2 && param.last != :_
+  end
+
   def self.method_cache_keys(future_contexts)
     memos = Array.new(future_contexts.size)
-    future_contexts.each_with_index do |(ref, _, method_args, depends_on), i|
-      if depends_on
-        dependency = get_or_extract_dependencies(ref, *method_args, &depends_on)
-        memos[i] = dependency.memos
-      end
+    future_contexts.each_with_index do |(_, _, dependent_memos), i|
+      memos[i] = dependent_memos
     end
 
     j = 0
     memo_checksums = RedisMemo::Memoizable.checksums(memos.compact)
     method_cache_key_versions = Array.new(future_contexts.size)
-    future_contexts.each_with_index do |(_, method_id, method_args, _), i|
+    future_contexts.each_with_index do |(method_id, method_args, _), i|
       if memos[i]
         method_cache_key_versions[i] = [method_id, memo_checksums[j]]
         j += 1

data/lib/redis_memo/memoize_query.rb

@@ -13,6 +13,8 @@ if defined?(ActiveRecord)
     # after each record save
     def memoize_table_column(*raw_columns, editable: true)
       RedisMemo::MemoizeQuery.using_active_record!(self)
+      return if ENV["REDIS_MEMO_DISABLE_#{self.table_name.upcase}"] == 'true'
+
       columns = raw_columns.map(&:to_sym).sort
 
       RedisMemo::MemoizeQuery.memoized_columns(self, editable_only: true) << columns if editable
@@ -102,8 +104,10 @@ if defined?(ActiveRecord)
       end
     end
 
-    def self.invalidate(record)
-      RedisMemo::Memoizable.invalidate(to_memos(record))
+    def self.invalidate(*records)
+      RedisMemo::Memoizable.invalidate(
+        records.map { |record| to_memos(record) }.flatten,
+      )
     end
 
     def self.to_memos(record)

data/lib/redis_memo/memoize_query/cached_select.rb

@@ -111,19 +111,19 @@ class RedisMemo::MemoizeQuery::CachedSelect
           sql.gsub(/(\$\d+)/, '?')      # $1 -> ?
              .gsub(/((, *)*\?)+/, '?')  # (?, ?, ? ...) -> (?)
         end,
-      ) do |_, sql, name, binds, **kwargs|
-        RedisMemo::MemoizeQuery::CachedSelect
-          .current_query_bind_params
-          .params
-          .each do |model, attrs_set|
-            attrs_set.each do |attrs|
-              depends_on model, **attrs
-            end
-          end
+      ) do |_, sql, _, binds, **|
+        depends_on RedisMemo::MemoizeQuery::CachedSelect.current_query_bind_params
 
         depends_on RedisMemo::Memoizable.new(
           __redis_memo_memoize_query_memoize_query_sql__: sql,
-          __redis_memo_memoize_query_memoize_query_binds__: binds.map(&:value_for_database),
+          __redis_memo_memoize_query_memoize_query_binds__: binds.map do |bind|
+            if bind.respond_to?(:value_for_database)
+              bind.value_for_database
+            else
+              # In activerecord >= 6, a bind could be an actual database value
+              bind
+            end
+          end
         )
       end
     end
@@ -210,7 +210,7 @@ class RedisMemo::MemoizeQuery::CachedSelect
     bind_params = BindParams.new
 
     case node
-    when Arel::Nodes::Equality, Arel::Nodes::In
+    when NodeHasFilterCondition
       attr_node = node.left
       return unless attr_node.is_a?(Arel::Attributes::Attribute)
 
@@ -247,7 +247,13 @@ class RedisMemo::MemoizeQuery::CachedSelect
           }
         when Arel::Nodes::Casted
           bind_params.params[binding_relation] << {
-            right.attribute.name.to_sym => right.val,
+            right.attribute.name.to_sym =>
+              if right.respond_to?(:val)
+                right.val
+              else
+                # activerecord >= 6
+                right.value
+              end,
           }
         else
           bind_params = bind_params.union(extract_bind_params_recurse(right))
@@ -343,6 +349,23 @@ class RedisMemo::MemoizeQuery::CachedSelect
     enabled_models[table_node.try(:name)]
   end
 
+  class NodeHasFilterCondition
+    def self.===(node)
+      case node
+      when Arel::Nodes::Equality, Arel::Nodes::In
+        true
+      else
+        # In activerecord >= 6, a new arel node HomogeneousIn is introduced
+        if defined?(Arel::Nodes::HomogeneousIn) &&
+           node.is_a?(Arel::Nodes::HomogeneousIn)
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+
   # Thread locals to exchange information between RedisMemo and ActiveRecord
   THREAD_KEY_AREL = :__redis_memo_memoize_query_cached_select_arel__
   THREAD_KEY_SUBSTITUTES = :__redis_memo_memoize_query_cached_select_substitues__

data/lib/redis_memo/memoize_query/invalidation.rb

@@ -36,10 +36,8 @@ class RedisMemo::MemoizeQuery::Invalidation
       decrement_counter
       delete_all delete_by
       increment_counter
-      insert insert! insert_all insert_all!
       touch_all
       update_column update_columns update_all update_counters
-      upsert upsert_all
     ).each do |method_name|
       # Example: Model.update_all
       rewrite_default_method(
@@ -58,6 +56,24 @@ class RedisMemo::MemoizeQuery::Invalidation
       )
     end
 
+    %i(
+      insert insert! insert_all insert_all!
+    ).each do |method_name|
+      rewrite_insert_method(
+        model_class,
+        method_name,
+      )
+    end
+
+    %i(
+      upsert upsert_all
+    ).each do |method_name|
+      rewrite_upsert_method(
+        model_class,
+        method_name,
+      )
+    end
+
     %i(
       import import!
     ).each do |method_name|
@@ -70,6 +86,36 @@ class RedisMemo::MemoizeQuery::Invalidation
     model_class.class_variable_set(var_name, true)
   end
 
+  def self.invalidate_new_records(model_class, &blk)
+    current_id = model_class.maximum(model_class.primary_key)
+    result = blk.call
+    records = select_by_new_ids(model_class, current_id)
+    RedisMemo::MemoizeQuery.invalidate(*records) unless records.empty?
+    result
+  end
+
+  def self.invalidate_records_by_conflict_target(model_class, records:, conflict_target: nil, &blk)
+    if conflict_target.nil?
+      # When the conflict_target is not set, we are basically inserting new
+      # records since duplicate rows are simply skipped
+      return invalidate_new_records(model_class, &blk)
+    end
+
+    relation = build_relation_by_conflict_target(model_class, records, conflict_target)
+    # Invalidate records before updating
+    records = select_by_conflict_target_relation(model_class, relation)
+    RedisMemo::MemoizeQuery.invalidate(*records) unless records.empty?
+
+    # Perform updating
+    result = blk.call
+
+    # Invalidate records after updating
+    records = select_by_conflict_target_relation(model_class, relation)
+    RedisMemo::MemoizeQuery.invalidate(*records) unless records.empty?
+
+    result
+  end
+
   private
 
   #
@@ -95,12 +141,48 @@ class RedisMemo::MemoizeQuery::Invalidation
     end
   end
 
-  def self.rewrite_import_method(model_class, method_name)
-    # This optimization to avoid over-invalidation only works on postgres
-    unless ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-      rewrite_default_method(model_class, model_class, method_name, class_method: true)
-      return
+  def self.rewrite_insert_method(model_class, method_name)
+    return unless model_class.respond_to?(method_name)
+
+    model_class.singleton_class.class_eval do
+      alias_method :"#{method_name}_without_redis_memo_invalidation", method_name
+
+      define_method method_name do |*args, &blk|
+        RedisMemo::MemoizeQuery::Invalidation.invalidate_new_records(model_class) do
+          send(:"#{method_name}_without_redis_memo_invalidation", *args, &blk)
+        end
+      end
+    end
+  end
+
+  def self.rewrite_upsert_method(model_class, method_name)
+    return unless model_class.respond_to?(method_name)
+
+    model_class.singleton_class.class_eval do
+      alias_method :"#{method_name}_without_redis_memo_invalidation", method_name
+
+      define_method method_name do |attributes, unique_by: nil, **kwargs, &blk|
+        RedisMemo::MemoizeQuery::Invalidation.invalidate_records_by_conflict_target(
+          model_class,
+          records: nil, # not used
+          # upsert does not support on_duplicate_key_update yet at activerecord
+          # HEAD (6.1.3)
+          conflict_target: nil,
+        ) do
+          send(
+            :"#{method_name}_without_redis_memo_invalidation",
+            attributes,
+            unique_by: unique_by,
+            **kwargs,
+            &blk
+          )
+        end
+      end
     end
+  end
+
+  def self.rewrite_import_method(model_class, method_name)
+    return unless model_class.respond_to?(method_name)
 
     model_class.singleton_class.class_eval do
       alias_method :"#{method_name}_without_redis_memo_invalidation", method_name
@@ -110,54 +192,42 @@ class RedisMemo::MemoizeQuery::Invalidation
       define_method method_name do |*args, &blk|
         options = args.last.is_a?(Hash) ? args.last : {}
         records = args[args.last.is_a?(Hash) ? -2 : -1]
-        unique_by = options[:on_duplicate_key_update]
-        if unique_by.is_a?(Hash)
-          unique_by = unique_by[:columns]
-        end
-
-        if records.last.is_a?(Hash)
-          records.map! { |hash| model_class.new(hash) }
-        end
-
-        # Invalidate the records before and after the import to resolve
-        # - default values filled by the database
-        # - updates on conflict conditions
-        records_to_invalidate =
-          if unique_by
-            RedisMemo::MemoizeQuery::Invalidation.send(
-              :select_by_uniq_index,
-              records,
-              unique_by,
-            )
+        on_duplicate_key_update = options[:on_duplicate_key_update]
+        conflict_target =
+          case on_duplicate_key_update
+          when Hash
+            # The conflict_target option is only supported in PostgreSQL. In
+            # MySQL, the primary_key is used as the conflict_target
+            on_duplicate_key_update[:conflict_target] || [model_class.primary_key.to_sym]
+          when Array
+            # The default conflict_target is just the primary_key
+            [model_class.primary_key.to_sym]
           else
-            []
+            # Ignore duplicate rows
+            nil
           end
 
-        result = send(:"#{method_name}_without_redis_memo_invalidation", *args, &blk)
-
-        records_to_invalidate += RedisMemo.without_memo do
-          # Not all databases support "RETURNING", which is useful when
-          # invaldating records after bulk creation
-          model_class.where(model_class.primary_key => result.ids).to_a
+        if conflict_target && records.last.is_a?(Hash)
+          records.map! { |hash| model_class.new(hash) }
         end
 
-        memos_to_invalidate = records_to_invalidate.map do |record|
-          RedisMemo::MemoizeQuery.to_memos(record)
+        RedisMemo::MemoizeQuery::Invalidation.invalidate_records_by_conflict_target(
+          model_class,
+          records: records,
+          conflict_target: conflict_target,
+        ) do
+          send(:"#{method_name}_without_redis_memo_invalidation", *args, &blk)
         end
-        RedisMemo::Memoizable.invalidate(memos_to_invalidate.flatten)
-
-        result
       end
     end
   end
 
-  def self.select_by_uniq_index(records, unique_by)
-    model_class = records.first.class
+  def self.build_relation_by_conflict_target(model_class, records, conflict_target)
     or_chain = nil
 
     records.each do |record|
       conditions = {}
-      unique_by.each do |column|
+      conflict_target.each do |column|
         conditions[column] = record.send(column)
       end
       if or_chain
@@ -167,6 +237,30 @@ class RedisMemo::MemoizeQuery::Invalidation
       end
     end
 
-    RedisMemo.without_memo { or_chain.to_a }
+    or_chain
+  end
+
+  def self.select_by_new_ids(model_class, target_id)
+    RedisMemo::Tracer.trace(
+      'redis_memo.memoize_query.invalidation',
+      "#{__method__}##{model_class.name}",
+    ) do
+      RedisMemo.without_memo do
+        model_class.where(
+          model_class.arel_table[model_class.primary_key].gt(target_id),
+        ).to_a
+      end
+    end
+  end
+
+  def self.select_by_conflict_target_relation(model_class, relation)
+    return [] unless relation
+
+    RedisMemo::Tracer.trace(
+      'redis_memo.memoize_query.invalidation',
+      "#{__method__}##{model_class.name}",
+    ) do
+      RedisMemo.without_memo { relation.reload }
+    end
   end
 end

data/lib/redis_memo/options.rb

@@ -13,7 +13,7 @@ class RedisMemo::Options
   )
     @compress = compress.nil? ? true : compress
     @compress_threshold = compress_threshold || 1.kilobyte
-    @redis = redis
+    @redis_config = redis
     @redis_client = nil
     @redis_error_handler = redis_error_handler
     @tracer = tracer
@@ -22,20 +22,18 @@ class RedisMemo::Options
     @expires_in = expires_in
   end
 
-  def redis(&blk)
-    if blk.nil?
-      return @redis_client if @redis_client.is_a?(RedisMemo::Redis)
+  def redis
+    @redis_client ||= RedisMemo::Redis.new(redis_config)
+  end
 
-      if @redis.respond_to?(:call)
-        @redis_client = RedisMemo::Redis.new(@redis.call)
-      elsif @redis
-        @redis_client = RedisMemo::Redis.new(@redis)
-      else
-        @redis_client = RedisMemo::Redis.new
-      end
-    else
-      @redis = blk
-    end
+  def redis_config
+    @redis_config || {}
+  end
+
+  def redis=(config)
+    @redis_config = config
+    @redis_client = nil
+    redis
   end
 
   def tracer(&blk)
@@ -74,15 +72,15 @@ class RedisMemo::Options
   end
 
   attr_accessor :async
+  attr_accessor :cache_out_of_date_handler
+  attr_accessor :cache_validation_sampler
   attr_accessor :compress
   attr_accessor :compress_threshold
-  attr_accessor :redis_error_handler
+  attr_accessor :connection_pool
   attr_accessor :expires_in
-  attr_accessor :cache_validation_sampler
-  attr_accessor :cache_out_of_date_handler
+  attr_accessor :redis_error_handler
 
   attr_writer :global_cache_key_version
-  attr_writer :redis
   attr_writer :tracer
   attr_writer :logger
 end

data/lib/redis_memo/redis.rb

@@ -31,7 +31,8 @@ class RedisMemo::Redis < Redis::Distributed
   end
 
   class WithReplicas < ::Redis
-    def initialize(options)
+    def initialize(orig_options)
+      options = orig_options.dup
       primary_option = options.shift
       @replicas = options.map do |option|
         option[:logger] ||= RedisMemo::DefaultOptions.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-memo
 version: !ruby/object:Gem::Version
-  version: 0.0.0.beta.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -14,42 +14,56 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
@@ -161,6 +175,7 @@ files:
 - lib/redis_memo/after_commit.rb
 - lib/redis_memo/batch.rb
 - lib/redis_memo/cache.rb
+- lib/redis_memo/connection_pool.rb
 - lib/redis_memo/future.rb
 - lib/redis_memo/memoizable.rb
 - lib/redis_memo/memoizable/dependency.rb
@@ -193,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key: