redcord 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16cb660da0ea843f300ff18cc090ccfed7883c9d1ca48ef0bc5ed8d4e805854c
-  data.tar.gz: f53002cb43b3e5286ba1f914c41ffd6b8a9722d2d33d9764deb7bcba88d2659c
+  metadata.gz: 525c939f4cee5b8adbb11b0530a2b2f44f6a26a8bb1a55e4dc837d725b3f71fb
+  data.tar.gz: f7e1747cc025310b20ab5e8d675fefe6d951ec60c5c09056454e11c8c366008e
 SHA512:
-  metadata.gz: db443ffbf21066c549b30daed2ad44f836aa4469065b7bd8b6d0c13f45597bd7bdbf6c7ef4202ddf8103a1c2fbcfca28ca60f9f59b90584d0ec718d380d0f908
-  data.tar.gz: 40ded5853307f453fe7c5ab2962e29cc081c05ab7f0c2cfddb898259e207ae9c343dfee6a67967449ff43c227c88db6f7a7922c425d8e6df92466b5ed778c5c2
+  metadata.gz: 6e2ff5ff1008d0a9e59e02438010e78324ec86c3ce03c470f28175498c7b29fbd277f97509f59dead80e258609ed033c9d686119726553b206996c064d4c7827
+  data.tar.gz: bba7b07d1e6b222614667a271b25973f5d1693d2090cb533dcbbfaf092f6200cce75ce5a7cf76356277bc1d51ae5011405465caae64ad295b85faa63d016c191

data/lib/redcord/redis.rb

@@ -18,24 +18,19 @@ class Redcord::Redis < Redis
     ).returns(String)
   end
   def create_hash_returning_id(key, args, ttl:, index_attrs:, range_index_attrs:, custom_index_attrs:, hash_tag: nil)
-    Redcord::Base.trace(
-      'redcord_redis_create_hash_returning_id',
-      model_name: key,
-    ) do
-      id = "#{SecureRandom.uuid}#{hash_tag}"
-      custom_index_attrs_flat = custom_index_attrs.inject([]) do |result, (index_name, attrs)|
-        result << index_name
-        result << attrs.size
-        result + attrs
-      end
-      run_script(
-        :create_hash,
-        keys: [id, hash_tag],
-        argv: [key, ttl, index_attrs.size, range_index_attrs.size, custom_index_attrs_flat.size] + 
-          index_attrs + range_index_attrs + custom_index_attrs_flat + args.to_a.flatten,
-      )
-      id
+    id = "#{SecureRandom.uuid}#{hash_tag}"
+    custom_index_attrs_flat = custom_index_attrs.inject([]) do |result, (index_name, attrs)|
+      result << index_name
+      result << attrs.size
+      result + attrs
     end
+    run_script(
+      :create_hash,
+      keys: [id, hash_tag],
+      argv: [key, ttl, index_attrs.size, range_index_attrs.size, custom_index_attrs_flat.size] +
+        index_attrs + range_index_attrs + custom_index_attrs_flat + args.to_a.flatten,
+    )
+    id
   end
 
   sig do
@@ -51,26 +46,21 @@ class Redcord::Redis < Redis
     ).void
   end
   def update_hash(model, id, args, ttl:, index_attrs:, range_index_attrs:, custom_index_attrs:, hash_tag:)
-    Redcord::Base.trace(
-      'redcord_redis_update_hash',
-      model_name: model,
-    ) do
-      custom_index_attrs_flat = custom_index_attrs.inject([]) do |result, (index_name, attrs)|
-        if !(args.keys.to_set & attrs.to_set).empty?
-          result << index_name
-          result << attrs.size
-          result + attrs
-        else
-          result
-        end
+    custom_index_attrs_flat = custom_index_attrs.inject([]) do |result, (index_name, attrs)|
+      if !(args.keys.to_set & attrs.to_set).empty?
+        result << index_name
+        result << attrs.size
+        result + attrs
+      else
+        result
       end
