factbase 0.19.7 → 0.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c38336019e70a00d0845dfdbcc4a0fb033a4be8c3fd0ff8595c3de8bdc25cc1
-  data.tar.gz: 55b820f5d37a074a1a5f7ca2f9dafeb8d5180cdfd52ee354a855e2c402398d7d
+  metadata.gz: 03d4be418b18984640fa333733a6b688aa2879b2e7def6d0ad901bce47490cd2
+  data.tar.gz: c6f24e2c444eb03eb739489d4cd09f927ece90a8c44f480c3b04fef1876b574d
 SHA512:
-  metadata.gz: 5a018f96e8929e0a3a7946ad4b25cfdaf042c968cad1e0689d484235ab9aaa3b29b3a17557673e9c8b7ba32226a2746a7b0f1fa5ea1e27700aa96cfa18fa7580
-  data.tar.gz: a1dc92d273a4a6a6a870dd050a20fd23e2d06175861a2c094a45c68a80deaee479adb98ab027df1bee7791eb48e03bf520523be999ab49b88b2d4a57e0f29ddd
+  metadata.gz: f73778d27a87c5a436769565032c5b064b24354ce62fad61822fd29941664e96c6d70f8481bf146bc72ef32669fc4969bae050eb70ef2f5c1fa0e19ee9395000
+  data.tar.gz: 299d0afc68fa48166fd4e01366e82ce1d22f8aa8c2f1dc2cfc9bd397763080f8db1762b20caa7738bafd0a5d606e9fa1725c13f400e13b40193ff13528b05b59

data/Gemfile.lock

@@ -25,6 +25,7 @@ GEM
     date (3.5.1)
     decoor (0.1.0)
     docile (1.4.1)
+    drb (2.2.3)
     elapsed (0.3.1)
       loog (~> 0.6)
       tago (~> 0.1)
@@ -37,7 +38,8 @@ GEM
     loog (0.8.0)
       ellipsized
       logger (~> 1.0)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     minitest-reporters (1.7.1)
       ansi
@@ -55,7 +57,7 @@ GEM
     os (1.1.4)
     others (0.1.1)
     parallel (1.27.0)
-    parser (3.3.10.1)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
@@ -90,7 +92,7 @@ GEM
     rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-minitest (0.38.2)
+    rubocop-minitest (0.39.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)

data/Rakefile

@@ -88,7 +88,7 @@ desc 'Profile a benchmark (e.g., flamegraph[bench_slow_query])'
 task :flamegraph, [:name] do |_t, args|
   require 'stackprof'
   bname = args[:name] || 'all'
-  puts "Starting profiling for '#{bname}'..."
+  puts "Starting profiling for '#{bname}'..." # rubocop:disable Lint/Debugger
   StackProf.run(mode: :cpu, out: 'stackprof-cpu-myapp.dump', raw: true) do
     Rake::Task['benchmark'].invoke(bname)
   end

data/lib/factbase/lazy_taped.rb

@@ -11,23 +11,23 @@ require_relative 'lazy_taped_hash'
 class Factbase::LazyTaped
   def initialize(origin)
     @origin = origin
+    @staged = []
     @copied = false
-    @maps = nil
-    @pairs = nil
-    @inverted_pairs = nil
+    @copies = {}.compare_by_identity
     @inserted = []
     @deleted = []
     @added = []
   end
 
-  # Returns a hash mapping copied maps to their originals.
-  # This is used during transaction commit to identify which original facts
-  # were modified, allowing the factbase to update the correct entries.
-  def pairs
-    return {} unless @pairs
-    result = {}.compare_by_identity
-    @pairs.each { |copied, original| result[copied] = original }
-    result
+  # Returns the original map this copy was derived from.
+  # Returns nil if the base hasn't been copied yet or if the fact is new.
+  def source_of(copy)
+    return nil unless @copied
+    @copies.key(copy)
+  end
+
+  def copied?
+    @copied
   end
 
   # Returns the unique object IDs of maps that were inserted (newly created).
@@ -51,101 +51,104 @@ class Factbase::LazyTaped
   end
 
   def find_by_object_id(oid)
-    (@maps || @origin).find { |m| m.object_id == oid }
+    r = @staged.find { |m| m.object_id == oid }
+    r = @origin.find { |m| m.object_id == oid } if r.nil? && !copied?
+    r
   end
 
   def size
-    (@maps || @origin).size
+    copied? ? @staged.size : (@origin.size + @staged.size)
   end
 
   def empty?
