redcord 0.0.3 → 0.1.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcord
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.3
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !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: 2.2.3
 - !ruby/object:Gem::Dependency
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
@@ -162,19 +176,21 @@ files:
 - lib/redcord/attribute.rb
 - lib/redcord/base.rb
 - lib/redcord/configurations.rb
+- lib/redcord/connection_pool.rb
 - lib/redcord/logger.rb
 - lib/redcord/lua_script_reader.rb
 - lib/redcord/migration.rb
+- lib/redcord/migration/index.rb
 - lib/redcord/migration/migrator.rb
 - lib/redcord/migration/ttl.rb
 - lib/redcord/migration/version.rb
-- lib/redcord/prepared_redis.rb
 - lib/redcord/railtie.rb
 - lib/redcord/range_interval.rb
+- lib/redcord/redis.rb
 - lib/redcord/redis_connection.rb
 - lib/redcord/relation.rb
 - lib/redcord/serializer.rb
-- lib/redcord/server_scripts/create_hash_returning_id.erb.lua
+- lib/redcord/server_scripts/create_hash.erb.lua
 - lib/redcord/server_scripts/delete_hash.erb.lua
 - lib/redcord/server_scripts/find_by_attr.erb.lua
 - lib/redcord/server_scripts/find_by_attr_count.erb.lua
@@ -184,6 +200,7 @@ files:
 - lib/redcord/server_scripts/update_hash.erb.lua
 - lib/redcord/tasks/redis.rake
 - lib/redcord/tracer.rb
+- lib/redcord/vacuum_helper.rb
 homepage: https://github.com/chanzuckerberg/redis-record
 licenses:
 - MIT
@@ -203,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Ruby ORM like Active Record, but for Redis

data/lib/redcord/prepared_redis.rb

@@ -1,147 +0,0 @@
-# typed: strict
-require 'redis'
-
-# TODO: Rename Redcord::PreparedRedis -> Redcord::Redis
-class Redcord::PreparedRedis < Redis
-  extend T::Sig
-
-  sig do
-    params(
-      key: T.any(String, Symbol),
-      args: T::Hash[T.untyped, T.untyped],
-    ).returns(Integer)
-  end
-  def create_hash_returning_id(key, args)
-    Redcord::Base.trace(
-      'redcord_redis_create_hash_returning_id',
-      model_name: key,
-    ) do
-      evalsha(
-        self.class.server_script_shas[:create_hash_returning_id],
-        keys: [key],
-        argv: args.to_a.flatten,
-      ).to_i
-    end
-  end
-
-  sig do
-    params(
-      model: String,
-      id: Integer,
-      args: T::Hash[T.untyped, T.untyped],
-    ).void
-  end
-  def update_hash(model, id, args)
-    Redcord::Base.trace(
-      'redcord_redis_update_hash',
-      model_name: model,
-    ) do
-      evalsha(
-        self.class.server_script_shas[:update_hash],
-        keys: [model, id],
-        argv: args.to_a.flatten,
-      )
-    end
-  end
-
-  sig do
-    params(
-      model: String,
-      id: Integer
-    ).returns(Integer)
-  end
-  def delete_hash(model, id)
-    Redcord::Base.trace(
-      'redcord_redis_delete_hash',
-      model_name: model,
-    ) do
-      evalsha(
-        self.class.server_script_shas[:delete_hash],
-        keys: [model, id]
-      )
-    end
-  end
-
-  sig do
-    params(
-      model: String,
-      query_conditions: T::Hash[T.untyped, T.untyped],
-      select_attrs: T::Set[Symbol]
-    ).returns(T::Hash[Integer, T::Hash[T.untyped, T.untyped]])
-  end
-  def find_by_attr(model, query_conditions, select_attrs=Set.new)
-    Redcord::Base.trace(
-      'redcord_redis_find_by_attr',
-      model_name: model,
-    ) do
-      res = evalsha(
-        self.class.server_script_shas[:find_by_attr],
-        keys: [model] + query_conditions.to_a.flatten,
-        argv: 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.to_i, val.each_slice(2).to_h] }.to_h
-    end
-  end
-
-  sig do
-    params(
-      model: String,
-      query_conditions: T::Hash[T.untyped, T.untyped]
-    ).returns(Integer)
-  end
-  def find_by_attr_count(model, query_conditions)
-    Redcord::Base.trace(
-      'redcord_redis_find_by_attr_count',
-      model_name: model,
-    ) do
-      evalsha(
-        self.class.server_script_shas[:find_by_attr_count],
-        keys: [model] + query_conditions.to_a.flatten,
-      )
-    end
-  end
-
-  sig { void }
-  def load_server_scripts!
-    script_names = Dir[File.join(
-      __dir__,
-      'server_scripts/*.lua',
-    )].map do |filename|
-      # lib/redcord/server_scripts/find_by_attr.erb.lua -> find_by_attr
-      T.must(filename.split('/').last).split('.').first&.to_sym
-    end
-
-    res = pipelined do
-      script_names.each do |script_name|
-        script(
-          :load,
-          Redcord::LuaScriptReader.read_lua_script(script_name.to_s),
-        )
-      end
-    end
-
-    if self.class.class_variable_get(:@@server_script_shas).nil?
-      self.class.class_variable_set(
-        :@@server_script_shas,
-        script_names.zip(res).to_h
-      )
-    end
-  end
-
-  @@server_script_shas = T.let(nil, T.nilable(T::Hash[Symbol, String]))
-
-  sig { returns(T::Hash[Symbol, String]) }
-  def self.server_script_shas
-    T.must(@@server_script_shas)
-  end
-
-  sig { void }
-  def self.load_server_scripts!
-    Redcord::Base.configurations[Rails.env].each do |_, config|
-      new(**(config.symbolize_keys)).load_server_scripts!
-    end
-  end
-end