-      run_script(
-        :update_hash,
-        keys: [id, hash_tag],
-        argv: [model, ttl, index_attrs.size, range_index_attrs.size, custom_index_attrs_flat.size] +
-          index_attrs + range_index_attrs + custom_index_attrs_flat + args.to_a.flatten,
-      )
     end
+    run_script(
+      :update_hash,
+      keys: [id, hash_tag],
+      argv: [model, ttl, index_attrs.size, range_index_attrs.size, custom_index_attrs_flat.size] +
+        index_attrs + range_index_attrs + custom_index_attrs_flat + args.to_a.flatten,
+    )
   end
 
   sig do
@@ -83,17 +73,12 @@ class Redcord::Redis < Redis
     ).returns(Integer)
   end
   def delete_hash(model, id, index_attrs:, range_index_attrs:, custom_index_attrs:)
-    Redcord::Base.trace(
-      'redcord_redis_delete_hash',
-      model_name: model,
-    ) do
-      custom_index_names = custom_index_attrs.keys
-      run_script(
-        :delete_hash,
-        keys: [id, id.match(/\{.*\}$/)&.send(:[], 0)],
-        argv: [model, index_attrs.size, range_index_attrs.size] + index_attrs + range_index_attrs + custom_index_names,
-      )
-    end
+    custom_index_names = custom_index_attrs.keys
+    run_script(
+      :delete_hash,
+      keys: [id, id.match(/\{.*\}$/)&.send(:[], 0)],
+      argv: [model, index_attrs.size, range_index_attrs.size] + index_attrs + range_index_attrs + custom_index_names,
+    )
   end
 
   sig do
@@ -118,22 +103,17 @@ class Redcord::Redis < Redis
         hash_tag: nil,
         custom_index_name: nil
       )
-    Redcord::Base.trace(
-      'redcord_redis_find_by_attr',
-      model_name: model,
-    ) do
-      conditions = flatten_with_partial_sort(query_conditions.clone, custom_index_attrs)
-      res = run_script(
-        :find_by_attr,
-        keys: [hash_tag],
-        argv: [model, custom_index_name, index_attrs.size, range_index_attrs.size, custom_index_attrs.size, conditions.size] + 
-          index_attrs + range_index_attrs + custom_index_attrs + conditions + select_attrs.to_a.flatten
-      )
-      # The Lua script will return this as a flattened array.
-      # Convert the result into a hash of {id -> model hash}
-      res_hash = res.each_slice(2)
-      res_hash.map { |key, val| [key, val.each_slice(2).to_h] }.to_h
-    end
+    conditions = flatten_with_partial_sort(query_conditions.clone, custom_index_attrs)
+    res = run_script(
+      :find_by_attr,
+      keys: [hash_tag],
+      argv: [model, custom_index_name, index_attrs.size, range_index_attrs.size, custom_index_attrs.size, conditions.size] + 
+        index_attrs + range_index_attrs + custom_index_attrs + conditions + select_attrs.to_a.flatten
+    )
+    # The Lua script will return this as a flattened array.
+    # Convert the result into a hash of {id -> model hash}
+    res_hash = res.each_slice(2)
+    res_hash.map { |key, val| [key, val.each_slice(2).to_h] }.to_h
   end
 
   sig do
@@ -156,33 +136,28 @@ class Redcord::Redis < Redis
         hash_tag: nil,
         custom_index_name: nil
       )
-    Redcord::Base.trace(
-      'redcord_redis_find_by_attr_count',
-      model_name: model,
-    ) do
-      conditions = flatten_with_partial_sort(query_conditions.clone, custom_index_attrs)
-      run_script(
-        :find_by_attr_count,
-        keys: [hash_tag],
-        argv: [model, custom_index_name, index_attrs.size, range_index_attrs.size, custom_index_attrs.size] +
-          index_attrs + range_index_attrs + custom_index_attrs + conditions
-      )
-    end
+    conditions = flatten_with_partial_sort(query_conditions.clone, custom_index_attrs)
+    run_script(
+      :find_by_attr_count,
+      keys: [hash_tag],
+      argv: [model, custom_index_name, index_attrs.size, range_index_attrs.size, custom_index_attrs.size] +
+        index_attrs + range_index_attrs + custom_index_attrs + conditions
+    )
   end
 
