factbase 0.19.5 → 0.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4224329381f390e0d8262e6868f1edf6b4f0ae07c972bf0d22fdc7581b0ea9
-  data.tar.gz: 92d79cb596b6b9dc647555c60b0ce7ddc30d270b7b7bdccf1cd8e0a1db4190ce
+  metadata.gz: 99e8fdb60e5fb1e8083b76db845cfad8a7b6be35700c543819ce631f8ac3ca19
+  data.tar.gz: 1fd106429c8a3aa39e56683060b5e61395e705abe336290da63fb1a35e748ec5
 SHA512:
-  metadata.gz: 7a2a9b52b2576c634702c057b2399dc985c6582c7f371c4feae37c8d794f68a3c71ac4467aed8d05becb00e8b63a5fa8cef2b20882455f2ecc6199d215888ce6
-  data.tar.gz: 88c27d05a03f5bf0270ad713ab76a3f592ecb4128f5d16e284fbf3f910f7e443f961c184b5f658647b4caafa4ccac83c2fcdd5c1578c2d6f1d7ac1e6c12dae46
+  metadata.gz: e03d29fb285a301e48723690f3bdad751a0bc229bd559d901e22fdb196a4e263d5b75bbc6fef2da5480f07f1a4d22d510e630f7f7a7af8988d2b981d6a4b0b10
+  data.tar.gz: c41be62abd514f4ea0fde5e47fba206f27a8bd89a82a17e03c55a3908e5d9c98e909eca6bb571e183f8c2f11421617f0a20b31db132c1107a91eea0fb12cb0c1

data/lib/factbase/indexed/indexed_exists.rb

@@ -4,6 +4,11 @@
 # SPDX-License-Identifier: MIT
 
 # Indexed term 'exists'.
+# The @idx[key] structure:
+# {
+#   count: Integer (number of facts already processed),
+#   facts: Array (facts found),
+# }
 class Factbase::IndexedExists
   def initialize(term, idx)
     @term = term
@@ -11,25 +16,21 @@ class Factbase::IndexedExists
   end
 
   def predict(maps, _fb, _params)
-    return nil if @idx.nil?
-    key = [maps.object_id, @term.operands.first, @term.op]
+    operand = @term.operands.first.to_s
+    key = [maps.object_id, operand, @term.op]
+    @idx[key] = { facts: [], count: 0 } if @idx[key].nil?
     entry = @idx[key]
-    maps_array = maps.to_a
-    if entry.nil?
-      entry = { facts: [], indexed_count: 0 }
-      @idx[key] = entry
-    end
-    if entry[:indexed_count] < maps_array.size
-      prop = @term.operands.first.to_s
-      maps_array[entry[:indexed_count]..].each do |m|
-        entry[:facts] << m unless m[prop].nil?
-      end
-      entry[:indexed_count] = maps_array.size
-    end
-    if maps.respond_to?(:ensure_copied!)
-      maps & entry[:facts]
-    else
-      (maps & []) | entry[:facts]
+    feed(maps.to_a, entry, operand)
+    return maps.repack(entry[:facts]) if maps.respond_to?(:repack)
+    entry[:facts]
+  end
+
+  private
+
+  def feed(facts, entry, operand)
+    facts[entry[:count]..].each do |m|
+      entry[:facts] << m unless m[operand].nil?
     end
+    entry[:count] = facts.size
   end
 end

data/lib/factbase/lazy_taped.rb

@@ -14,6 +14,7 @@ class Factbase::LazyTaped
     @copied = false
     @maps = nil
     @pairs = nil
+    @inverted_pairs = nil
     @inserted = []
     @deleted = []
     @added = []
@@ -93,6 +94,12 @@ class Factbase::LazyTaped
     (@maps || @origin).to_a
   end
 
+  def repack(other)
+    ensure_copied!
+    copied = other.map { |o| @inverted_pairs[o] || o }
+    Factbase::Taped.new(copied, inserted: @inserted, deleted: @deleted, added: @added)
+  end
+
   def &(other)
     if other == [] || (@maps || @origin).empty?
       return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added)
@@ -111,10 +118,12 @@ class Factbase::LazyTaped
   def ensure_copied!
     return if @copied
     @pairs = {}.compare_by_identity
+    @inverted_pairs = {}.compare_by_identity
     @maps =
       @origin.map do |m|
         n = m.transform_values(&:dup)
         @pairs[n] = m
+        @inverted_pairs[m] = n
         n
       end
     @copied = true

data/lib/factbase/taped.rb

@@ -68,6 +68,10 @@ class Factbase::Taped
     @origin.to_a
   end
 
+  def repack(other)
+    Factbase::Taped.new(other, inserted: @inserted, deleted: @deleted, added: @added)
+  end
+
   def &(other)
     if other == [] || @origin.empty?
       return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added)

data/lib/factbase/term.rb

@@ -176,7 +176,7 @@ class Factbase::Term < Factbase::TermBase
   # Try to predict which facts from the provided list
   # should be evaluated. If no prediction can be made,
   # the same list is returned.
-  # @param [Array<Hash>] maps Records to iterate, maybe
+  # @param [Array<Hash>, Factbase::Taped, Factbase::LazyTaped] maps Records to iterate, maybe
   # @param [Hash] params Params to use (keys must be strings, not symbols, with values as arrays)
   # @return [Array<Hash>] Records to iterate
   def predict(maps, fb, params)

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.5' unless const_defined?(:VERSION)
+  VERSION = '0.19.6' unless const_defined?(:VERSION)
 end

metadata

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