factbase 0.19.0 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20d4add4664149fc5c070ec64321a79c8ac07ef81c69ae2b64bac1e9fd0c4e9
-  data.tar.gz: ff9a8f121d9cfafa6ad97a634c79fc2ec834a07ee0d17042eb3fc5fa8c529501
+  metadata.gz: 515345c86598dcc29f0795b9bb64fe31fc770469f596185103bc3ae62b95bec9
+  data.tar.gz: adcf851edc23a66a4297bf4888ae54987431cc853f3157d751bbb57f5a89ef01
 SHA512:
-  metadata.gz: 3f93283308d6f15766fca09f253da85145efc28975e51259ee88f0954cc6a7f584700de2ff604478bd5a48f1c86153243949a6280732a466412a739f38e9a1e2
-  data.tar.gz: e21602f7612821dd2389e831056389900f62a3ef3b1bf998f6ebbe722cfc9684357383c754ad0556a346534cf7a6bc76489706e0f0f58ea23336a918be71b442
+  metadata.gz: 37488e2dd8a395abb1ddfb4700fa794592d3ce910981f4c468c2f6b0ebdfa703400873f5caea6cdee42a62971ae88009956fb6cb38b3bc5d8eebca698bdf4367
+  data.tar.gz: 7798feb2f2e05fb795e6cfffe3a3311d6e2867fd4b21d1ffb5f1e03aa818bacae442faf47a507a99a402081d5048146be883685adcef62a9ace4ef85ac4ee90e

data/Gemfile.lock

@@ -36,7 +36,7 @@ GEM
     logger (1.7.0)
     loog (0.6.1)
       logger (~> 1.0)
-    minitest (5.26.2)
+    minitest (5.27.0)
     minitest-reporters (1.7.1)
       ansi
       builder

data/lib/factbase/cached/cached_factbase.rb

@@ -31,6 +31,7 @@ class Factbase::CachedFactbase
   # Insert a new fact and return it.
   # @return [Factbase::Fact] The fact just inserted
   def insert
+    @cache[:__dirty__] = true
     Factbase::CachedFact.new(@origin.insert, @cache, fresh: true)
   end
 

data/lib/factbase/cached/cached_query.rb

@@ -35,6 +35,7 @@ class Factbase::CachedQuery
   # @return [Integer] Total number of facts yielded
   def each(fb = @fb, params = {})
     return to_enum(__method__, fb, params) unless block_given?
+    invalidate_if_dirty!
     key = "each #{@origin}" # params are ignored!
     before = @cache[key]
     @cache[key] = @origin.each(fb, params).to_a if before.nil?
@@ -51,6 +52,7 @@ class Factbase::CachedQuery
   # @param [Hash] params Optional params accessible in the query via the "$" symbol (unused)
   # @return The value evaluated
   def one(fb = @fb, params = {})
+    invalidate_if_dirty!
     key = "one: #{@origin} #{params}"
     before = @cache[key]
     @cache[key] = @origin.one(fb, params) if before.nil?
@@ -63,4 +65,14 @@ class Factbase::CachedQuery
     @cache.clear
     @origin.delete!(fb)
   end
+
+  private
+
+  # Clear cache if it was marked dirty by a fresh fact insertion.
+  # This implements lazy invalidation: we don't clear on every insert,
+  # only when a query actually runs after inserts happened.
+  def invalidate_if_dirty!
+    return unless @cache.delete(:__dirty__)
+    @cache.clear
+  end
 end

data/lib/factbase/indexed/indexed_and.rb

@@ -42,8 +42,13 @@ class Factbase::IndexedAnd
           end
         end
       )
-      j = tuples.map { |t| entry[:index][t] || [] }.reduce(&:|)
-      r = (maps & []) | j
+      j = tuples.flat_map { |t| entry[:index][t] || [] }.uniq(&:object_id)
+      r =
+        if maps.respond_to?(:inserted)
+          Factbase::Taped.new(j, inserted: maps.inserted, deleted: maps.deleted, added: maps.added)
+        else
+          j
+        end
     else
       @term.operands.each do |o|
         n = o.predict(maps, fb, params)

data/lib/factbase/indexed/indexed_eq.rb

@@ -36,11 +36,11 @@ class Factbase::IndexedEq
       else
         [@term.operands[1]]
       end
-    if vv.empty?
-      (maps & [])
+    j = vv.flat_map { |v| entry[:index][v] || [] }.uniq(&:object_id)
+    if maps.respond_to?(:inserted)
+      Factbase::Taped.new(j, inserted: maps.inserted, deleted: maps.deleted, added: maps.added)
     else
-      j = vv.map { |v| entry[:index][v] || [] }.reduce(&:|)
-      (maps & []) | j
+      j
     end
   end
 

data/lib/factbase/indexed/indexed_factbase.rb

@@ -49,8 +49,7 @@ class Factbase::IndexedFactbase
   def query(term, maps = nil)
     term = to_term(term) if term.is_a?(String)
     q = @origin.query(term, maps)
-    q = Factbase::IndexedQuery.new(q, @idx, self) if term.abstract?
-    q
+    Factbase::IndexedQuery.new(q, @idx, self)
   end
 
   # Run an ACID transaction.

data/lib/factbase/indexed/indexed_query.rb

@@ -46,7 +46,7 @@ class Factbase::IndexedQuery
   # @param [Factbase] fb The factbase
   # @param [Hash] params Optional params accessible in the query via the "$" symbol
   # @return [String|Integer|Float|Time|Array|NilClass] The value evaluated
-  def one(fb = @fb, params = nil)
+  def one(fb = @fb, params = {})
     @origin.one(fb, params)
   end
 
@@ -54,7 +54,8 @@ class Factbase::IndexedQuery
   # @param [Factbase] fb The factbase
   # @return [Integer] Total number of facts deleted
   def delete!(fb = @fb)
+    result = @origin.delete!(fb)
     @idx.clear
-    @origin.delete!(fb)
+    result
   end
 end

data/lib/factbase/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.19.0' unless const_defined?(:VERSION)
+  VERSION = '0.19.2' unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.2
 platform: ruby
 authors:
 - Yegor Bugayenko