data/lib/redcord/server_scripts/create_hash_returning_id.erb.lua

@@ -1,69 +0,0 @@
---[[
-EVALSHA SHA1(__FILE__) [field value ...]
-> Time complexity: O(N) where N is the number of fields being set.
-
-Create a hash with the specified fields to their respective values stored at
-key when key does not exist.
-
-# Return value
-The id of the created hash as a string.
---]]
-
--- The arguments can be accessed by Lua using the KEYS global variable in the
--- form of a one-based array (so KEYS[1], KEYS[2], ...).
--- All the additional arguments should not represent key names and can be
--- accessed by Lua using the ARGV global variable, very similarly to what
--- happens with keys (so ARGV[1], ARGV[2], ...).
-
---   KEYS[1] = Model.name
---   ARGV[1...2N] = attr_key attr_val [attr_key attr_val ..]
-<%= include_lua 'shared/lua_helper_methods' %>
-<%= include_lua 'shared/index_helper_methods' %>
-
--- Validate input to script before making Redis db calls
-if #KEYS ~= 1 then
-  error('Expected keys to be of size 1')
-end
-if #ARGV % 2 ~= 0 then
-  error('Expected an even number of arguments')
-end
-
-local model = KEYS[1]
-
--- Call the Redis command: INCR "#{Model.name}:id_seq". If "#{Model.name}:id_seq" does
--- not exist, the command returns 0. It errors if the id_seq overflows a 64 bit
--- signed integer.
-redis.call('incr', model .. ':id_seq')
-
--- The Lua version used by Redis does not support 64 bit integers:
---   https://github.com/antirez/redis/issues/5261
--- We ignore the integer response from INCR and use the string response from
--- the GET/MGET command.
-local id, ttl = unpack(redis.call('mget', model .. ':id_seq', model .. ':ttl'))
-local key = model .. ':id:' .. id
-
--- Forward the script arguments to the Redis command HSET.
--- Call the Redis command: HSET "#{Model.name}:id:#{id}" field value ...
-redis.call('hset', key, unpack(ARGV))
-
--- Set TTL on key
-if ttl and ttl ~= '-1' then
-  redis.call('expire', key, ttl)
-end
-
--- Add id value for any index and range index attributes
-local attrs_hash = to_hash(ARGV)
-local index_attr_keys = redis.call('smembers', model .. ':index_attrs')
-if #index_attr_keys > 0 then
-  for _, attr_key in ipairs(index_attr_keys) do
-    add_id_to_index_attr(model, attr_key, attrs_hash[attr_key], id)
-  end
-end
-local range_index_attr_keys = redis.call('smembers', model .. ':range_index_attrs')
-attrs_hash['id'] = id
-if #range_index_attr_keys > 0 then
-  for _, attr_key in ipairs(range_index_attr_keys) do
-    add_id_to_range_index_attr(model, attr_key, attrs_hash[attr_key], id)
-  end
-end
-return id