-    (@maps || @origin).empty?
+    copied? ? @staged.empty? : (@origin.empty? && @staged.empty?)
   end
 
   def <<(map)
-    ensure_copied!
-    @maps << map
+    @staged << map
+    _track(map, map)
     @inserted.append(map.object_id)
   end
 
   def each
     return to_enum(__method__) unless block_given?
-    if @copied
-      @maps.each do |m|
-        yield Factbase::Taped::TapedHash.new(m, @added)
-      end
-    else
-      @origin.each do |m|
-        yield LazyTapedHash.new(m, self, @added)
+    st_size = @staged.size
+    orig_size = @origin.size
+    unless copied?
+      orig_size.times do |i|
+        m = @origin[i]
+        yield _tape(m) unless m.nil?
       end
     end
+    st_size.times do |i|
+      m = @staged[i]
+      yield _tape(m) unless m.nil?
+    end
   end
 
   def delete_if
     ensure_copied!
-    @maps.delete_if do |m|
+    @staged.delete_if do |m|
       r = yield m
-      @deleted.append(@pairs[m].object_id) if r
+      @deleted.append(source_of(m).object_id) if r
       r
     end
   end
 
   def to_a
-    (@maps || @origin).to_a
+    (copied? ? @staged : (@origin + @staged)).to_a
   end
 
   def repack(other)
     ensure_copied!
-    copied = other.map { |o| @inverted_pairs[o] || o }
+    copied = other.map { |o| @copies[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)
-    end
-    join(other, &:&)
+    return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added) if other == []
+    return Factbase::Taped.new([], inserted: @inserted, deleted: @deleted, added: @added) if empty?
+    _join(other, &:&)
   end
 
   def |(other)
     return Factbase::Taped.new(to_a, inserted: @inserted, deleted: @deleted, added: @added) if other == []
-    if (@maps || @origin).empty?
-      return Factbase::Taped.new(other, inserted: @inserted, deleted: @deleted, added: @added)
-    end
-    join(other, &:|)
+    return Factbase::Taped.new(other, inserted: @inserted, deleted: @deleted, added: @added) if empty?
+    _join(other, &:|)
   end
 
   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
+    return if copied?
+    @origin.each do |o|
+      c = o.transform_values(&:dup)
+      _track(c, o)
+      @staged << c
+    end
     @copied = true
   end
 
   def get_copied_map(original_map)
     ensure_copied!
-    @maps.find { |m| @pairs[m].equal?(original_map) }
+    @copies[original_map] || original_map
   end
 
   private
 
-  def join(other)
+  def _join(other)
     ensure_copied!
-    n = yield (@maps || @origin).to_a, other.to_a
+    n = yield to_a, other.to_a
     raise 'Cannot join with another Taped' if other.respond_to?(:inserted)
     raise 'Can only join with array' unless other.is_a?(Array)
-    Factbase::Taped.new(
-      n,
-      inserted: @inserted,
-      deleted: @deleted,
-      added: @added
-    )
+    Factbase::Taped.new(n, inserted: @inserted, deleted: @deleted, added: @added)
+  end
+
+  def _track(copy, original)
+    @copies[original] = copy
+  end
+
+  def _tape(map)
+    return LazyTapedHash.new(map, self, @added) unless copied?
+    copy = @copies[map] || map
+    Factbase::Taped::TapedHash.new(copy, @added)
   end
 end

data/lib/factbase/terms/traced.rb

@@ -27,7 +27,7 @@ class Factbase::Traced < Factbase::TermBase
     t = @operands[0]
     raise "A term is expected, but '#{t}' provided" unless t.is_a?(Factbase::Term)
     r = t.evaluate(fact, maps, fb)
-    puts "#{self} -> #{r}"
+    puts "#{self} -> #{r}" # rubocop:disable Lint/Debugger
     r
   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.7' unless const_defined?(:VERSION)
+  VERSION = '0.19.8' unless const_defined?(:VERSION)
 end

data/lib/factbase.rb

@@ -181,7 +181,6 @@ class Factbase
     end
     seen = {}.compare_by_identity
     garbage = {}.compare_by_identity
-    pairs = taped.pairs
     taped.deleted.each do |oid|
       original = @maps.find { |m| m.object_id == oid }
       next if original.nil?
@@ -200,7 +199,8 @@ class Factbase
       b = taped.find_by_object_id(oid)
       next if b.nil?
       next if seen.key?(b)
-      garbage[pairs[b]] = true
+      original = taped.source_of(b)
+      garbage[original] = true if original
       @maps << b
       churn.append(0, 0, 1)
     end

metadata

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