-  def scan_each_shard(key, &blk)
+  def scan_each_shard(key, count: 1000, &blk)
     clients = instance_variable_get(:@client)
       &.instance_variable_get(:@node)
       &.instance_variable_get(:@clients)
       &.values
 
     if clients.nil?
-      scan_each(match: key, &blk)
+      scan_each(match: key, count: count, &blk)
     else
       clients.each do |client|
         cursor = 0
         loop do
-          cursor, keys = client.call([:scan, cursor, 'match', key])
+          cursor, keys = client.call([:scan, cursor, 'match', key, 'count', count])
           keys.each(&blk)
           break if cursor == "0"
         end

data/lib/redcord/relation.rb

@@ -88,16 +88,21 @@ class Redcord::Relation
 
   sig { returns(Integer) }
   def count
-    model.validate_index_attributes(query_conditions.keys, custom_index_name: custom_index_name)
-    redis.find_by_attr_count(
-      model.model_key,
-      extract_query_conditions!,
-      index_attrs: model._script_arg_index_attrs,
-      range_index_attrs: model._script_arg_range_index_attrs,
-      custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name],
-      hash_tag: extract_hash_tag!,
-      custom_index_name: custom_index_name
-    )
+    Redcord::Base.trace(
+     'redcord_relation_count',
+     model_name: model.name,
+    ) do
+      model.validate_index_attributes(query_conditions.keys, custom_index_name: custom_index_name)
+      redis.find_by_attr_count(
+        model.model_key,
+        extract_query_conditions!,
+        index_attrs: model._script_arg_index_attrs,
+        range_index_attrs: model._script_arg_range_index_attrs,
+        custom_index_attrs: model._script_arg_custom_index_attrs[custom_index_name],
+        hash_tag: extract_hash_tag!,
+        custom_index_name: custom_index_name
+      )
+    end
   end
 
   sig { params(index_name: T.nilable(Symbol)).returns(Redcord::Relation) }

data/lib/redcord/vacuum_helper.rb

@@ -32,24 +32,27 @@ module Redcord::VacuumHelper
 
   sig { params(model: T.class_of(Redcord::Base), range_index_attr: Symbol).void }
   def self._vacuum_range_index_attribute(model, range_index_attr)
+    key_suffix = model.shard_by_attribute.nil? ? nil : '{*}'
     range_index_set_key = "#{model.model_key}:#{range_index_attr}"
     range_index_set_nil_key = "#{range_index_set_key}:"
 
     # Handle nil values for range index attributes, which are stored in a normal
     # set at Redcord:Model:range_index_attr:
-    model.redis.scan_each_shard("#{range_index_set_nil_key}*") do |key|
+    model.redis.scan_each_shard("#{range_index_set_nil_key}#{key_suffix}") do |key|
       _remove_stale_ids_from_set(model, key)
     end
 
-    model.redis.scan_each_shard("#{range_index_set_key}*") do |key|
+    model.redis.scan_each_shard("#{range_index_set_key}#{key_suffix}") do |key|
       _remove_stale_ids_from_sorted_set(model, key)
     end
   end
 
   sig { params(model: T.class_of(Redcord::Base), index_name: Symbol).void }
   def self._vacuum_custom_index(model, index_name)
+    key_suffix = model.shard_by_attribute.nil? ? nil : '{*}'
     custom_index_content_key = "#{model.model_key}:custom_index:#{index_name}_content"
-    model.redis.scan_each_shard("#{custom_index_content_key}*") do |key|
+
+    model.redis.scan_each_shard("#{custom_index_content_key}#{key_suffix}") do |key|
       hash_tag = key.split(custom_index_content_key)[1] || ""
       _remove_stale_records_from_custom_index(model, hash_tag, index_name)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative