bmg-redis 0.20.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa59ab4f85e7943b6b27b085b250c9e42ae41e42
-  data.tar.gz: ac3ee8db2b449ac869da38bb781db645a4646ec0
+  metadata.gz: '07189d7515f70a5d013486141404708cc364906f'
+  data.tar.gz: ded99a9c7d8ee20fd20e1566e2cd1029c06c4e11
 SHA512:
-  metadata.gz: 91b27958c5292be6257eb95cdf319a544ab2d0e02994af6400de8026f5dec926f3ee99c4e1b5d97790dd8c6f9394a3f0b3791435af3f766eb1e071718b9dfa0d
-  data.tar.gz: a9eae0d18ba019f9589b9512c6f84404b63ee1fd0010601614db72ac753177506c18970000a5e752b6ec2021ebf019508ce8648b1cb72edc8c8db2b0397d85ef
+  metadata.gz: c341c8049360086c7e1ce5ec14c1c15e33b079440e6cb1604072a61eb10f644029db5b4f2846e1ba6707bfab54712a82bf0181766f461bce7060abce1a2d6782
+  data.tar.gz: 4227490dfb2d323ffffb4924a5c9a6c2328662f50bbc8ea285e25df7d888a89126e584a71373ff745337dbf534a5134925e31515f823f243ced5e7abd703faea

data/lib/bmg/redis/relation.rb

@@ -29,39 +29,58 @@ module Bmg
         end
       end
 
+    ### optimization
+
+      def _restrict(type, predicate)
+        return super unless key = full_and_only_key?(predicate)
+
+        redis_key = extract_key(key)
+        if tuple_str = redis.get(redis_key)
+          tuple = serializer.deserialize(tuple_str)
+          Singleton.new(type, self, tuple)
+        else
+          Bmg::Relation.empty
+        end
+      end
+
     ###
 
       def insert(tuple_or_tuples)
         case tuple_or_tuples
         when Hash
-          key = extract_key(tuple_or_tuples)
-          serialized = serializer.serialize(tuple_or_tuples)
-          redis.set(key, serialized)
+          insert_one(tuple_or_tuples, redis)
         else
-          tuple_or_tuples.each do |tuple|
-            insert(tuple)
+          redis.multi do |transaction|
+            tuple_or_tuples.each do |tuple|
+              insert_one(tuple, transaction)
+            end
           end
         end
         self
       end
 
-      def update(updating, predicate = Predicate.tautology)
-        each do |tuple|
-          next unless predicate.call(tuple)
+      def insert_one(tuple, redis)
+        key = extract_key(tuple)
+        serialized = serializer.serialize(tuple)
+        redis.set(key, serialized)
+        self
+      end
+      private :insert_one
 
-          insert(tuple.merge(updating))
+      def update(updating, predicate = Predicate.tautology)
+        updates = restrict(predicate).map do |tuple|
+          tuple.merge(updating)
         end
-        self
+        insert(updates)
       end
 
       def delete(predicate = Predicate.tautology)
-        keys = self
-          .each
-          .select{|tuple| predicate.call(tuple) }
-          .map{|tuple| extract_key(tuple) }
-
-        redis.del(*keys)
-
+        keys = restrict(predicate).each.map{|t| extract_key(t) }
+        redis.multi do |transaction|
+          keys.each_slice(1000) do |slice|
+            transaction.del(*slice)
+          end
+        end
         self
       end
 
@@ -99,10 +118,25 @@ module Bmg
         options[:key_prefix] || "bmg"
       end
 
+      def full_and_only_key?(predicate)
+        h = begin
+          predicate.to_hash
+        rescue ArgumentError
+          return false
+        end
+
+        return false unless h.keys == candidate_key
+        return false unless candidate_key.all?{|k|
+          h[k].is_a?(String) || h[k].is_a?(Integer)
+        }
+
+        h
+      end
+
       def extract_key(tuple)
         key = candidate_key
         key = TupleAlgebra.project(tuple, key)
-        key = serializer.serialize(key)
+        key = key.to_json
         "#{key_prefix}:#{key}"
       end
 

data/lib/bmg/redis/singleton.rb

@@ -0,0 +1,35 @@
+module Bmg
+  module Redis
+    class Singleton
+      include Bmg::Relation
+
+      def initialize(type, parent, tuple)
+        @type = type
+        @parent = parent
+        @tuple = tuple
+      end
+      attr_accessor :type
+
+      def each
+        return to_enum unless block_given?
+
+        yield(@tuple) if @tuple
+      end
+
+      def insert(tuple_or_tuples)
+        @parent.insert(tuple_or_tuples)
+        self
+      end
+
+      def update(updating, predicate = Predicate.tautology)
+        @parent.update(updating, predicate & type.predicate)
+        self
+      end
+
+      def delete(predicate = Predicate.tautology)
+        @parent.delete(predicate & type.predicate)
+      end
+
+    end # class Singleton
+  end # module Redis
+end # module Bmg

data/lib/bmg/redis.rb

@@ -2,3 +2,4 @@ require 'redis'
 require 'json'
 require_relative 'redis/serializer'
 require_relative 'redis/relation'
+require_relative 'redis/singleton'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg-redis
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bmg
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - lib/bmg/redis/serializer.rb
 - lib/bmg/redis/serializer/json.rb
 - lib/bmg/redis/serializer/marshal.rb
+- lib/bmg/redis/singleton.rb
 - tasks/gem.rake
 - tasks/test.rake
 homepage: http://github.com/enspirit/bmg-redis